* Re: [PR PATCH] [Updated] libinput-gestures: update to 2.56.
2021-01-23 19:40 [PR PATCH] libinput-gestures: update to 2.56 uw2021
2021-02-04 6:24 ` ericonr
@ 2021-02-04 9:08 ` uw2021
2021-02-04 9:09 ` uw2021
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: uw2021 @ 2021-02-04 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]
There is an updated pull request by uw2021 against master on the void-packages repository
https://github.com/uw2021/void-packages libinput-gestures-update
https://github.com/void-linux/void-packages/pull/28124
libinput-gestures: update to 2.56.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28124.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libinput-gestures-update-28124.patch --]
[-- Type: text/x-diff, Size: 1499100 bytes --]
From e842088a8de118d5bc676ce7e6fa20953cdf45b5 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 19:38:52 +0000
Subject: [PATCH 001/634] libinput-gestures: update to 2.56.
---
srcpkgs/libinput-gestures/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libinput-gestures/template b/srcpkgs/libinput-gestures/template
index a211736bfb5..58518ac80d8 100644
--- a/srcpkgs/libinput-gestures/template
+++ b/srcpkgs/libinput-gestures/template
@@ -1,14 +1,14 @@
# Template file for 'libinput-gestures'
pkgname=libinput-gestures
-version=2.50
-revision=2
+version=2.56
+revision=1
depends="python3 libinput xdotool wmctrl hicolor-icon-theme"
short_desc="Action gestures on your touchpad using libinput"
maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/bulletmark/libinput-gestures"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=679c03b53b1f3d1df2b074056b6f80868ddac004589d6af79e34a40699f174de
+checksum=66bd5283f8208164b1206d81db772aeccae7f58640d5473212b9d8ca164b9a2c
conf_files="/etc/libinput-gestures.conf"
do_install() {
From d007cf0f34c183ba2f03b19ce32e66efbbafd141 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Jan 2021 17:20:41 +0200
Subject: [PATCH 002/634] README.md: add -musl to the xbps-static-latest
filename.
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ec8cfabf83a..17111d471b7 100644
--- a/README.md
+++ b/README.md
@@ -418,7 +418,7 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
$ wget http://alpha.de.repo.voidlinux.org/static/xbps-static-latest.<arch>-musl.tar.xz
$ mkdir ~/XBPS
- $ tar xvf xbps-static-latest.<arch>.tar.xz -C ~/XBPS
+ $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
$ export PATH=~/XBPS/usr/bin:$PATH
If your system does not support `user namespaces`, a privileged group is required to be able to use
From 6dcffed1be9a4e9644a41d76757bd6f28525bdc5 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Fri, 22 Jan 2021 14:11:24 +0100
Subject: [PATCH 003/634] webkit2gtk: build with enchant2 instead of enchant
---
srcpkgs/webkit2gtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 2259ad80b17..8b617cb3972 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
version=2.30.4
-revision=2
+revision=3
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
@@ -28,7 +28,7 @@ hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
geoclue2 libharfbuzz $(vopt_if wayland wayland-devel)"
makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
- libsoup-devel libxslt-devel gnutls-devel icu-devel enchant-devel
+ libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel
libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
From 382e6e8b8a61a5cdaa3ac02fa7ffe83e8f9dcf98 Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Wed, 13 Jan 2021 16:20:33 +0100
Subject: [PATCH 004/634] setzer: update to 0.3.9.
---
srcpkgs/setzer/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index 3d45b9be3d0..df80eaee011 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,14 +1,14 @@
# Template file for 'setzer'
pkgname=setzer
-version=0.3.7
+version=0.3.9
revision=1
wrksrc=Setzer-${version}
build_style=meson
hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4"
+depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-PyPDF2"
short_desc="Simple yet full-featured LaTeX editor written in Python with Gtk"
maintainer="Bleznudd <bleznudd@pm.me>"
license="GPL-3.0-or-later"
homepage="https://github.com/cvfosammmm/setzer"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=04675ecb73d9fdad875665756d80587e72e06c03d85f358232e6dd1e3487b42d
+checksum=abddd4b85f41a84fc0ce18377cf955df8f9a10e0350133692e187f74f0828dad
From d02b386a16586351ccc426911fb9bd92a3983613 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 23 Jan 2021 11:28:23 -0700
Subject: [PATCH 005/634] mu: update to 1.4.15
---
srcpkgs/mu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 30b8b446ae2..9a6f1e8bada 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,6 +1,6 @@
# Template file for 'mu'
pkgname=mu
-version=1.4.14
+version=1.4.15
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config texinfo glib-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamin Slade <slade@jnanam.net>"
license="GPL-3.0-or-later"
homepage="https://www.djcbsoftware.nl/code/mu/"
distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=df6410dbe4cbe74f1495a996a558e1429f83f1aaf1588f5cb8df73a9baff60ba
+checksum=f7524e17de09470d1369bc1b3959b1f8ac1286eff2d442db33f8355726f8342a
if [ ! "$CROSS_BUILD" ]; then
hostmakedepends+=" emacs"
From 852c45ae4d960b352472a0434f5b441f2917d46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 23 Jan 2021 22:17:00 +0100
Subject: [PATCH 006/634] ratpoison: needs texinfo to fix ftbfs
---
srcpkgs/ratpoison/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ratpoison/template b/srcpkgs/ratpoison/template
index dc32b90a884..8e58489a242 100644
--- a/srcpkgs/ratpoison/template
+++ b/srcpkgs/ratpoison/template
@@ -3,7 +3,7 @@ pkgname=ratpoison
version=1.4.9
revision=1
build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config texinfo"
makedepends="libICE-devel libXft-devel libXinerama-devel libXrandr-devel
libXtst-devel readline-devel"
depends="perl"
From aaca7659b2271b9a0f4be81a875081b587b94486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 23 Jan 2021 22:39:15 +0100
Subject: [PATCH 007/634] p8-platform: fix buld; xlint
---
srcpkgs/p8-platform/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/p8-platform/template b/srcpkgs/p8-platform/template
index a14ff56caa9..55c844853c5 100644
--- a/srcpkgs/p8-platform/template
+++ b/srcpkgs/p8-platform/template
@@ -2,23 +2,19 @@
pkgname=p8-platform
version=2.1.0.1
revision=3
+wrksrc="platform-${pkgname}-${version}"
build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=1"
short_desc="Platform support library used by libCEC (Pulse Eight Edition)"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/Pulse-Eight/platform"
distfiles="https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"
checksum=064f8d2c358895c7e0bea9ae956f8d46f3f057772cb97f2743a11d478a0f68a0
-configure_args+=" -DBUILD_SHARED_LIBS=1"
-wrksrc="platform-${pkgname}-${version}"
-post_install() {
- vmkdir usr/lib
- if [ -d $DESTDIR/usr/lib64 ]; then
- mv $DESTDIR/usr/lib64/* $DESTDIR/usr/lib
- fi
- mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib
- sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/p8-platform/p8-platform-config.cmake $DESTDIR/usr/lib/pkgconfig/p8-platform.pc
+pre_configure() {
+ vsed -i CMakeLists.txt \
+ -e 's;DESTINATION ${CMAKE_INSTALL_LIBDIR};DESTINATION lib;'
}
p8-platform-devel_package() {
From f4eaaeea8cbdd0207974b981c63731fcecd08fd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 22 Jan 2021 22:31:33 +0200
Subject: [PATCH 008/634] libktorrent: update to 20.12.1.
---
srcpkgs/libktorrent/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index 4bfa0e7a673..b72b5b90a6f 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,22 +1,26 @@
# Template file for 'libktorrent'
pkgname=libktorrent
-version=2.2.0
+version=20.12.1
revision=1
build_style=cmake
-hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python doxygen"
+hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python3 doxygen"
makedepends="qt5-devel karchive-devel ksolid-devel kio-devel ki18n-devel
kcrash-devel gmp-devel qca-qt5-devel"
short_desc="BitTorrent protocol implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://ktorrent.pwsp.net"
-distfiles="https://github.com/KDE/libktorrent/archive/v${version}.tar.gz"
-checksum=c6f684611f1af6805b7e8caf022288cf6751df6da05ba261013435846b5de006
+homepage="https://apps.kde.org/en/ktorrent"
+distfiles="${KDE_SITE}/release-service/${version}/src/libktorrent-${version}.tar.xz"
+checksum=bbaa68598993cf83e21d036b53b901efa190ea5e49b394ccc23f3e62c0caaca2
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" kcoreaddons"
fi
+pre_check() {
+ export QT_QPA_PLATFORM=offscreen
+}
+
libktorrent-devel_package() {
depends="${sourcepkg}-${version}_${revision} gmp-devel"
pkg_install() {
From f364b2d8d600f54489ed019c1122c65bf38658d9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 22 Jan 2021 22:31:38 +0200
Subject: [PATCH 009/634] ktorrent: update to 20.12.1.
---
srcpkgs/ktorrent/files/README.voidlinux | 2 ++
srcpkgs/ktorrent/template | 17 +++++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/ktorrent/files/README.voidlinux
diff --git a/srcpkgs/ktorrent/files/README.voidlinux b/srcpkgs/ktorrent/files/README.voidlinux
new file mode 100644
index 00000000000..6a810ee912d
--- /dev/null
+++ b/srcpkgs/ktorrent/files/README.voidlinux
@@ -0,0 +1,2 @@
+ktorrent needs geoip data in the legacy format to show some information.
+The data can be fetched with the geoipupdate utility.
diff --git a/srcpkgs/ktorrent/template b/srcpkgs/ktorrent/template
index 77209881a1c..b448b8a4fe2 100644
--- a/srcpkgs/ktorrent/template
+++ b/srcpkgs/ktorrent/template
@@ -1,20 +1,21 @@
# Template file for 'ktorrent'
pkgname=ktorrent
-version=5.2.0
+version=20.12.1
revision=1
build_style=cmake
+configure_args="-DWITH_SYSTEM_GEOIP=ON"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake gettext"
makedepends="qt5-devel qt5-script-devel ki18n-devel kio-devel kxmlgui-devel
knotifications-devel ksolid-devel kconfig-devel kcoreaddons-devel kdoctools-devel
kross-devel kcmutils-devel sonnet-devel kdbusaddons-devel kcrash-devel
karchive-devel knotifyconfig-devel libktorrent-devel kplotting-devel
- gmp-devel taglib-devel kdnssd-devel kdewebkit-devel"
+ gmp-devel taglib-devel kdnssd-devel kdewebkit-devel geoip-devel syndication-devel"
short_desc="BitTorrent client based on the KDE platform"
maintainer="Norbert Vegh <vegh@norvegh.com>"
license="GPL-2.0-or-later"
homepage="https://www.kde.org/applications/internet/ktorrent"
-distfiles="${KDE_SITE}/ktorrent/${version}/ktorrent-${version}.tar.xz"
-checksum=d1031d745c1ace02d11b59c426610aee779d208e3d1ae81f8559c265173732ff
+distfiles="${KDE_SITE}/release-service/${version}/src/ktorrent-${version}.tar.xz"
+checksum=8c5f52d9b4597c117c0ed189c2ada3b9716bc0d5ceb53fde66f6a009bee68354
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -25,3 +26,11 @@ pre_configure() {
# The ECM FindTaglib.cmake gives different variable names
grep -rl TAGLIB_ | xargs -n1 sed -i -e "s;TAGLIB_;Taglib_;g"
}
+
+pre_check() {
+ export QT_QPA_PLATFORM=offscreen
+}
+
+post_install() {
+ vdoc "${FILESDIR}/README.voidlinux"
+}
From a61c7824b573b5c1bb209f82b75cb9ac9822b1e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 19 Jan 2021 23:55:22 +0100
Subject: [PATCH 010/634] electron10: update to 10.3.0.
---
.../files/patches/chromium-time64.patch | 51 +++++++++++++++++++
srcpkgs/electron10/template | 4 +-
2 files changed, 53 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/electron10/files/patches/chromium-time64.patch
diff --git a/srcpkgs/electron10/files/patches/chromium-time64.patch b/srcpkgs/electron10/files/patches/chromium-time64.patch
new file mode 100644
index 00000000000..0330ce057f4
--- /dev/null
+++ b/srcpkgs/electron10/files/patches/chromium-time64.patch
@@ -0,0 +1,51 @@
+Description: allow sandboxed code to call gettime64
+ Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist
+ and clock selection parameter filtering code.
+
+ Add __NR_utimensat_time64 to syscall whitelist
+
+ Conditionalise additions on the new calls existing, because they do not exist
+ on 64-bit architectures.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+===================================================================
+--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+ return Allow();
+ #endif
+
++#ifdef __NR_clock_gettime64
++ if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) {
++#else
+ if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
++#endif
+ return RestrictClockID();
+ }
+
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+===================================================================
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s
+ case __NR_clock_getres: // Allowed only on Android with parameters
+ // filtered by RestrictClokID().
+ case __NR_clock_gettime: // Parameters filtered by RestrictClockID().
++#ifdef __NR_clock_gettime64
++ case __NR_clock_gettime64: // Parameters filtered by RestrictClockID().
++ case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID().
++#endif
+ case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID().
+ case __NR_clock_settime: // Privileged.
+ #if defined(__i386__) || \
+@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno
+ case __NR_utime:
+ #endif
+ case __NR_utimensat: // New.
++#ifdef __NR_utimensat_time64
++ case __NR_utimensat_time64:
++#endif
+ return true;
+ default:
+ return false;
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 26d6309c819..e529c6341ff 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -1,6 +1,6 @@
# Template file for 'electron10'
pkgname=electron10
-version=10.2.0
+version=10.3.0
_nodever=12.16.3
_chromiumver=85.0.4183.121
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="e1de6c43215594936af7b8f40f383e28069a8e4666bae1e447491353a506c6d4
+checksum="2938b0fd433d2a3f89eecaf3d28ecfec333ab15da84ae2e0a0db70cc3b047d75
e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
From 0dc3625cb137e8a0844969efb544bdb5c6cdfe5f Mon Sep 17 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, 24 Jan 2021 12:02:03 +0700
Subject: [PATCH 011/634] 0ad: fix build for gcc-10
---
srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ++++++++++
srcpkgs/0ad/patches/template-misuse.patch | 43 +++++++++++++++++++
2 files changed, 66 insertions(+)
create mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
create mode 100644 srcpkgs/0ad/patches/template-misuse.patch
diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
new file mode 100644
index 00000000000..f65fdcf7d81
--- /dev/null
+++ b/srcpkgs/0ad/patches/build-fcollada-once.patch
@@ -0,0 +1,23 @@
+Index: libraries/source/fcollada/src/Makefile
+===================================================================
+--- libraries/source/fcollada/src/Makefile.orig
++++ libraries/source/fcollada/src/Makefile
+@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
+ OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
+ OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
+
+-all: output/libFColladaSD.a output/libFColladaSR.a install
++all: output/libFColladaSR.a install
+
+ output_dirs:
+ bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
+@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
+ output/FColladaTest: $(OBJECTS_TEST) | output_dirs
+ $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
+
+-install: output/libFColladaSD.a output/libFColladaSR.a
+- cp output/libFColladaSD.a ../lib/libFColladaSD.a
++install: output/libFColladaSR.a
+ cp output/libFColladaSR.a ../lib/libFColladaSR.a
+
+ dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/template-misuse.patch b/srcpkgs/0ad/patches/template-misuse.patch
new file mode 100644
index 00000000000..7ae376ff1fe
--- /dev/null
+++ b/srcpkgs/0ad/patches/template-misuse.patch
@@ -0,0 +1,43 @@
+Index: libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
+===================================================================
+--- libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig
++++ libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
+@@ -329,16 +329,3 @@ void FArchiveXML::WritePhysicsRigidBodyP
+ FArchiveXML::LetWriteObject(physicsRigidBodyParameters->GetPhysicsShape(i), techniqueNode);
+ }
+ }
+-
+-template <class TYPE, int QUAL>
+-xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value)
+-{
+- xmlNode* paramNode = AddChild(parentNode, name);
+- AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
+- if (value.IsAnimated())
+- {
+- const FCDAnimated* animated = value.GetAnimated();
+- FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
+- }
+- return paramNode;
+-}
+Index: libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
+===================================================================
+--- libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig
++++ libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
+@@ -573,4 +573,17 @@ public:
+ static xmlNode* WriteLibrary(FCDLibrary<T>* library, xmlNode* node);
+ };
+
++template <class TYPE, int QUAL>
++xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value)
++{
++ xmlNode* paramNode = AddChild(parentNode, name);
++ AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
++ if (value.IsAnimated())
++ {
++ const FCDAnimated* animated = value.GetAnimated();
++ FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
++ }
++ return paramNode;
++}
++
+ #endif //_FCPARCHIVECOLLADA_H_
From 3cb706c7f5a68eac40022af425fbe61399f82bae Mon Sep 17 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, 24 Jan 2021 12:20:16 +0700
Subject: [PATCH 012/634] python3-pyscard: depend on libpcsclite
---
srcpkgs/python3-pyscard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index e8cf1f04954..4046fa5055e 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -2,12 +2,12 @@
pkgname=python3-pyscard
_pkgname=pyscard
version=2.0.0
-revision=2
+revision=3
wrksrc="${_pkgname}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools swig"
makedepends="python3-devel pcsclite-devel"
-depends="python3 pcsclite"
+depends="python3 pcsclite libpcsclite"
short_desc="Python library for smartcard"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
From c91e73a2c25aa92c0db852c60027c6ebe3e470ee Mon Sep 17 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, 24 Jan 2021 12:25:26 +0700
Subject: [PATCH 013/634] python3-fido2: fix do_check()
---
srcpkgs/python3-fido2/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
index 4cdc7f23cac..687bd065903 100644
--- a/srcpkgs/python3-fido2/template
+++ b/srcpkgs/python3-fido2/template
@@ -8,7 +8,7 @@ build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-six python3-cryptography python3-pyscard"
# Missing fakefs will be pulled from pypi
-checkdepends="$depends python3-mock"
+checkdepends="$depends python3-mock python3-pytest"
short_desc="Library for FIDO2 functionality"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-2-Clause"
@@ -16,6 +16,11 @@ homepage="https://github.com/Yubico/python-fido2"
distfiles="${PYPI_SITE}/f/${_pkgname}/${_pkgname}-${version}.tar.gz"
checksum=468f8657cc5b8b149e38a1735fbf5cd65e01a340a11a585caf4e6bade8c4b735
+post_extract() {
+ # pytest mis-recognises this file as a test case
+ rm -f examples/test_config.py
+}
+
post_install() {
vlicense COPYING
}
From 149d028ca9d60896b6cd5580da7f69df856a6e6f Mon Sep 17 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, 24 Jan 2021 12:32:37 +0700
Subject: [PATCH 014/634] python3-EasyProcess: fix do_check()
---
srcpkgs/python3-EasyProcess/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/python3-EasyProcess/template b/srcpkgs/python3-EasyProcess/template
index 034df5dc09c..51854a737d7 100644
--- a/srcpkgs/python3-EasyProcess/template
+++ b/srcpkgs/python3-EasyProcess/template
@@ -7,7 +7,7 @@ build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-pytest python3-nose python3-PyVirtualDisplay inetutils
- xorg-server-xvfb"
+ xorg-server-xvfb python3-six"
short_desc="Easy to use python subprocess interface"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-2-Clause"
@@ -15,10 +15,6 @@ homepage="https://github.com/ponty/easyprocess"
distfiles="${PYPI_SITE}/E/EasyProcess/EasyProcess-${version}.tar.gz"
checksum=fb948daac01f64c1e49750752711253614846c6fc7e5692a718a7408f2ffb984
-do_check() {
- PYTHONPATH=$(pwd)/build/lib pytest
-}
-
post_install() {
vlicense LICENSE.txt
}
From bd2b5146a0bad58748487263ea2ffb51af5ee9ce Mon Sep 17 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, 24 Jan 2021 12:36:26 +0700
Subject: [PATCH 015/634] python3-pytest-xvfb: fix do_check()
---
srcpkgs/python3-pytest-xvfb/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/python3-pytest-xvfb/template b/srcpkgs/python3-pytest-xvfb/template
index 0e002f07ace..e4e0503b731 100644
--- a/srcpkgs/python3-pytest-xvfb/template
+++ b/srcpkgs/python3-pytest-xvfb/template
@@ -21,6 +21,10 @@ post_extract() {
cp "$XBPS_SRCDISTDIR/$pkgname-$version/LICENSE" .
}
+do_check() {
+ python3 setup.py test
+}
+
post_install() {
vlicense LICENSE
}
From d3f872e453621c873b35316000f8acac80c29964 Mon Sep 17 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, 24 Jan 2021 12:40:15 +0700
Subject: [PATCH 016/634] python3-usb: build with setuptools_scm
---
srcpkgs/python3-usb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 5d3c1b77d1b..8d155e15b60 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,10 +1,10 @@
# Template file for 'python3-usb'
pkgname=python3-usb
version=1.1.1
-revision=1
+revision=2
wrksrc="pyusb-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3 libusb"
short_desc="Python library for USB communication"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
From fc1ea76de4104d21e010030428d1c36503ca76d2 Mon Sep 17 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, 23 Jan 2021 14:16:13 +0700
Subject: [PATCH 017/634] wrapper: valac: pass --vapidir after real arguments
Due to constant change in vala, some projects includes some old and
pre-generated vapi in their source tree and uses that version
instead of system one.
Pass system vapidir after real arguments in order to prefer its bundled
vapi.
---
common/hooks/pre-configure/02-script-wrapper.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 9ca195d5a58..1cbd9df6363 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -112,9 +112,10 @@ vapigen_wrapper() {
cat >>${XBPS_WRAPPERDIR}/vapigen<<_EOF
#!/bin/sh
exec /usr/bin/vapigen \\
+ "\$@" \\
--vapidir=${XBPS_CROSS_BASE}/usr/share/vala/vapi \\
--vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\
- --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@"
+ --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/vapigen
ln -sf vapigen ${XBPS_WRAPPERDIR}/vapigen-${_vala_version}
@@ -134,9 +135,10 @@ valac_wrapper() {
cat >>${XBPS_WRAPPERDIR}/valac<<_EOF
#!/bin/sh
exec /usr/bin/valac \\
+ "\$@" \\
--vapidir=${XBPS_CROSS_BASE}/usr/share/vala/vapi \\
--vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\
- --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@"
+ --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/valac
ln -sf valac ${XBPS_WRAPPERDIR}/valac-${_vala_version}
From 0e0c6776f6e71bd866c9c1810e57aa8f8a8e1f98 Mon Sep 17 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, 23 Jan 2021 14:18:24 +0700
Subject: [PATCH 018/634] budgie-desktop: remove vapidir hack
---
srcpkgs/budgie-desktop/template | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 2cf2ddb5123..5f9833ca9cb 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -19,15 +19,6 @@ homepage="https://github.com/solus-project/budgie-desktop"
distfiles="${homepage}/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
checksum=d7219c1dc6d0e3fe54ac33062bfd420ab94158bcfe9409d09c85d7e7a21c67fa
-pre_build() {
- # budgie-desktop uses its own polkit bindings
- # prepends to override system vapi
- if [ -f "$XBPS_WRAPPERDIR/valac" ]; then
- sed -i -e "s,/bin/valac,& --vapidir=$wrksrc/vapi," \
- "$XBPS_WRAPPERDIR/valac"
- fi
-}
-
budgie-desktop-devel_package() {
short_desc+=" - development files"
depends="${makedepends} ${sourcepkg}-${version}_${revision}"
From e26c6f46bd419e9cc8b807c166d12adce1af4706 Mon Sep 17 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, 23 Jan 2021 14:19:02 +0700
Subject: [PATCH 019/634] vala-panel-appmenu: remove vapidir hack
---
srcpkgs/vala-panel-appmenu/template | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template
index 2b854784fe6..198254fdf47 100644
--- a/srcpkgs/vala-panel-appmenu/template
+++ b/srcpkgs/vala-panel-appmenu/template
@@ -17,15 +17,6 @@ homepage="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
distfiles="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/$_glhash/vala-panel-appmenu-${version}.tar.xz"
checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592
-pre_build() {
- # vala-panel-appmenu depends on its own libxfconf-0.vapi
- # prepends to override system vapi
- if [ -f "$XBPS_WRAPPERDIR/valac" ]; then
- sed -i -e "s,/bin/valac,& --vapidir=$wrksrc/vapi," \
- "$XBPS_WRAPPERDIR/valac"
- fi
-}
-
appmenu-gtk-module-devel_package() {
short_desc="GTK module for exposing menus - development files"
depends="appmenu-gtk-module-${version}_${revision}
From 7205c49d67e63dd5da6030691f0913d0638f2ef2 Mon Sep 17 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, 24 Jan 2021 17:18:19 +0700
Subject: [PATCH 020/634] python3-sip-PyQt5: depends on python3
---
srcpkgs/python3-sip-PyQt5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index e144a1e91f2..6ef05a2e0b1 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -1,11 +1,12 @@
# Template file for 'python3-sip-PyQt5'
pkgname=python3-sip-PyQt5
version=12.8.1
-revision=1
+revision=2
wrksrc="PyQt5_sip-$version"
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools sip"
makedepends="python3-devel"
+depends="python3"
short_desc="Python 3 PyQt5 SIP bindings with C and C++"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
From ab18cf1481c428ca8b6750b8e952605ce08a842d Mon Sep 17 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, 24 Jan 2021 17:41:07 +0700
Subject: [PATCH 021/634] protobuf-vala: fix cross
---
srcpkgs/protobuf-vala/template | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/protobuf-vala/template b/srcpkgs/protobuf-vala/template
index cb25bc9a209..09ed71b320f 100644
--- a/srcpkgs/protobuf-vala/template
+++ b/srcpkgs/protobuf-vala/template
@@ -1,21 +1,27 @@
# Template file for 'protobuf-vala'
pkgname=protobuf-vala
version=0.1.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
-hostmakedepends="protobuf"
-makedepends="pkg-config libgee08-devel protobuf-devel vala-devel"
+hostmakedepends="protobuf pkg-config vala"
+makedepends="libgee08-devel protobuf-devel vala-devel"
depends="pkg-config glib-devel"
-short_desc="A plugin for the Google protocol buffer compiler to generate Vala code"
+short_desc="Plugin for the Google protocol buffer compiler to generate Vala code"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="http://launchpad.net/protobuf-vala/"
distfiles="${homepage}/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
checksum=c12547813fa22ee2b15967f17146b08e2a4d90800810fe63730332aea6777c48
disable_parallel_build=yes
+post_patch() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i -e '/^noinst_PROGRAMS/s/=.*/=/' src/Makefile.in
+ fi
+}
+
libprotobuf-vala_package() {
short_desc+=" - shared library"
pkg_install() {
From e6bc5a50ba7d4084bb8460e29c7206eed15f5bbb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:39:09 +0100
Subject: [PATCH 022/634] kore: update to 4.1.0.
---
srcpkgs/kore/patches/ppc64.patch | 31 +++++++++++++------------------
srcpkgs/kore/template | 4 ++--
2 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/kore/patches/ppc64.patch b/srcpkgs/kore/patches/ppc64.patch
index 1e06a1927e0..bc486ef3aaa 100644
--- a/srcpkgs/kore/patches/ppc64.patch
+++ b/srcpkgs/kore/patches/ppc64.patch
@@ -425,19 +425,17 @@ index 0000000..b935864
+#define __NR_pidfd_open 434
+#define __NR_clone3 435
+
-diff --git src/seccomp.c src/seccomp.c
-index 505ac0b..14074db 100644
---- src/seccomp.c
-+++ src/seccomp.c
-@@ -426,11 +426,19 @@ seccomp_register_violation(pid_t pid)
- int idx;
- struct kore_worker *kw;
+--- src/seccomp.c.orig 2021-01-24 11:27:12.401550281 +0100
++++ src/seccomp.c 2021-01-24 11:30:18.102787637 +0100
+@@ -460,13 +460,19 @@
struct iovec iov;
-+#if defined(__powerpc__)
-+ unsigned long regs[32];
-+#else
+ #if defined(__arm__)
+ struct pt_regs regs;
++#elif defined(__powerpc__)
++ unsigned long regs[32];
+ #else
struct user_regs_struct regs;
-+#endif
+ #endif
long sysnr;
const char *name;
@@ -449,15 +447,12 @@ index 505ac0b..14074db 100644
iov.iov_len = sizeof(regs);
if (ptrace(PTRACE_GETREGSET, pid, 1, &iov) == -1)
-@@ -442,6 +450,8 @@ seccomp_register_violation(pid_t pid)
- sysnr = regs.orig_ax;
- #elif SECCOMP_AUDIT_ARCH == AUDIT_ARCH_AARCH64
+@@ -478,6 +484,8 @@
sysnr = regs.regs[8];
+ #elif SECCOMP_AUDIT_ARCH == AUDIT_ARCH_ARM
+ sysnr = regs.uregs[7];
+#elif defined(__powerpc__)
+ sysnr = regs[0];
#else
- #error "platform not yet supported"
+ #error "platform not supported"
#endif
---
-2.28.0
-
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index b6b6e75af75..d2394349639 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,6 +1,6 @@
# Template file for 'kore'
pkgname=kore
-version=4.0.1
+version=4.1.0
revision=1
# arch specific seccomp stuff
archs="x86_64* aarch64* ppc64*"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="ISC"
homepage="https://kore.io"
distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=bc8bf755133faf67755c3a4ea53db49f208986efeed734ce6be562a3e5a81057
+checksum=b7d73b005fde0ea01c356a54e4bbd8a209a4dff9cf315802a127ce7267efbe61
disable_parallel_build=yes
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 93e0d2998a42b0b634e26a561dc9bddf5d8fd24b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:41:52 +0100
Subject: [PATCH 023/634] linux5.4: update to 5.4.92.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b889f9bf128..60f097ab3da 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.91
+version=5.4.92
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=0e0161bb034b9ba59e58a20985e49ecfb38104586602f53f37b382f508fc5c17
+checksum=c0937ff98824c4b14cfea68a04340e0beb3c00f1cc02984daf2f3bdf542394fd
python_version=3
patch_args="-Np1"
From 84c345a04b8bb58402d59139e0feded6550daf28 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:44:08 +0100
Subject: [PATCH 024/634] linux4.19: update to 4.19.170.
---
srcpkgs/linux4.19/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index d6b48be5bf3..1f109e47a20 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.19'
pkgname=linux4.19
-version=4.19.169
+version=4.19.170
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c7d24ddb8ecc348ca7bed24111ff98e2a87f74666c8bbbf4f9c57b7c3c25de94
+checksum=dd0d0264f8ef4363d0080054fd344470a73f07aca2cd673e91bf6e77fbe25b4a
python_version=2 #unverified
patch_args="-Np1"
From 1a4d0c1be3735c89555238cc48dfc7f75040a0b4 Mon Sep 17 00:00:00 2001
From: Robert Karszniewicz <avoidr@posteo.de>
Date: Sun, 24 Jan 2021 03:34:25 +0100
Subject: [PATCH 025/634] utox: update to 0.18.1.
Also remove libsodium dependency.
---
srcpkgs/utox/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template
index 5af30bd0f24..39e0a28eb62 100644
--- a/srcpkgs/utox/template
+++ b/srcpkgs/utox/template
@@ -1,20 +1,20 @@
# Template file for 'utox'
pkgname=utox
-version=0.18.0
+version=0.18.1
revision=1
wrksrc=uTox
build_style=cmake
configure_args="-DENABLE_ASAN=OFF"
hostmakedepends="pkg-config"
makedepends="check-devel dbus-devel filter_audio-devel fontconfig-devel
- libXrender-devel libopenal-devel libsodium-devel libvpx-devel opus-devel
+ libXrender-devel libopenal-devel libvpx-devel opus-devel
toxcore-devel v4l-utils-devel"
short_desc="Lightweight Tox instant messenger client written in C"
maintainer="avoidr <avoidr@posteo.de>"
license="MIT"
homepage="https://github.com/uTox/uTox/"
distfiles="https://github.com/uTox/uTox/releases/download/v${version}/uTox-${version}-full.tar.gz"
-checksum=259d502eb1277394d839c5ef035ef4dadd75113e4472edae1fe266a762198e15
+checksum=fc883483d86b1830674f3b08515daa27ae54ab47646c7edc48a067e8d1e8c114
patch_args="-Np1"
nocross=yes
From faab84a91c29ba06049136b58ac7d20a44031244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 23 Jan 2021 19:49:15 +0100
Subject: [PATCH 026/634] gcc-multilib: update to 10.2.1pre1
---
.../patches/fix-libiberty_pic.patch | 22 +++++-----------
srcpkgs/gcc-multilib/template | 25 +++++++------------
2 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
index 134846c45f4..54259bc2bb5 100644
--- a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
+++ b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
@@ -1,22 +1,12 @@
---- libiberty/Makefile.in 2016-08-05 17:07:27.540554328 +0200
-+++ libiberty/Makefile.in 2016-08-05 17:18:39.727540789 +0200
-@@ -112,8 +112,8 @@
+--- libiberty/Makefile.in 2020-12-03 20:45:14.000000000 +0100
++++ libiberty/Makefile.in 2021-01-23 18:39:45.891324445 +0100
+@@ -111,7 +111,7 @@
INCDIR=$(srcdir)/$(MULTISRCTOP)../include
-COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) \
-- $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE
+- $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE \
+COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) \
-+ $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE
++ $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE \
+ @CET_HOST_FLAGS@
- # Just to make sure we don't use a built-in rule with VPATH
- .c.$(objext):
-@@ -401,7 +401,7 @@
- demangle: $(ALL) $(srcdir)/cp-demangle.c
- @echo "The standalone demangler, now named c++filt, is now"
- @echo "a part of binutils."
-- $(CC) @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) \
-+ $(CC) @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) $(HDEFINES) \
- $(srcdir)/cp-demangle.c -DSTANDALONE_DEMANGLER $(TARGETLIB) -o $@
-
- ls:
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index 6d2240d055e..07ceeccc93d 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -1,18 +1,18 @@
# Template file for 'gcc-multilib'
archs="x86_64"
_triplet="x86_64-unknown-linux-gnu"
-_majorver=9.3
+_majorver=10.2
pkgname=gcc-multilib
-version=${_majorver}.0
-revision=2
-wrksrc="gcc-${version}"
+version=${_majorver}.1pre1
+revision=1
+wrksrc=gcc-${version/pre/_pre}
short_desc="GNU Compiler Collection (multilib files)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://gcc.gnu.org"
license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
-distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
-checksum=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+distfiles="https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz"
+checksum=772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
hostmakedepends="perl flex tar zip unzip"
makedepends="zlib-devel libmpc-devel isl15-devel libfl-devel
@@ -71,13 +71,8 @@ do_build() {
make ${makejobs}
}
do_install() {
- local _pc_triplet=x86_64-pc-linux-gnu
+ local _pc_triplet=x86_64-pc-linux-gnu _version=${version%pre1}
# Install to a tempdir and then only copy relevant files.
- if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- vmkdir usr/lib
- cd ${DESTDIR}/usr
- ln -sf lib lib64
- fi
cd ${wrksrc}
make DESTDIR=${wrksrc}/${pkgname}-build install
@@ -86,14 +81,12 @@ do_install() {
vmkdir usr/include/c++/${_majorver}/${_triplet}
vmkdir usr/lib/gcc/${_triplet}/${_majorver}
- cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${version}/32 \
+ cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${_version}/32 \
${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/
- cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${version}/${_pc_triplet}/32 \
+ cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${_version}/${_pc_triplet}/32 \
${DESTDIR}/usr/include/c++/${_majorver}/${_triplet}
vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}
-
- rm -f ${DESTDIR}/usr/lib64
}
gcc-objc-multilib_package() {
From e95280a99e9ec9186312f33c0e68398bc742c66c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:52:59 +0100
Subject: [PATCH 027/634] bpftool: don't install bpf-helpers.7, clashes with
man-pages.
---
srcpkgs/linux-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index b83a10b1734..9514eafc31f 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=2
+revision=3
wrksrc="linux-${version}"
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
@@ -128,6 +128,7 @@ do_install() {
cd ${wrksrc}/tools/bpf
make -W runqslower_install install DESTDIR=${DESTDIR} prefix=/usr
make -C bpftool doc-install DESTDIR=${DESTDIR} prefix=/usr/share
+ rm ${DESTDIR}/usr/share/man/man7/bpf-helpers.7
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
esac
@@ -139,7 +140,6 @@ bpftool_package() {
pkg_install() {
vmove "usr/bin/bpf*"
vmove usr/share/bash-completion/completions/bpftool
- vmove "usr/share/man/man7/bpf*"
vmove "usr/share/man/man8/bpf*"
}
}
From 91ab22784b55c93fc74013a46ea57290a039e50b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:56:30 +0100
Subject: [PATCH 028/634] ugrep: update to 3.1.4.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 2eedab2d46e..07acebd43ae 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.1.3
+version=3.1.4
revision=1
build_style=gnu-configure
configure_args="--disable-avx"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6416e06d1358316aafa147aa74e5bc7d05502f1d78d742248b3fdce0f6fbeae1
+checksum=3de80f56e82ac21fda574334a1e55d3a9027c156d4b1ce1b0e96ea99b25cda32
From 548b0e28fad0a46ad4678973a6c5ab2a36def275 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:57:20 +0100
Subject: [PATCH 029/634] perl-IO-Socket-SSL: update to 2.069.
---
srcpkgs/perl-IO-Socket-SSL/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 2066b4c7344..6821590299c 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,7 +1,7 @@
# Template file for 'perl-IO-Socket-SSL'
pkgname=perl-IO-Socket-SSL
-version=2.068
-revision=2
+version=2.069
+revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/IO-Socket-SSL"
distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=4420fc0056f1827b4dd1245eacca0da56e2182b4ef6fc078f107dc43c3fb8ff9
+checksum=d83c2cae5e8a22ab49c9f2d964726625e9efe56490d756a48a7b149a3d6e278d
From f300d36799d3a03d7196883cd7fa5321a030e5ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:07:31 +0100
Subject: [PATCH 030/634] skaffold: update to 1.18.0.
---
srcpkgs/skaffold/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 3997a70ab07..0638b06689f 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
# Template file for 'skaffold'
pkgname=skaffold
-version=1.17.2
+version=1.18.0
revision=1
build_style=go
go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://skaffold.dev/"
changelog="https://github.com/GoogleContainerTools/skaffold/releases"
distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=1d23795bc92d77fbfd92ff1068013c35cd0f4fbde24f06f46cff8caa8b7a4972
+checksum=14c9640d32eb81e0b7a82159deab00f6e0f2d68a8d50a64ccea504cf3a2b19fe
From 8c3b08f5deb34755c40a5c026d2808864fc05c4b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:08:29 +0100
Subject: [PATCH 031/634] nncp: update to 6.0.0.
---
srcpkgs/nncp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 3f7d0bedea0..15609f3801f 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
# Template file for 'nncp'
pkgname=nncp
-version=5.6.0
+version=6.0.0
revision=1
build_style=go
go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-only"
homepage="http://www.nncpgo.org/"
distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=1dc83f05f14a3c3b95820046c60b170eb8c8936f142a5b9a1e943e6f4cefbde3
+checksum=42fe8aa54520b3a1abb50d661bbba6a141ce4e749b4816b0d4c6845d67465916
do_build() {
make
From abbe20e277e486cf9ad0b7d563a35364aaefce19 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:09:02 +0100
Subject: [PATCH 032/634] janet: update to 1.14.2.
---
srcpkgs/janet/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 77674059ea6..9c3c160bf50 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,7 +1,7 @@
# Template file for 'janet'
pkgname=janet
-version=1.14.1
-revision=2
+version=1.14.2
+revision=1
build_style=meson
configure_args="-Db_lto=false" # breaks jpm
short_desc="Dynamic Lisp dialect and bytecode VM"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://janet-lang.org/"
distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=fcdb12c4ca414af346f390f81ea6e2417da182656c1c36377237df57b92cfd34
+checksum=587715eddbe007cbd33f16c89cc3aabc67a69196669b3c6995ce983dc00b54fb
post_install() {
vlicense LICENSE
From c1766c999096fcd52e4933d8f36f1becad5ee89a Mon Sep 17 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, 24 Jan 2021 22:39:19 +0700
Subject: [PATCH 033/634] notmuch: update to 0.31.3.
---
srcpkgs/notmuch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 64a648ce829..d96cd07da6a 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.31.2
+version=0.31.3
revision=1
hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="1456b63e04637094eefe7e6f9a45812ed419392a0322fe8b0f452dd06a4cfbef
+checksum="484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca
4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
skip_extraction="database-v1.tar.xz"
From 3c1df24fc820053f0dad405b7d8cb87b5fd94d43 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 24 Jan 2021 16:32:50 +0100
Subject: [PATCH 034/634] lf: update to r19.
Close: #28147
Close: #28148
Close: #28150
---
srcpkgs/lf/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index a15d195d11d..1b4fc94cfc4 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,17 +1,16 @@
# Template file for 'lf'
pkgname=lf
-version=r18
+version=r19
revision=1
build_style=go
go_import_path="github.com/gokcehan/${pkgname}"
go_ldflags="-X main.gVersion=$version"
-hostmakedepends="git"
short_desc="Terminal file manager"
maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/gokcehan/lf"
distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=b9aba66ee8f0ca8229d4d3c0956fa7a7fd71a7e099e119d5609d29a1d9019344
+checksum=8808069021ee1c0012440edabdc239b9f58f36bdd44d27b07eae7c91b97afdef
post_install() {
vlicense LICENSE
From e21929c3a9b18e5a6c8d7741e425d57b097b18bc Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 24 Jan 2021 17:11:59 +0100
Subject: [PATCH 035/634] jitterentropy: include license files
COPYING says
ALTERNATIVELY, this product may be distributed under the terms of
the GNU General Public License, in which case the provisions of the GPL2
are required INSTEAD OF the above restrictions. (This clause is
necessary due to a potential bad interaction between the GPL and
the restrictions contained in a BSD-style copyright.)
so license= field is not altered
Closes: #28073
---
srcpkgs/jitterentropy/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index b0a2842ad0e..8faf44a5b5f 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,7 +1,7 @@
# Template file for 'jitterentropy'
pkgname=jitterentropy
version=3.0.1
-revision=1
+revision=2
wrksrc="${pkgname}-library-${version}"
build_style=gnu-makefile
short_desc="Hardware RNG based on CPU timing jitter"
@@ -11,6 +11,12 @@ homepage="https://www.chronox.de/jent.html"
distfiles="https://github.com/smuellerDD/jitterentropy-library/archive/v${version}.tar.gz"
checksum=015a443ebfaab7bc302caa24dcc124aefe1818046893f49591d2465bd3f58e16
+post_install() {
+ vlicense COPYING
+ vlicense COPYING.bsd
+ vlicense COPYING.COPYING.gplv2
+}
+
jitterentropy-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From 4e22d42d21223d5c5f7e8f5b67bd91219f997ef2 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 24 Jan 2021 17:27:18 +0100
Subject: [PATCH 036/634] jitterentropy: fixup license file path
---
srcpkgs/jitterentropy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index 8faf44a5b5f..5a9003fdbbc 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,7 +1,7 @@
# Template file for 'jitterentropy'
pkgname=jitterentropy
version=3.0.1
-revision=2
+revision=3
wrksrc="${pkgname}-library-${version}"
build_style=gnu-makefile
short_desc="Hardware RNG based on CPU timing jitter"
@@ -14,7 +14,7 @@ checksum=015a443ebfaab7bc302caa24dcc124aefe1818046893f49591d2465bd3f58e16
post_install() {
vlicense COPYING
vlicense COPYING.bsd
- vlicense COPYING.COPYING.gplv2
+ vlicense COPYING.gplv2
}
jitterentropy-devel_package() {
From b0d8bec7104212f11441634536b9a7e417a12dcb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 24 Jan 2021 17:36:40 +0100
Subject: [PATCH 037/634] socat: orphan package
---
srcpkgs/socat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index a163d2099c0..8f96fccff84 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -7,7 +7,7 @@ configure_args="--disable-libwrap --enable-fips
ac_cv_have_z_modifier=yes"
makedepends="readline-devel libressl-devel"
short_desc="Relay for bidirectional data transfer between two independent channels"
-maintainer="q66 <daniel@octaforge.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://www.dest-unreach.org/socat/"
distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
From d4069a99de9c634a9df41cb4f7bdfe9eb36ae837 Mon Sep 17 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, 17 Dec 2020 00:00:40 +0700
Subject: [PATCH 038/634] webkit2gtk: disable sse2 on i686
- be nice with ccache
- also switch maintainer (added by q66)
---
srcpkgs/webkit2gtk/patches/x86-no-sse2.patch | 19 ++++++++++++++++
srcpkgs/webkit2gtk/template | 24 +++++++++++++++++---
2 files changed, 40 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
diff --git a/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch b/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
new file mode 100644
index 00000000000..c6c4c803bcf
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/x86-no-sse2.patch
@@ -0,0 +1,19 @@
+ Source: Debian
+--- Source/cmake/WebKitCompilerFlags.cmake.orig 2020-12-15 15:29:50.240722972 +0700
++++ Source/cmake/WebKitCompilerFlags.cmake 2020-12-15 15:29:59.659853014 +0700
+@@ -138,15 +138,6 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
+ endif ()
+-
+- # Force SSE2 fp on x86 builds.
+- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
+- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
+- include(DetectSSE2)
+- if (NOT SSE2_SUPPORT_FOUND)
+- message(FATAL_ERROR "SSE2 support is required to compile WebKit")
+- endif ()
+- endif ()
+ endif ()
+
+ if (COMPILER_IS_GCC_OR_CLANG AND NOT MSVC)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 8b617cb3972..54762392d6a 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,8 @@
# Template file for 'webkit2gtk'
+# ping q66 before touching this
pkgname=webkit2gtk
version=2.30.4
-revision=3
+revision=4
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
@@ -24,8 +25,10 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
-DENABLE_X11_TARGET=$(vopt_if x11 ON OFF)
-DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF)
-DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF)"
+# Don't remove which from hostmakedepends
+# Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -35,7 +38,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
qt5-devel $(vopt_if x11 libXt-devel)
$(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
short_desc="GTK+3 port of the WebKit2 browser engine"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
@@ -53,6 +56,21 @@ desc_option_minibrowser="Build the minibrowser"
export CFLAGS="-D__WORDSIZE=${XBPS_TARGET_WORDSIZE}"
export CXXFLAGS="$CFLAGS"
+# WebKitCCache.cmake set this variable
+# include_file_mtime was not enabled to avoid a race,
+# but this is run under our control
+export CCACHE_SLOPPINESS=time_macros,include_file_mtime
+
+post_patch() {
+ # Reproducible build
+ # At least, be nice with ccache
+ vsed -i -e '/foreach my.*(keys/s/(keys/(sort keys/' \
+ Source/WebCore/bindings/scripts/CodeGenerator.pm \
+ Source/WebCore/bindings/scripts/CodeGeneratorJS.pm \
+ Source/WebCore/css/makeprop.pl \
+ Source/cmake/tools/scripts/version-stamp.pl
+}
+
do_check() {
:
}
From d4c60dc361efde48bab7a3ce9a4dd1bd61f6a8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 24 Jan 2021 15:31:08 +0100
Subject: [PATCH 039/634] virtualbox-ose: update to 6.1.18
---
.../018-linux-5.10-r0drv-memobj-fix.patch | 97 -------------------
.../019-linux-5.10-address-space-fixes.patch | 17 ----
.../020-linux-5.10-framebuffer-fixes.patch | 47 ---------
srcpkgs/virtualbox-ose/template | 6 +-
4 files changed, 3 insertions(+), 164 deletions(-)
delete mode 100644 srcpkgs/virtualbox-ose/patches/018-linux-5.10-r0drv-memobj-fix.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/019-linux-5.10-address-space-fixes.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/020-linux-5.10-framebuffer-fixes.patch
diff --git a/srcpkgs/virtualbox-ose/patches/018-linux-5.10-r0drv-memobj-fix.patch b/srcpkgs/virtualbox-ose/patches/018-linux-5.10-r0drv-memobj-fix.patch
deleted file mode 100644
index ae75c5cbe21..00000000000
--- a/srcpkgs/virtualbox-ose/patches/018-linux-5.10-r0drv-memobj-fix.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-:Index: src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-===================================================================
---- src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (Revision 141658)
-+++ src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (Arbeitskopie)
-@@ -56,9 +56,12 @@
- * Whether we use alloc_vm_area (3.2+) for executable memory.
- * This is a must for 5.8+, but we enable it all the way back to 3.2.x for
- * better W^R compliance (fExecutable flag). */
--#if RTLNX_VER_MIN(3,2,0) || defined(DOXYGEN_RUNNING)
-+#if RTLNX_VER_RANGE(3,2,0, 5,10,0) || defined(DOXYGEN_RUNNING)
- # define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
- #endif
-+#if RTLNX_VER_MIN(5,10,0) || defined(DOXYGEN_RUNNING)
-+# define IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
-+#endif
-
- /*
- * 2.6.29+ kernels don't work with remap_pfn_range() anymore because
-@@ -502,7 +505,43 @@
- }
-
-
-+#ifdef IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
- /**
-+ * User data passed to the apply_to_page_range() callback.
-+ */
-+typedef struct LNXAPPLYPGRANGE
-+{
-+ /** Pointer to the memory object. */
-+ PRTR0MEMOBJLNX pMemLnx;
-+ /** The page protection flags to apply. */
-+ pgprot_t fPg;
-+} LNXAPPLYPGRANGE;
-+/** Pointer to the user data. */
-+typedef LNXAPPLYPGRANGE *PLNXAPPLYPGRANGE;
-+/** Pointer to the const user data. */
-+typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
-+
-+/**
-+ * Callback called in apply_to_page_range().
-+ *
-+ * @returns Linux status code.
-+ * @param pPte Pointer to the page table entry for the given address.
-+ * @param uAddr The address to apply the new protection to.
-+ * @param pvUser The opaque user data.
-+ */
-+static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
-+{
-+ PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
-+ PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
-+ uint32_t idxPg = (uAddr - (unsigned long)pMemLnx->Core.pv) >> PAGE_SHIFT;
-+
-+ set_pte(pPte, mk_pte(pMemLnx->apPages[idxPg], pArgs->fPg));
-+ return 0;
-+}
-+#endif
-+
-+
-+/**
- * Maps the allocation into ring-0.
- *
- * This will update the RTR0MEMOBJLNX::Core.pv and RTR0MEMOBJ::fMappedToRing0 members.
-@@ -584,6 +623,11 @@
- else
- # endif
- {
-+# if defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
-+ if (fExecutable)
-+ pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */
-+# endif
-+
- # ifdef VM_MAP
- pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg);
- # else
-@@ -1851,6 +1895,21 @@
- preempt_enable();
- return VINF_SUCCESS;
- }
-+# elif defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
-+ PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem;
-+ if ( pMemLnx->fExecutable
-+ && pMemLnx->fMappedToRing0)
-+ {
-+ LNXAPPLYPGRANGE Args;
-+ Args.pMemLnx = pMemLnx;
-+ Args.fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/);
-+ int rcLnx = apply_to_page_range(current->active_mm, (unsigned long)pMemLnx->Core.pv + offSub, cbSub,
-+ rtR0MemObjLinuxApplyPageRange, (void *)&Args);
-+ if (rcLnx)
-+ return VERR_NOT_SUPPORTED;
-+
-+ return VINF_SUCCESS;
-+ }
- # endif
-
- NOREF(pMem);
-
diff --git a/srcpkgs/virtualbox-ose/patches/019-linux-5.10-address-space-fixes.patch b/srcpkgs/virtualbox-ose/patches/019-linux-5.10-address-space-fixes.patch
deleted file mode 100644
index ffb704e4aa6..00000000000
--- a/srcpkgs/virtualbox-ose/patches/019-linux-5.10-address-space-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: b/src/VBox/Additions/linux/sharedfolders/regops.c
-===================================================================
---- src/VBox/Additions/linux/sharedfolders/regops.c
-+++ src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -1401,7 +1401,10 @@ static int vbsf_lock_user_pages_failed_c
- /*
- * Check that this is valid user memory that is actually in the kernel range.
- */
--#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1)
-+#if RTLNX_VER_MIN(5,10,0)
-+ if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
-+ && uPtrFrom >= TASK_SIZE_MAX)
-+#elif RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1)
- if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
- && uPtrFrom >= USER_DS.seg)
- #else
-
diff --git a/srcpkgs/virtualbox-ose/patches/020-linux-5.10-framebuffer-fixes.patch b/srcpkgs/virtualbox-ose/patches/020-linux-5.10-framebuffer-fixes.patch
deleted file mode 100644
index a1bbbd9c3dc..00000000000
--- a/srcpkgs/virtualbox-ose/patches/020-linux-5.10-framebuffer-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: b/src/VBox/Additions/linux/drm/vbox_drv.h
-===================================================================
---- src/VBox/Additions/linux/drm/vbox_drv.h
-+++ src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -205,6 +205,13 @@ static inline void drm_gem_object_put(st
- }
- #endif
-
-+#ifndef TTM_PL_FLAG_SYSTEM
-+#define TTM_PL_FLAG_SYSTEM (1 << TTM_PL_SYSTEM)
-+#endif
-+#ifndef TTM_PL_FLAG_VRAM
-+#define TTM_PL_FLAG_VRAM (1 << TTM_PL_VRAM)
-+#endif
-+
- #define DRIVER_AUTHOR VBOX_VENDOR
-
- #define DRIVER_NAME "vboxvideo"
-Index: b/src/VBox/Additions/linux/drm/vbox_ttm.c
-===================================================================
---- src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -373,11 +373,23 @@ void vbox_ttm_placement(struct vbox_bo *
- bo->placement.busy_placement = bo->placements;
-
- if (domain & TTM_PL_FLAG_VRAM)
-+#if RTLNX_VER_MIN(5,10,0)
-+ bo->placements[c].mem_type = TTM_PL_VRAM;
-+ PLACEMENT_FLAGS(bo->placements[c++]) =
-+ TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
-+#else
- PLACEMENT_FLAGS(bo->placements[c++]) =
- TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
-+#endif
- if (domain & TTM_PL_FLAG_SYSTEM)
-+#if RTLNX_VER_MIN(5,10,0)
-+ bo->placements[c].mem_type = TTM_PL_SYSTEM;
-+ PLACEMENT_FLAGS(bo->placements[c++]) =
-+ TTM_PL_MASK_CACHING;
-+#else
- PLACEMENT_FLAGS(bo->placements[c++]) =
- TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
-+#endif
- if (!c)
- PLACEMENT_FLAGS(bo->placements[c++]) =
- TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
-
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index ff728d6ce40..c9edf805df8 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=6.1.16
-revision=2
+version=6.1.18
+revision=1
wrksrc="VirtualBox-${version}"
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1
+checksum=108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
nopie=yes
lib32disabled=yes
From 7f575456d0f85edba221cbdcc2bbbd86056a8833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 24 Jan 2021 21:02:06 +0100
Subject: [PATCH 040/634] appdata-tools: fix wrong (it)localedir
---
srcpkgs/appdata-tools/template | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..126997ddee9 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -11,3 +11,8 @@ license="GPL-2"
homepage="http://people.freedesktop.org/~hughsient/appdata"
distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_configure() {
+ vsed -i po/Makefile \
+ -e 's;\(itlocaledir = $(prefix)\)/$(DATADIRNAME)/locale;\1/share/locale;'
+}
From 5806cdaf1c38abf9ed6567841aef05953dbfbb10 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Sat, 23 Jan 2021 14:20:12 +0100
Subject: [PATCH 041/634] python-enchant: remove package
pyenchant now requires: Python >=3.5
Closes: #28117 [via git-merge-pr]
---
srcpkgs/python-enchant/template | 14 --------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 14 deletions(-)
delete mode 100644 srcpkgs/python-enchant/template
diff --git a/srcpkgs/python-enchant/template b/srcpkgs/python-enchant/template
deleted file mode 100644
index d29c1ad7ac6..00000000000
--- a/srcpkgs/python-enchant/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-enchant'
-pkgname=python-enchant
-version=2.0.0
-revision=4
-wrksrc="pyenchant-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools enchant-devel"
-depends="enchant"
-short_desc="Spellchecking library for Python 3"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="https://github.com/rfk/pyenchant"
-distfiles="${PYPI_SITE}/p/pyenchant/pyenchant-${version}.tar.gz"
-checksum=fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e5e08f74170..adc3b867bb6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -60,6 +60,7 @@ replaces="
python-PyQt4<=4.12.1_4
python-SecretStorage<=2.3.1_4
python-audit<=2.8.5_2
+ python-enchant<=2.0.0_4
python-jellyfish<=0.6.1_2
python-matplotlib<=2.2.4_2
python-matplotlib-data<=2.2.4_2
From 915016ccf4efdcc22bd0de4ef5a7c069214b5b51 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 23 Jan 2021 09:04:03 +0100
Subject: [PATCH 042/634] cmus: update to 2.9.1 and adopt
---
srcpkgs/cmus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 22052fc3d5d..fd8e518e2af 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,6 +1,6 @@
# Template file for 'cmus'
pkgname=cmus
-version=2.9.0
+version=2.9.1
revision=1
build_style=configure
configure_args="prefix=/usr LD=$CC"
@@ -11,11 +11,11 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
sndio-devel $(vopt_if elogind elogind-devel)"
short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
license="GPL-2.0-or-later"
homepage="https://cmus.github.io"
distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
-checksum=e7ea7f5ec52b991cf378a9caf19e479be16a165a5b26adca058de711e72ad2a0
+checksum=6fb799cae60db9324f03922bbb2e322107fd386ab429c0271996985294e2ef44
build_options="elogind"
build_options_default="elogind"
desc_option_elogind="Support MPRIS interface via elogind"
From d496cc93014165ce9909761aac136ecfab14fcd3 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 23 Jan 2021 12:43:40 +0100
Subject: [PATCH 043/634] oath-toolkit: update to 2.6.6
---
srcpkgs/oath-toolkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oath-toolkit/template b/srcpkgs/oath-toolkit/template
index 3bae5e388a7..2690bccb817 100644
--- a/srcpkgs/oath-toolkit/template
+++ b/srcpkgs/oath-toolkit/template
@@ -1,6 +1,6 @@
# Template file for 'oath-toolkit'
pkgname=oath-toolkit
-version=2.6.5
+version=2.6.6
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
license="GPL-3.0-or-later"
homepage="http://www.nongnu.org/oath-toolkit/"
distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d207120c7e7fdd540142d04ca06d83fb3277c8f2fb794a74535d04b2aa0ec219
+checksum=fd68b315c71ba1db47bcc6e67f598568db4131afc33abd23ed682170e3cb946c
oath-toolkit-devel_package() {
short_desc+=" - development files"
From a2b90da9d7c1e238e619e7172888af5eb2c05ac7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Jan 2021 18:20:32 -0600
Subject: [PATCH 044/634] Amass: update to 3.11.1.
---
srcpkgs/Amass/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index f6a2af0825d..0598c9ff251 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
# Template file for 'Amass'
pkgname=Amass
-version=3.10.5
+version=3.11.1
revision=1
build_style=go
go_import_path="github.com/OWASP/Amass/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=1476e215d3d04532cf6c4467e4975acbe6b4e932ecc29260fca539c8c8cace4e
+checksum=142d18f409acd93e622887181cf84bb9ef4e8bdeb1448158166b252609bbb4c9
From f0da8152227ae298b00dbf6d8b61be8df286aa6e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Jan 2021 18:37:54 -0600
Subject: [PATCH 045/634] zps: update to 1.2.5.
---
srcpkgs/zps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zps/template b/srcpkgs/zps/template
index bcd038c4827..239afcb61e5 100644
--- a/srcpkgs/zps/template
+++ b/srcpkgs/zps/template
@@ -1,6 +1,6 @@
# Template file for 'zps'
pkgname=zps
-version=1.2.3
+version=1.2.5
revision=1
build_style=cmake
short_desc="Small utility for listing and reaping zombie processes"
@@ -8,4 +8,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/orhun/zps"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b4a905d85a0ecae983fe72c5a0284f692374cea0e51ade9fe56e567bbbf2c9ed
+checksum=c007107991518c0a6440efb2af76a59aefeac668dda560cbd34de2bbc859b19c
From fdecce41c155bfc0bb0c440df1910f356bac5fb1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:07:14 -0600
Subject: [PATCH 046/634] wuzz: update to 0.5.0.
---
srcpkgs/wuzz/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index e6cb81b3807..f7c9f04d9ec 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,16 +1,16 @@
# Template file for 'wuzz'
pkgname=wuzz
-version=0.4.0
+version=0.5.0
revision=1
build_style=go
go_import_path=github.com/asciimoo/wuzz
hostmakedepends="git"
short_desc="Interactive cli tool for HTTP inspection"
maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="AGPL-3.0"
+license="AGPL-3.0-or-later"
homepage="https://github.com/asciimoo/wuzz"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=acf8e82481740d1403b744c58918b9089128d91c3c6edc15b76b6e1c97ead645
+checksum=721ea7343698e9f3c69e09eab86b9b1fef828057655f7cebc1de728c2f75151e
post_install() {
vlicense LICENSE
From 274f55a076706e5ff1257baf813a602dc123d6ac Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:08:22 -0600
Subject: [PATCH 047/634] gef: update to 2021.01.
---
srcpkgs/gef/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index 0c2f2d651b3..9188044d9c9 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,7 +1,7 @@
# Template file for 'gef'
pkgname=gef
-version=2020.06
-revision=2
+version=2021.01
+revision=1
pycompile_dirs="usr/share/gef"
depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
short_desc="GDB Enhanced Features for exploit devs & reversers"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://gef.readthedocs.io/en/master/"
distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=334935986c681a346c1cb7944c1e4bbd52f7322f6427dfcba8a0185ff3c551c2
+checksum=59e9c2327a66f125c625affa727feaf43aaf8bf9da0cf1025f428ec8851b1f64
python_version="3"
do_install() {
From 733a7d728ca3200fa4a59d111661278648b2c878 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:09:25 -0600
Subject: [PATCH 048/634] bpytop: update to 1.0.60.
---
srcpkgs/bpytop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index d1b7362fb73..9436b9d4be0 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
# Template file for 'bpytop'
pkgname=bpytop
-version=1.0.59
+version=1.0.60
revision=1
build_style=gnu-makefile
depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/aristocratos/bpytop"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c95d0034ab6567a72d377d12806f5a89f87a796e72b8993fbbb5efc79e5a9133
+checksum=7fc1a40ac6b9cb8f78f1e0e2e7bd58b9197c333ad4c5a4f2cb464d3f8183835b
pre_configure() {
vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py
From 74109dc5928f9c5e416262f1a2b87e7d75e548b5 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 23 Jan 2021 12:23:45 +0100
Subject: [PATCH 049/634] rclone: update to 1.53.4
---
srcpkgs/rclone/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 56b4353c1aa..77b36459d30 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
# Template file for 'rclone'
pkgname=rclone
-version=1.53.3
-revision=2
+version=1.53.4
+revision=1
wrksrc="rclone-v${version}"
build_style=go
go_import_path=github.com/rclone/rclone
@@ -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=f1e213bc6fb7c46f9a4cc8604ae0856718434bdafe07fa3ce449ae9a510a5763
+checksum=68b231a917872b36d73f48b19d2ba98fdaca467e9b433105fa7f4dc3b15f556b
pre_build() {
if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
From 65b67c05f4c3e8edac577798e946c54afde4c91d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:19:39 -0600
Subject: [PATCH 050/634] surgescript: update to 0.5.5.
---
common/shlibs | 2 +-
srcpkgs/surgescript/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8c6b5d9d014..4d393eac604 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -853,7 +853,7 @@ liblua5.1.so.5.1 lua51-5.1.5_1
liblua5.2.so.5.2 lua52-5.2.4_2
liblua5.3.so.5.3 lua53-5.3.5_4
liblua5.4.so.5.4 lua54-5.4.0_1
-libsurgescript.so.0.5.4.4 surgescript-0.5.4.4_2
+libsurgescript.so.0.5.5 surgescript-0.5.5_1
libburn.so.4 libburn-0.7.2_1
libKF5Auth.so.5 kauth-5.26.0_1
libKF5AuthCore.so.5 kauth-5.56.0_1
diff --git a/srcpkgs/surgescript/template b/srcpkgs/surgescript/template
index 54e0b761241..771677d82d9 100644
--- a/srcpkgs/surgescript/template
+++ b/srcpkgs/surgescript/template
@@ -1,7 +1,7 @@
# Template file for 'surgescript'
pkgname=surgescript
-version=0.5.4.4
-revision=2
+version=0.5.5
+revision=1
build_style=cmake
hostmakedepends="pkg-config"
short_desc="Scripting language for games"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://opensurge2d.org/"
distfiles="http://github.com/alemart/surgescript/archive/v${version}.tar.gz"
-checksum=a1a457cea20d6e8178a44633faae0b7fb3334a5cc79a66e28e42ede430e5a38c
+checksum=c9f59131d5cd921a11fb1335fe93bd754f4b1eefa1ed95aaa0343a28437f3f78
surgescript-devel_package() {
short_desc+=" - development files"
From f8952ae062d8fde3e96d0c119da515690a85a70c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:19:46 -0600
Subject: [PATCH 051/634] opensurge: rebuild for surgescript
---
srcpkgs/opensurge/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index f8fae1cc9a9..5fb036d9253 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -1,7 +1,7 @@
# Template file for 'opensurge'
pkgname=opensurge
version=0.5.1.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="surgescript pkg-config"
makedepends="allegro5-devel surgescript surgescript-devel"
From e0f451db015d35b7d69368d88e97412c7d76c17b Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 10:37:15 +0000
Subject: [PATCH 052/634] Thunar: update to 4.17.0.
---
srcpkgs/Thunar/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 3c2bbb8ee38..2d3b6d277ad 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,6 +1,6 @@
# Template file for 'Thunar'
pkgname=Thunar
-version=4.16.1
+version=4.17.0
revision=1
wrksrc=thunar-${version}
build_style=gnu-configure
@@ -11,13 +11,13 @@ configure_args="--enable-gio-unix --enable-gudev
hostmakedepends="pkg-config intltool"
makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Thunar File Manager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Thunar File Manager for XFCE"
+maintainer="Ulf <void@uw.anonaddy.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://docs.xfce.org/xfce/thunar/Start"
changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=da2d17d2cb69eb33768690b714cc232ed367cbd71eb9543aaa2a805d05dc3ce1
+checksum=ad004f02d8bda692d76ec2a264e3e1121ae065f3d2ecc9cfe7dd82cd5c69f8a5
post_install() {
rm -rf ${DESTDIR}/usr/lib/systemd
From c85ad64e873103d78f6a7cff7f3ff72c64a0f421 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 24 Jan 2021 14:03:19 -0600
Subject: [PATCH 053/634] aide: update to 0.17.
---
srcpkgs/aide/patches/fix-errorh-include.patch | 11 +++++++++++
srcpkgs/aide/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/aide/patches/fix-errorh-include.patch
diff --git a/srcpkgs/aide/patches/fix-errorh-include.patch b/srcpkgs/aide/patches/fix-errorh-include.patch
new file mode 100644
index 00000000000..efc4f883c54
--- /dev/null
+++ b/srcpkgs/aide/patches/fix-errorh-include.patch
@@ -0,0 +1,11 @@
+--- include/aide.h.orig
++++ include/aide.h
+@@ -33,7 +33,6 @@
+ #if HAVE_FCNTL_H
+ # include <fcntl.h>
+ #endif
+-#include "error.h"
+
+ #ifndef TEMP_FAILURE_RETRY
+ /* Evaluate EXPRESSION, and repeat as long as it returns -1 with errno'
+
diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index adaa571cf2d..e376acbbaad 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
# Template file for 'aide'
pkgname=aide
-version=0.16.2
+version=0.17
revision=1
build_style=gnu-configure
configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -15,7 +15,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://aide.github.io/"
distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=17f998ae6ae5afb9c83578e4953115ab8a2705efc50dee5c6461cef3f521b797
+checksum=4fd88d1d5ddc70c698c6519ebbc05c8d32c3f6d8137bbfdefeaebaafd6db867b
post_configure() {
vsed -i config.h -e 's/cross/ino_t/g'
From 198010c0416fe3e17811d1643e437685b9070b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 19 Jan 2021 11:25:39 -0300
Subject: [PATCH 054/634] hooks/{pre,post}-install: fix 98-fixup-gir-path.
The libdir changes to use /usr/lib{32,64} instead of /usr/lib broke
cross builds for some packages that use gir, due to issues with copying
over symlinks. Since we haven't managed to track down the root cause for
the installation path, a symlink is a clean enough temporary fix. This
follows the style of the 00-libdir hooks.
Since pre-install runs for the main package and then each subpackage, it
should use PKGDESTDIR (not DESTDIR), which also enables a subpackage
that installs files during pkg_install to work cleanly.
As far as I can see, the previous hook was quite flawed. Since it was a
pre-install hook, the check for a directory would happen *before*
package installation (so nothing would happen). The only reason it did
anything was because it also ran as a step before a subpackage's
pkg_install (most GIR packages have a -devel subpackage), but used
DESTDIR instead of PKGDESTDIR, so it checked and affected the contents
of the main package. Then when the subpackage's pkg_install ran, the
files would have already been copied to the correct folders.
Closes #27437
---
common/hooks/post-install/00-fixup-gir-path.sh | 11 +++++++++++
common/hooks/pre-install/98-fixup-gir-path.sh | 6 ++----
2 files changed, 13 insertions(+), 4 deletions(-)
create mode 100644 common/hooks/post-install/00-fixup-gir-path.sh
diff --git a/common/hooks/post-install/00-fixup-gir-path.sh b/common/hooks/post-install/00-fixup-gir-path.sh
new file mode 100644
index 00000000000..6fdb111fa0b
--- /dev/null
+++ b/common/hooks/post-install/00-fixup-gir-path.sh
@@ -0,0 +1,11 @@
+# This hook removes the symlink necessary to fix the wrong install path of
+# 'gir' files when cross building packages (see pre-install hook). It's a
+# workaround and not a proper fix. Remove it once the root cause of the problem
+# is fixed.
+
+# Has to be a low number so it runs before remove-empty-dirs
+
+hook() {
+ [ -z "$CROSS_BUILD" ] && return
+ rm -f "${PKGDESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr"
+}
diff --git a/common/hooks/pre-install/98-fixup-gir-path.sh b/common/hooks/pre-install/98-fixup-gir-path.sh
index c81c8257294..64fd1405c4c 100644
--- a/common/hooks/pre-install/98-fixup-gir-path.sh
+++ b/common/hooks/pre-install/98-fixup-gir-path.sh
@@ -5,8 +5,6 @@
hook() {
[ -z "$CROSS_BUILD" ] && return
- if [ -d "${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr" ]; then
- cp -a "${DESTDIR}"/usr/{${XBPS_CROSS_TRIPLET}/usr/*,}
- rm -rf "${DESTDIR}"/usr/${XBPS_CROSS_TRIPLET}/usr
- fi
+ vmkdir usr/${XBPS_CROSS_TRIPLET}
+ ln -sf ".." "${PKGDESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr"
}
From 2e976ca6bb95950d51b887cd0d1112bfbcfb3c90 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:00 +0200
Subject: [PATCH 055/634] cinnamon-control-center: update to 4.8.2.
Fix homepage.
---
.../patches/disable-timezone-tests.patch | 13 ----------
srcpkgs/cinnamon-control-center/template | 24 +++++--------------
2 files changed, 6 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch b/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
deleted file mode 100644
index 964fb8c1612..00000000000
--- a/srcpkgs/cinnamon-control-center/patches/disable-timezone-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- panels/datetime/Makefile.am.orig 2015-05-30 08:26:46.499494572 +0200
-+++ panels/datetime/Makefile.am 2015-05-30 08:26:56.890603931 +0200
-@@ -132,8 +132,8 @@ test_endianess_CFLAGS = $(DATETIME_PANEL
- all-local: check-local
-
- check-local: test-timezone-gfx test-endianess test-timezone
-- $(builddir)/test-timezone-gfx $(srcdir)/data
-- $(builddir)/test-endianess
-+# $(builddir)/test-timezone-gfx $(srcdir)/data
-+# $(builddir)/test-endianess
- # $(builddir)/test-timezone
-
- ccpanelsdir = $(PANELS_DIR)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index d818e4223c4..1d503bdb6e8 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=4.6.2
-revision=3
-build_style=gnu-configure
+version=4.8.2
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-update-mimedb --disable-systemd"
-hostmakedepends="autoconf-archive gettext-devel glib-devel automake
+hostmakedepends="gettext-devel glib-devel
gobject-introspection intltool libtool pkg-config libxslt"
makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
@@ -17,25 +16,14 @@ depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-da
short_desc="Cinnamon Control Center"
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"
+homepage="https://github.com/linuxmint/cinnamon-control-center"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=f887d7e185f8ff1ee6f9789219231cba8be820c706b316d35ee5118d2fd898eb
+checksum=407e88fe458af7b25c0dd91d54aad93a72a1464ced285a741ed1ce6249ed61af
do_check() {
:
}
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
-
-post_install() {
- # Remove unused stuff
- make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
- rm -R "$DESTDIR/usr/share/applications"
- rm -R "$DESTDIR/etc"
-}
-
libcinnamon-control-center_package() {
short_desc+=" - runtime library"
pkg_install() {
From 7669f2fbb21503a0e79477a183e57f134f3c6146 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:13 +0200
Subject: [PATCH 056/634] cinnamon-desktop: update to 4.8.1.
---
srcpkgs/cinnamon-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 77dfab737b6..985e05ed492 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-desktop'
pkgname=cinnamon-desktop
-version=4.6.4
-revision=2
+version=4.8.1
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-desktop"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=8b0f69c4acbeabca723a95ec80905601eec8d563c96ad88a9de3ddac56925ef6
+checksum=cb9aeff385764ba33cf4f7ee2bb5cb7308960670e8fa9f3be38a1d431b20436d
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From a467183ae44aadb75d3b00948456c27499ee4e5a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:21 +0200
Subject: [PATCH 057/634] cinnamon-menus: update to 4.8.2.
Fix homepage.
---
srcpkgs/cinnamon-menus/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 4611ddd3ca0..0452a1f464e 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-menus'
pkgname=cinnamon-menus
-version=4.6.1
-revision=2
+version=4.8.2
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel gobject-introspection intltool libtool pkg-config"
@@ -9,9 +9,9 @@ makedepends="libglib-devel gobject-introspection"
short_desc="Cinnamon menu specifications"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-menus"
+homepage="https://github.com/linuxmint/cinnamon-menus"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=534cf3e15fed812e1affb544811e10823edbc56360b52a80ffbabc006c467dc6
+checksum=6c19ebcea0d35a7a65cd70f1cdca2c5c739467ac6d2c2a1c38a5d580296707bd
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From ae59aa11c3c1e788acd68924a9cdde3267a74578 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:28 +0200
Subject: [PATCH 058/634] cinnamon-screensaver: update to 4.8.1.
Fix homepage.
---
srcpkgs/cinnamon-screensaver/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index e45409aae8a..2a711b6e88a 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-screensaver'
pkgname=cinnamon-screensaver
-version=4.6.0
-revision=2
+version=4.8.1
+revision=1
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel gobject-introspection
@@ -14,9 +14,9 @@ conf_files="/etc/pam.d/${pkgname}"
short_desc="Cinnamon screensaver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-screensaver"
+homepage="https://github.com/linuxmint/cinnamon-screensaver"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e93349521a24f2b49c8a293ee15798ba341ae8e9b000cf3da5311a162ce8cb60
+checksum=e06a9f28cba55c38d1464d02917eb374de941fd09007608c239a348e7653b675
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From c76120a636da0c7102d1a744513dcdbb32ee85e2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:36 +0200
Subject: [PATCH 059/634] cinnamon-session: update to 4.8.0.
---
srcpkgs/cinnamon-session/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index bd9d618653c..c27272b802a 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-session'
pkgname=cinnamon-session
-version=4.6.2
-revision=2
+version=4.8.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dgconf=false"
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=0d4793d8fb828ce8ec6dbedc67a5d244e56d4182b83030d10029eadc0c6723e6
+checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4
From 0950ca575f7bedbfd011be45bae8b199d2384073 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:42 +0200
Subject: [PATCH 060/634] cinnamon-settings-daemon: update to 4.8.5.
Fix homepage.
---
srcpkgs/cinnamon-settings-daemon/template | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index a41b897347f..2e5239c2c89 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,12 +1,11 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=4.6.4
-revision=2
-build_style=gnu-configure
+version=4.8.5
+revision=1
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-schemas-compile"
-hostmakedepends="dbus-glib-devel gettext-devel glib-devel automake
- gobject-introspection intltool libtool pkg-config"
+hostmakedepends="dbus-glib-devel gettext-devel glib-devel
+ gobject-introspection intltool pkg-config"
makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
nss-devel polkit-devel pulseaudio-devel upower-devel"
@@ -14,13 +13,9 @@ 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="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-settings-daemon"
+homepage="https://github.com/linuxmint/cinnamon-settings-daemon"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=5c3d78c562f60cbd6348d1bbb3f7b0a98dbf0b483961b2f82f6b260b956d9db0
-
-pre_configure() {
- NOCONFIGURE=1 ./autogen.sh
-}
+checksum=f2e770113230e04bb5fe887c33b725ac273dcac912a3825ab6b9c821ce92ff32
do_check() {
:
From 08f6b0442955c9c001c397e99f1c29a64936fa5e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:50 +0200
Subject: [PATCH 061/634] cinnamon-translations: update to 4.8.3.
---
srcpkgs/cinnamon-translations/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 7c31bd54a00..8c4f65b3812 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=4.6.2
-revision=2
+version=4.8.3
+revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://translations.launchpad.net/linuxmint/latest/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=f79b818c3339dec395a8739ebfdb9079e236eeb9608768d76fecfe77dc231cb4
+checksum=272b4e128b352f8a877bb57eaa4ed85ff72ad1cb25c4c58c8a35d0b093908f93
do_install() {
vmkdir usr
From 2938f1dd1430b8d3498af91b2c9b641ba282a9bf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:39 +0200
Subject: [PATCH 062/634] cinnamon: update to 4.8.6.
Fix homepage.
---
srcpkgs/cinnamon/template | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index c495532ae6b..165458ac7da 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,13 +1,11 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=4.6.7
+version=4.8.6
revision=1
build_helper=gir
-build_style=gnu-configure
-configure_args="--disable-static --disable-schemas-compile
- --enable-compile-warnings=no --disable-gtk-doc"
-hostmakedepends="automake libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto autoconf-archive gtk-doc"
+build_style=meson
+hostmakedepends="libtool pkg-config gobject-introspection gettext
+ gettext-devel glib-devel intltool xmlto gtk-doc"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel
@@ -24,10 +22,10 @@ depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
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/${version}/debian/changelog"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=fcc6182a074b15d599dd53014086bb77b0bdceb3e667627e9125331f5ad0195e
+homepage="https://github.com/linuxmint/cinnamon"
+changelog="https://raw.githubusercontent.com/linuxmint/cinnamon/${version}/debian/changelog"
+distfiles="https://github.com/linuxmint/cinnamon/archive/${version}.tar.gz"
+checksum=00f82253f44c694c379e29959aa6e57b4878b722df1f08d68f9466272ef64893
python_version=3
pycompile_dirs="
@@ -45,7 +43,7 @@ pycompile_dirs="
pre_configure() {
# Add polkit agent to required components
vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
- -i files/cinnamon2d.session.in files/cinnamon.session.in
+ -i cinnamon2d.session.in cinnamon.session.in
# Check for the cc-panel path, not for the unneeded binary
vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
@@ -56,6 +54,4 @@ pre_configure() {
# Remove broken symlink
rm -f files/etc/xdg/menus/cinnamon-applications-merged
-
- NOCONFIGURE=1 ./autogen.sh
}
From b389e9d31e6b2b785716718fb6afae3bb11f940f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:27 +0200
Subject: [PATCH 063/634] xapps: update to 2.0.6.
Includes changes by @ndowens.
Closes: #26965 [via git-merge-pr]
---
srcpkgs/xapps/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 1589440927e..1824998fc75 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,13 +1,13 @@
# Template file for 'xapps'
pkgname=xapps
-version=1.8.10
+version=2.0.6
revision=1
wrksrc="xapp-${version}"
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
-makedepends="gettext-devel gobject-introspection libgnomekbd-devel
- python3-gobject-devel libdbusmenu-gtk3-devel"
+makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
+ libdbusmenu-gtk3-devel"
depends="gist inxi xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -15,12 +15,12 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/linuxmint/xapps"
changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=a0d542de6dc4d6a318bdf1fad88447db270ab2dd0582f0c6f28008cc77337672
+checksum=4541a54760715f54fe6ab6174d4e040f5bfa3a0186b63836f2332a3ddfde3cc6
xapps-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel
- gdk-pixbuf-devel"
+ gdk-pixbuf-devel"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
From 415a200c2a51e1efeabc6f4d16e7f6b838a19831 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:48 +0200
Subject: [PATCH 064/634] cjs: update to 4.8.2.
Fix homepage.
---
srcpkgs/cjs/template | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 309dab47438..fbf86ea36b6 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,28 +1,29 @@
# Template file for 'cjs'
pkgname=cjs
-version=4.6.0
+version=4.8.2
revision=1
-build_style=gnu-configure
+build_style=meson
build_helper=gir
-configure_args="--disable-static --disable-profiler"
-hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config
- gobject-introspection glib-devel dbus mozjs52-devel"
+# XXX: disable tests because they need dbus, X and GTK, same as gjs
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled -Dinstalled_tests=false"
+hostmakedepends="pkg-config gobject-introspection glib-devel dbus mozjs78-devel"
makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs52 mozjs52-devel"
+ gtk+3-devel mozjs78 mozjs78-devel"
short_desc="Javascript for Cinnamon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
-homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
+homepage="https://github.com/linuxmint/cjs"
distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz"
-checksum=47f8abb867881594766fec1398d1b9117012826c5e72ecafb3153a0c8226bf81
-
+checksum=c3248663e0084dbcee1bf4d1db56966c1321983617dbbec9b1253e50614a3f4e
+# The deleted lines in meson.build try to build and run a simple program,
+# and that does not work when cross-compiling.
pre_configure() {
- cp ${FILESDIR}/ax_code_coverage.m4 m4/
-
- NOCONFIGURE=1 ./autogen.sh
+ vsed -e '/Check if a minimal SpiderMonkey program compiles/,/^endif/d' -i meson.build
}
+
cjs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 954454406f9e6d4a41652a253df05aad11c6a45f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:58 +0200
Subject: [PATCH 065/634] muffin: update to 4.8.1.
Fix homepage.
---
srcpkgs/muffin/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 2a014dd6d82..6c3d645ef6a 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=4.6.3
+version=4.8.1
revision=1
build_style=gnu-configure
build_helper=gir
@@ -14,9 +14,9 @@ depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
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/"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=e634209f1a1dfec7efc7c741e65014903ea937926070dba3793cac595df3d5a3
+homepage="https://github.com/linuxmint/muffin"
+distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz"
+checksum=d342165270690c8565004cd6aa26aa79620d99e442ee6207061c26a505690407
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
@@ -35,7 +35,6 @@ muffin-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/lib/*.so"
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gir-1.0
From 72bb0c253ce968fc0046be6efb0d20f6012baeb0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:15 +0200
Subject: [PATCH 066/634] nemo: update to 4.8.4.
Include changes by @ndowens.
Also by ericonr:
- fix names in .desktop file to differentiate between them
- fix homepage.
---
srcpkgs/nemo/patches/fix-gir-path.patch | 11 -----------
srcpkgs/nemo/template | 17 ++++++++---------
2 files changed, 8 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/nemo/patches/fix-gir-path.patch
diff --git a/srcpkgs/nemo/patches/fix-gir-path.patch b/srcpkgs/nemo/patches/fix-gir-path.patch
deleted file mode 100644
index 317b031af15..00000000000
--- a/srcpkgs/nemo/patches/fix-gir-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnemo-extension/meson.build
-+++ libnemo-extension/meson.build
-@@ -61,7 +61,7 @@
- dependencies: nemo_extension_deps,
- )
-
--typelibdir = go_intr.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', get_option('libdir')])
-+typelibdir = go_intr.get_pkgconfig_variable('typelibdir')
-
- gnome.generate_gir(nemo_extension_lib,
- sources: nemo_extension_sources + nemo_extension_headers,
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index ef869db4d31..e89c63f829b 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
# Template file for 'nemo'
pkgname=nemo
-version=4.6.5
+version=4.8.4
revision=1
build_style=meson
build_helper=gir
@@ -12,21 +12,20 @@ depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
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/"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=35f18063c4e9e0f94997454482553f48296eb97afe13bcbd56e99a87ea8eb78e
+homepage="https://github.com/linuxmint/nemo"
+distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
+checksum=089740d1a52a98e8bc0cda9d0512822e0b6b12d2a09c3d857b01a3232156f98a
python_version=3
-
do_check() {
:
- # requires a display
- # Gtk-WARNING **: 18:34:08.533: cannot open display:
+ # Requires xvfb-run and dbus-run-session;
+ # can't be run inside chroot due to fusermount3
}
-pre_configure() {
+post_patch() {
# Rename 'Files' app name to avoid having the same as nautilus
- sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in
+ vsed -i 's/^Name.*=.*/& - Nemo/' data/nemo.desktop.in
}
libnemo_package() {
From c2d3750cb7c60bce540146dc9fb5fb2cced28762 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:20 +0200
Subject: [PATCH 067/634] nemo-fileroller: update to 4.8.0.
---
srcpkgs/nemo-fileroller/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index e33cba72c74..62f53f6365d 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,7 +1,7 @@
# Template file for 'nemo-fileroller'
pkgname=nemo-fileroller
-version=4.6.0
-revision=2
+version=4.8.0
+revision=1
wrksrc="nemo-extensions-${version}"
build_wrksrc=nemo-fileroller
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/nemo-extensions"
distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
+checksum=1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4
pre_configure() {
autoreconf -fi
From 445631a166c472e5346e3e5b5f4bfe334810f167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 19 Jan 2021 12:18:22 -0300
Subject: [PATCH 068/634] mozjs52: remove package.
---
srcpkgs/mozjs52-devel | 1 -
.../patches/mozjs52-copy-headers.patch | 30 ---------
.../patches/mozjs52-disable-mozglue.patch | 66 ------------------
.../mozjs52/patches/mozjs52-fix-soname.patch | 34 ----------
.../mozjs52-include-configure-script.patch | 48 -------------
srcpkgs/mozjs52/patches/mozjs52.pc.patch | 8 ---
srcpkgs/mozjs52/template | 67 -------------------
srcpkgs/mozjs52/update | 1 -
8 files changed, 255 deletions(-)
delete mode 120000 srcpkgs/mozjs52-devel
delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
delete mode 100644 srcpkgs/mozjs52/patches/mozjs52.pc.patch
delete mode 100644 srcpkgs/mozjs52/template
delete mode 100644 srcpkgs/mozjs52/update
diff --git a/srcpkgs/mozjs52-devel b/srcpkgs/mozjs52-devel
deleted file mode 120000
index c5eb332bc27..00000000000
--- a/srcpkgs/mozjs52-devel
+++ /dev/null
@@ -1 +0,0 @@
-mozjs52
\ No newline at end of file
diff --git a/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch b/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
deleted file mode 100644
index 69b216151e0..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8b2d7a77bfb4dbd513763501ed7e9722058ee9af Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 5 Jul 2017 22:45:59 -0700
-Subject: [PATCH] build: Copy headers on install instead of symlinking
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento@gmail.com>.
----
- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index 132dcf94..33d489a6 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1307,11 +1307,11 @@ def _process_final_target_files(self, obj, files, backend_file):
- raise Exception("Wildcards are only supported in the filename part of "
- "srcdir-relative or absolute paths.")
-
-- install_manifest.add_pattern_symlink(basepath, wild, path)
-+ install_manifest.add_pattern_copy(basepath, wild, path)
- else:
-- install_manifest.add_pattern_symlink(f.srcdir, f, path)
-+ install_manifest.add_pattern_copy(f.srcdir, f, path)
- else:
-- install_manifest.add_symlink(f.full_path, dest)
-+ install_manifest.add_copy(f.full_path, dest)
- else:
- install_manifest.add_optional_exists(dest)
- backend_file.write('%s_FILES += %s\n' % (
diff --git a/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch b/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
deleted file mode 100644
index 8355cf4b0ea..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001
-From: Till Schneidereit <till@tillschneidereit.net>
-Date: Thu, 1 Oct 2015 12:59:09 +0200
-Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all
- platforms
-
-Otherwise, build fails not being able to find HashBytes.
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento@gmail.com>.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1176787
----
- js/src/old-configure.in | 23 ++++++++++++++---------
- mozglue/build/moz.build | 2 +-
- 2 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 1c5c9e21..ff0617e3 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1623,16 +1623,21 @@ dnl ========================================================
- dnl = Enable jemalloc
- dnl ========================================================
-
--case "${OS_TARGET}" in
--Android|WINNT|Darwin)
-+dnl In stand-alone builds we always only want to link executables against mozglue.
-+if test "$JS_STANDALONE"; then
- MOZ_GLUE_IN_PROGRAM=
-- ;;
--*)
-- dnl On !Android !Windows !OSX, we only want to link executables against mozglue
-- MOZ_GLUE_IN_PROGRAM=1
-- AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
-- ;;
--esac
-+else
-+ case "${OS_TARGET}" in
-+ Android|WINNT|Darwin)
-+ MOZ_GLUE_IN_PROGRAM=
-+ ;;
-+ *)
-+ dnl On !Android !Windows !OSX, we only want to link executables against mozglue
-+ MOZ_GLUE_IN_PROGRAM=1
-+ AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
-+ ;;
-+ esac
-+fi
-
- if test "$MOZ_MEMORY"; then
- if test "x$MOZ_DEBUG" = "x1"; then
-diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
-index d2897477..e3be5a2b 100644
---- a/mozglue/build/moz.build
-+++ b/mozglue/build/moz.build
-@@ -6,7 +6,7 @@
-
- # Build mozglue as a shared lib on Windows, OSX and Android.
- # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
--if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
-+if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']:
- SharedLibrary('mozglue')
- else:
- Library('mozglue')
-
diff --git a/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch b/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
deleted file mode 100644
index a91107c1568..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Date: Fri, 02 May 2014 22:20:45 +0200
-Subject: fix soname
-
-Add soname switch to linker, regardless of Operating System
-
-Bug-Debian: http://bugs.debian.org/746705
----
- config/rules.mk | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: mozjs52-52.2.1~artful1/config/rules.mk
-===================================================================
---- mozjs52-52.2.1~artful1.orig/config/rules.mk
-+++ mozjs52-52.2.1~artful1/config/rules.mk
-@@ -418,7 +418,7 @@ endif # AIX
- #
- # Linux: add -Bsymbolic flag for components
- #
--ifeq ($(OS_ARCH),Linux)
-+#ifeq ($(OS_ARCH),Linux)
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
-@@ -426,7 +426,8 @@ ifdef LD_VERSION_SCRIPT
- EXTRA_DSO_LDOPTS += -Wl,--version-script,$(LD_VERSION_SCRIPT)
- EXTRA_DEPS += $(LD_VERSION_SCRIPT)
- endif
--endif
-+#endif
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
-
- ifdef SYMBOLS_FILE
- ifeq ($(OS_TARGET),WINNT)
diff --git a/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch b/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
deleted file mode 100644
index c24d7b157f3..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4a06a1a6a71293decb83aee7adb74bc709493106 Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento@gmail.com>
-Date: Wed, 5 Jul 2017 22:57:09 -0700
-Subject: [PATCH] build: Include configure script, be nicer about options
-
-A configure script is not included in the SpiderMonkey tarball by
-default. Also, we have to account for JHbuild passing extra unknown
-options like --disable-Werror.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1379540
----
- js/src/configure | 9 +++++++++
- python/mozbuild/mozbuild/configure/__init__.py | 2 +-
- python/mozbuild/mozbuild/configure/options.py | 6 +++++-
- 3 files changed, 15 insertions(+), 2 deletions(-)
- create mode 100755 js/src/configure
-
-diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
-index 0fe640ca..09b460d3 100644
---- a/python/mozbuild/mozbuild/configure/__init__.py
-+++ b/python/mozbuild/mozbuild/configure/__init__.py
-@@ -356,7 +356,7 @@ def run(self, path=None):
- # All options should have been removed (handled) by now.
- for arg in self._helper:
- without_value = arg.split('=', 1)[0]
-- raise InvalidOptionError('Unknown option: %s' % without_value)
-+ print('Ignoring', without_value, ': Unknown option')
-
- # Run the execution queue
- for func, args in self._execution_queue:
-diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py
-index 4310c862..15bfe425 100644
---- a/python/mozbuild/mozbuild/configure/options.py
-+++ b/python/mozbuild/mozbuild/configure/options.py
-@@ -402,7 +402,11 @@ def __init__(self, environ=os.environ, argv=sys.argv):
-
- def add(self, arg, origin='command-line', args=None):
- assert origin != 'default'
-- prefix, name, values = Option.split_option(arg)
-+ try:
-+ prefix, name, values = Option.split_option(arg)
-+ except InvalidOptionError as e:
-+ print('Ignoring', arg, ':', e)
-+ return
- if args is None:
- args = self._extra_args
- if args is self._extra_args and name in self._extra_args:
-
diff --git a/srcpkgs/mozjs52/patches/mozjs52.pc.patch b/srcpkgs/mozjs52/patches/mozjs52.pc.patch
deleted file mode 100644
index 6d85bb05f4e..00000000000
--- a/srcpkgs/mozjs52/patches/mozjs52.pc.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/js/src/js.pc.in
-+++ b/js/src/js.pc.in
-@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript
- Version: @MOZILLA_VERSION@
- @PKGCONF_REQUIRES_PRIVATE@
- Libs: -L${libdir} -l@JS_LIBRARY_NAME@
--Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
-+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@
diff --git a/srcpkgs/mozjs52/template b/srcpkgs/mozjs52/template
deleted file mode 100644
index 383767ea777..00000000000
--- a/srcpkgs/mozjs52/template
+++ /dev/null
@@ -1,67 +0,0 @@
-# Template file for 'mozjs52'
-pkgname=mozjs52
-version=52.9.0
-revision=7
-wrksrc="firefox-${version}esr"
-build_wrksrc="js/src"
-build_style=gnu-configure
-hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive which"
-makedepends="icu-devel libffi-devel nspr-devel zlib-devel readline-devel"
-depends="nspr>=4.13.1"
-short_desc="Mozilla JavaScript interpreter and library (52.x series)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6
-patch_args="-Np1"
-
-# Flags for gcc6.3 conceived by Arch Linux developers
-CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing"
-CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-# Flags for gcc9.1
-CFLAGS+=" -Wno-format-overflow"
-CXXFLAGS+=" -Wno-format-overflow"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- LDFLAGS+=" -latomic"
-fi
-
-do_configure() {
- local _args
-
- if [ "$CROSS_BUILD" ]; then
- export HOST_CFLAGS="-Os"
- export HOST_CXXFLAGS="-Os"
- _args+=" --target=$XBPS_CROSS_TRIPLET"
- fi
-
- touch ${wrksrc}/js/src/configure
- SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --disable-jemalloc --disable-optimize --enable-ctypes \
- --enable-gcgenerational --enable-pie --enable-readline \
- --enable-shared-js --enable-system-ffi --enable-tests \
- --enable-threadsafe --enable-xterm-updates --with-intl-api \
- --with-system-icu --with-system-nspr --with-system-zlib \
- ${_args}
-}
-
-post_install() {
- mv $DESTDIR/usr/lib/libmozjs-52.so $DESTDIR/usr/lib/libmozjs-52.so.0
- ln -sr $DESTDIR/usr/lib/libmozjs-52.so.0 $DESTDIR/usr/lib/libmozjs-52.so
-}
-
-mozjs52-devel_package() {
- depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/js52-config
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove "usr/lib/*.ajs"
- vmove usr/lib/pkgconfig
- }
-}
diff --git a/srcpkgs/mozjs52/update b/srcpkgs/mozjs52/update
deleted file mode 100644
index a1c3f7e43b0..00000000000
--- a/srcpkgs/mozjs52/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="mozjs"
From ee879a50fe666a6ab3f64a28a78bbcf4fc3b89f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:11:07 -0300
Subject: [PATCH 069/634] mozjs52: complete removal.
- remove from common/shlibs; also remove mozjs24 entry
- add to removed-packages
---
common/shlibs | 3 ---
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4d393eac604..979daeddbf1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1594,7 +1594,6 @@ libwx_gtk2u_ribbon-3.0.so.0 wxWidgets-3.0.0_1
libwx_gtk2u_media-3.0.so.0 wxWidgets-3.0.1_1
libmspack.so.0 libmspack-0.4alpha_1
libslim.so.1.3.6 slim-1.3.6_1
-libmozjs-24.so mozjs24-24.2.0_1
libmediaart-2.0.so.0 libmediaart-1.9.1_1
libinput.so.10 libinput-1.2.0_1
libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
@@ -3144,8 +3143,6 @@ libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
libsysprof-ui-4.so sysprof-3.37.90_1
-libmozjs-52.so mozjs52-52.3.0_1
-libmozjs-52.so.0 mozjs52-52.3.0_1
libvala-0.50.so.0 libvala-0.50.0_1
libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index adc3b867bb6..7fa5d31e349 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -51,6 +51,7 @@ replaces="
mdds0<=0.12.1_3
mirrorbits<=0.5.1_1
mongroup<=0.4.1_2
+ mozjs52<=52.9.0_7
phonon-backend-gstreamer<=4.9.0_2
phonon-backend-vlc<=0.9.1_3
polkit-qt<=0.112.0_5
From a5fd714d57e903c46fe879d7d299f9e30e4a4ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:38:27 -0300
Subject: [PATCH 070/634] polari: use mozjs78 for tests.
---
srcpkgs/polari/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index f2f80a2e541..ec369387997 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config itstool gobject-introspection gettext"
makedepends="gjs-devel gspell-devel gtk+3-devel libsecret-devel
libsoup-gnome-devel telepathy-glib-devel telepathy-logger-devel"
depends="gspell telepathy-idle telepathy-logger telepathy-mission-control"
-checkdepends="appstream-glib desktop-file-utils mozjs60"
+checkdepends="appstream-glib desktop-file-utils mozjs78"
short_desc="GNOME IRC client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 42bfb2e404c5af75731287a081781056d8ebff2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 24 Jan 2021 22:49:41 +0100
Subject: [PATCH 071/634] autoconf_cache/common-glibc: remove *sys_siglist
entries, removed with glibc 2.32
---
common/environment/configure/autoconf_cache/common-glibc | 7 -------
1 file changed, 7 deletions(-)
diff --git a/common/environment/configure/autoconf_cache/common-glibc b/common/environment/configure/autoconf_cache/common-glibc
index fb862cbd94a..9823c537900 100644
--- a/common/environment/configure/autoconf_cache/common-glibc
+++ b/common/environment/configure/autoconf_cache/common-glibc
@@ -1,10 +1,3 @@
-# general
-ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes}
-
-# bash
-bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes}
-bash_cv_sys_siglist=${bash_cv_sys_siglist=yes}
-
# clamav
clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes}
clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
From 8335dbf783d94e8f7e1c079841962793fc4a2304 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:32:36 +0000
Subject: [PATCH 072/634] terraform: update to 0.14.5.
---
srcpkgs/terraform/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 788b4b2c78d..0bf22d7f0a0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
# Template file for 'terraform'
pkgname=terraform
-version=0.14.4
+version=0.14.5
revision=1
build_style=go
go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MPL-2.0"
homepage="https://www.terraform.io/"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=56da03b95c62c849adf5c5397ae4bc3b8cad2ca4ffb26244d3daf90567208e63
+checksum=bf4e60f5da3f2d461d730ddc4d34ee9cc7ab57f29c22bdd518c7267697f30e50
From 646c75e7c7899781017012b1afb5b5e416c60b03 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:39:15 +0000
Subject: [PATCH 073/634] go-jira: update to 1.0.27.
---
srcpkgs/go-jira/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index 898dcf8672b..b785d8a03a9 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,6 +1,6 @@
# Template file for 'go-jira'
pkgname=go-jira
-version=1.0.26
+version=1.0.27
revision=1
wrksrc="jira-${version}"
build_style=go
@@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://$go_import_path"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=306e58e5affa231e84b35ff965b3c359adb4bc853054b3bde9f80b8f07cee80b
+checksum=c5bcf7b61300b67a8f4e42ab60e462204130c352050e8551b1c23ab2ecafefc7
From 379b6c67c09d5169999aa5224b12862ac1e40e46 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:40:41 +0000
Subject: [PATCH 074/634] docker: update to 19.03.14.
---
srcpkgs/docker/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 823d471d214..16af17ca4fb 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,6 +1,6 @@
# Template file for 'docker'
pkgname=docker
-version=19.03.13
+version=19.03.14
revision=1
create_wrksrc=yes
build_style=go
@@ -20,9 +20,9 @@ distfiles="
https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="b2ff08675738031b6d6d59a90226657c16726851957c11b5fb85a4598b933b92
+checksum="0b8838b0da1f1368fc1a0809a2ed11840bd7d58df1f090e668de209faddcef7c
1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- a5e190a5acd6f20a2eb73a0b083d9ba1279ac1cc97a93c66cdecf3c40e0e384a"
+ 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
# These are required at run-time.
From c040efb805070636594e8956088c0b212d395228 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:47:38 +0000
Subject: [PATCH 075/634] yoshimi: update to 1.7.4.
---
srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch | 43 --------------------
srcpkgs/yoshimi/template | 4 +-
2 files changed, 2 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch
diff --git a/srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch b/srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch
deleted file mode 100644
index 6e0b811ec6d..00000000000
--- a/srcpkgs/yoshimi/patches/fix-lv2-1.18.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/LV2_Plugin/YoshimiLV2Plugin.h 2020-04-20 11:31:08.000000000 +0200
-+++ src/LV2_Plugin/YoshimiLV2Plugin.h 2020-12-27 09:24:22.402582559 +0100
-@@ -106,7 +106,7 @@
- virtual void registerAudioPort(int) {}
-
- //static methods
-- static LV2_Handle instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-+ static LV2_Handle instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
- static void connect_port(LV2_Handle instance, uint32_t port, void *data_location);
- static void activate(LV2_Handle instance);
- static void deactivate(LV2_Handle instance);
-@@ -159,7 +159,7 @@
- YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
- ~YoshimiLV2PluginUI();
- bool init();
-- static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-+ static LV2UI_Handle instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
- static void cleanup(LV2UI_Handle ui);
- static void static_guiClosed(void *arg);
- void run();
---- src/LV2_Plugin/YoshimiLV2Plugin.cpp 2020-04-20 11:31:08.000000000 +0200
-+++ src/LV2_Plugin/YoshimiLV2Plugin.cpp 2020-12-27 09:27:36.598189783 +0100
-@@ -378,7 +378,7 @@
- }
-
-
--LV2_Handle YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
-+LV2_Handle YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
- {
- SynthEngine *synth = new SynthEngine(0, NULL, true);
- if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){
-@@ -711,9 +711,9 @@
- }
-
-
--LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
-+LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
- {
-- const _LV2UI_Descriptor *desc = descriptor;
-+ const LV2UI_Descriptor *desc = descriptor;
- descriptor = desc;
- const char *plug = plugin_uri;
- plugin_uri = plug;
diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 5d198fee638..1c4bcb51949 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,6 +1,6 @@
# Template file for 'yoshimi'
pkgname=yoshimi
-version=1.7.1
+version=1.7.4
revision=1
build_wrksrc=src
build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later"
homepage="https://yoshimi.github.io/"
distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=b75560761d7abebf7e901bd2b0dd1f55650cab2c3ff551f7e4820425ce325c28
+checksum=27a8e33bda72aafae604e14841bed6373fc9e00ff70c98f1e13215d6a8808318
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone";;
From 36f7465b6dc20b6e45214f59a0f98ac491d6aa6c Mon Sep 17 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, 23 Jan 2021 12:17:04 +0700
Subject: [PATCH 076/634] fwupd: update to 1.5.5.
---
srcpkgs/fwupd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index f5302a83261..78e80957ef9 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,6 +1,6 @@
# Template file for 'fwupd'
pkgname=fwupd
-version=1.5.2
+version=1.5.5
revision=1
build_style=meson
build_helper="gir"
@@ -27,7 +27,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/hughsie/fwupd"
distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz"
-checksum=bc7a1eb5e494810e2622442c2942b1a06d926c906db3b2612c3e8c892806ff56
+checksum=1a6d5026ae37708718b7c0bb277050c96934acb636605f1c0295eba8ff627ea3
replaces="fwupdate>=0"
case "$XBPS_TARGET_MACHINE" in
From 4079721e8b95e87783cd1ae142112783fc0e1794 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 00:22:17 +0000
Subject: [PATCH 077/634] rng-tools: update to 6.11.
---
...-configure-ac-fix-with-rtlsdr-option.patch | 27 ----------
..._jitter-disambiguate-call-to-encrypt.patch | 51 -------------------
...move-name-conflict-with-libc-encrypt.patch | 42 ---------------
...igure-ac-jitterentropy-needs-pthread.patch | 15 ------
srcpkgs/rng-tools/template | 6 +--
5 files changed, 3 insertions(+), 138 deletions(-)
delete mode 100644 srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch
delete mode 100644 srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch
delete mode 100644 srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch
delete mode 100644 srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch
diff --git a/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch b/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch
deleted file mode 100644
index 840906e9c15..00000000000
--- a/srcpkgs/rng-tools/patches/0001-configure-ac-fix-with-rtlsdr-option.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-upstream: yes
-
-From 45a8c51a20a518ed78c5ea1829a307c045f737be Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 27 Mar 2020 22:19:42 +0100
-Subject: [PATCH] configure.ac: fix --with-rtlsdr option
-
-Add missing ',' to allow the user to explicitly disable or enable rtlsdr
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ba796f8..1f55052 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,7 @@ AC_ARG_WITH([pkcs11],
-
- AC_ARG_WITH([rtlsdr],
- AS_HELP_STRING([--without-rtlsdr],
-- [Disable rtlsdr support. ])
-+ [Disable rtlsdr support. ]),
- [],
- [with_rtlsdr=no]
- )
diff --git a/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch b/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch
deleted file mode 100644
index e3b54940524..00000000000
--- a/srcpkgs/rng-tools/patches/0002-rngd_jitter-disambiguate-call-to-encrypt.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-upstream: yes
-
-From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 30 Mar 2020 00:10:46 +0200
-Subject: [PATCH] rngd_jitter: disambiguate call to encrypt
-
-Commit 0f184ea7e792427fb20afe81d471b565aee96f0b disambiguate the call to
-encrypt in rngd_rdrand.c but did not update rngd_jitter.c.
-
-This raise the following build failure:
-
-rngd_jitter.c:75:12: error: conflicting types for 'encrypt'
- static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
- ^~~~~~~
-In file included from rngd_jitter.c:27:
-/home/dawncrow/buildroot-test/scripts/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/unistd.h:1132:13: note: previous declaration of 'encrypt' was here
- extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1));
- ^~~~~~~
-Makefile:770: recipe for target 'rngd-rngd_jitter.o' failed
-
-Fixes:
- - http://autobuild.buildroot.org/results/0ca6bf16e3acbc94065b88c4442d6595424b77cb
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- rngd_jitter.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/rngd_jitter.c b/rngd_jitter.c
-index c1b1aca..49a3825 100644
---- a/rngd_jitter.c
-+++ b/rngd_jitter.c
-@@ -72,7 +72,7 @@ unsigned char *aes_buf;
- char key[AES_BLOCK];
- static unsigned char iv_buf[CHUNK_SIZE] __attribute__((aligned(128)));
-
--static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
-+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
- unsigned char *iv, unsigned char *ciphertext)
- {
- EVP_CIPHER_CTX *ctx;
-@@ -122,7 +122,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src)
- unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS];
-
- /* Encrypt the plaintext */
-- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf,
-+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf,
- ciphertext);
- if (!ciphertext_len)
- return -1;
diff --git a/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch b/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch
deleted file mode 100644
index 71c506ee38c..00000000000
--- a/srcpkgs/rng-tools/patches/0003-remove-name-conflict-with-libc-encrypt.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-upstream: yes
-
-From a4b6d9ce64f132e463b9091d0536913ddaf11516 Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@tuxdriver.com>
-Date: Thu, 30 Apr 2020 16:57:35 -0400
-Subject: [PATCH] Remove name conflict with libc encrypt
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Forgot to fixup the funciton name conflict with libcs encrypt() function
-on power systems
-
-Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
-Reported-by: Natanael Copa <ncopa@alpinelinux.org>
-Reported-by: "Milan P. Stanić" <mps@arvanta.net>
----
- rngd_darn.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/rngd_darn.c b/rngd_darn.c
-index 35df7a1..9345895 100644
---- a/rngd_darn.c
-+++ b/rngd_darn.c
-@@ -109,7 +109,7 @@ static int init_openssl(struct rng *ent_src)
- return 0;
- }
-
--int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
-+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
- unsigned char *iv, unsigned char *ciphertext)
- {
- int len;
-@@ -150,7 +150,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src)
- unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS];
-
- /* Encrypt the plaintext */
-- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf,
-+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf,
- ciphertext);
- printf("Calling mangle with len %d\n", ciphertext_len);
- if (!ciphertext_len)
diff --git a/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch b/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch
deleted file mode 100644
index 4e9147b3b5e..00000000000
--- a/srcpkgs/rng-tools/patches/0004-configure-ac-jitterentropy-needs-pthread.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-New jitterentropy library broke configure. This patch fixes it.
-
-Upstream patch: https://github.com/nhorman/rng-tools/commit/daff4e2dd9d3abb74829f41e72607681163bd309
-
---- a/configure.ac 2020-12-03 20:59:11.086238518 +0100
-+++ b/configure.ac 2020-12-03 21:00:40.978593727 +0100
-@@ -91,7 +91,7 @@
- AC_SEARCH_LIBS(jent_version,jitterentropy,
- [AM_CONDITIONAL([JITTER], [true])
- AC_DEFINE([HAVE_JITTER],1,[Enable JITTER])],
-- AC_MSG_NOTICE([No Jitterentropy library found]))
-+ AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread)
- ], [AC_MSG_NOTICE([Disabling JITTER entropy source])]
- )
-
diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 57f9cb42cf3..8f8c9dc4748 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
# Template file for 'rng-tools'
pkgname=rng-tools
-version=6.10
-revision=4
+version=6.11
+revision=1
wrksrc=${pkgname}-${version}
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later"
homepage="https://github.com/nhorman/rng-tools"
distfiles="https://github.com/nhorman/rng-tools/archive/v${version}.tar.gz"
-checksum=2e462821aaa7d6dc24646aa0d2239d97cb8b07b3e60715159a9edcaa9189f8ef
+checksum=644d8bd4e84cee29debddc7e6db72aff27e628e5a879ce310562edf50f12be41
patch_args="-Np1"
case "$XBPS_TARGET_MACHINE" in
From d5862fa77237afac8c1a8015b8144e6045599584 Mon Sep 17 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, 25 Jan 2021 08:56:55 +0700
Subject: [PATCH 078/634] common: fix exit status of uname wrapper
---
common/wrappers/uname.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/wrappers/uname.sh b/common/wrappers/uname.sh
index 723e3c884a4..4edca2548a6 100644
--- a/common/wrappers/uname.sh
+++ b/common/wrappers/uname.sh
@@ -1,11 +1,11 @@
#!/bin/sh
uname=$(/usr/bin/uname $@)
+rv=$?
uname_m=$(/usr/bin/uname -m)
arch=${XBPS_ARCH%-musl}
# if XBPS_ARCH was reseted by `env -i` use original `/usr/bin/uname -m`
: ${arch:=$uname_m}
-rv=$?
echo "$uname" |
sed "s/\(^\| \)$(/usr/bin/uname -n)\($\| \)/\1void\2/" |
sed "s/$uname_m/$arch/"
From cf7893719a4661155605e5bf9ef4898d7dff644d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 00:24:29 +0000
Subject: [PATCH 079/634] racket: update to 7.9.
---
srcpkgs/racket/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 85374e7c62f..6415cf6d1ef 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,7 +1,7 @@
# Template file for 'racket'
pkgname=racket
-version=7.7
-revision=3
+version=7.9
+revision=1
build_wrksrc=src
build_style=gnu-configure
configure_args="--enable-useprefix --disable-docs"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=62659f42b059d028b37874a5ddd56a69057b1895e37e2c08590c150be680a533
+checksum=5578942066a9405fdbcad9522d08685356693f4ddd5dbe92b5273557a112b73e
nostrip=yes
if [ "$CROSS_BUILD" ]; then
From f1107c33877d2c1d29ccd88801dc8c32b143458f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 01:28:22 +0100
Subject: [PATCH 080/634] kubernetes: update to 1.20.2.
---
srcpkgs/kubernetes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 694416cdd5a..93d1c1bc399 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
# Template file for 'kubernetes'
pkgname=kubernetes
-version=1.19.3
+version=1.20.2
revision=1
archs="x86_64* ppc64le*"
build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="http://kubernetes.io"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=36aef9c98262596ae4145603150eb8ebb0d514288d138fd45287fa5e8e272033
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
nocross=yes
system_accounts="kube"
make_dirs="/var/lib/kubelet 0755 kube kube"
From 843829d7818183a043ecba21c2213a8d4c985e2e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 03:02:34 +0100
Subject: [PATCH 081/634] libguestfs: update to 1.44.0.
---
srcpkgs/libguestfs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 84a63da5de5..198a4519b05 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
# Template file for 'libguestfs'
pkgname=libguestfs
-version=1.42.0
-revision=5
+version=1.44.0
+revision=1
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
@@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license=" GPL-2.0-or-later"
homepage="http://libguestfs.org"
distfiles="http://libguestfs.org/download/${_version_short}-stable/${pkgname}-${version}.tar.gz"
-checksum=4fee192cf3aaa597f142afb21fa2d7f380fdabcf34d054e37090163e4a74f024
+checksum=0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21
conf_files="etc/libguestfs-tools.conf
etc/xdg/virt-builder/repos.d/libguestfs.conf
From 42989edd894f3cb71cada92774ac20740f8c8793 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 08:48:10 +0000
Subject: [PATCH 082/634] mkinitcpio: update to 29.
---
srcpkgs/mkinitcpio/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index f3a1053ef6b..67b3cff04f1 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,15 +1,16 @@
# Template file for 'mkinitcpio'
pkgname=mkinitcpio
-version=28
-revision=2
+version=29
+revision=1
build_style=gnu-makefile
+hostmakedepends="asciidoc"
depends="busybox-static bsdtar bash"
short_desc="Next generation of initramfs creation"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-only"
homepage="https://wiki.archlinux.org/index.php/Mkinitcpio"
distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bf83a158786d272d8046a4dd48bfcc343ec37de2cae0ae65c59132a45744808c
+checksum=0239ba7ae91d652472819457a5dd812c574ba37c3c3d9161e7742a63b85076c2
conf_files="/etc/mkinitcpio.conf"
From c20d7a3bb984b59c731be6a76f640d494862153f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 09:31:03 +0100
Subject: [PATCH 083/634] ispc: update to 1.15.0.
---
srcpkgs/ispc/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template
index 054e3a1523d..df840333a00 100644
--- a/srcpkgs/ispc/template
+++ b/srcpkgs/ispc/template
@@ -1,18 +1,18 @@
# Template file for 'ispc'
pkgname=ispc
-version=1.14.1
-revision=2
+version=1.15.0
+revision=1
archs="x86_64*"
build_style=cmake
configure_args="-DISPC_NO_DUMPS=ON -DARM_ENABLED=OFF"
hostmakedepends="clang clang-tools-extra python3 m4 bison flex llvm"
-makedepends="ncurses-devel zlib-devel"
+makedepends="ncurses-devel ncurses-libtinfo-devel zlib-devel"
short_desc="Compiler for high-performance SIMD programming on the CPU"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="BSD-3-Clause"
homepage="https://ispc.github.io"
distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz"
-checksum=3a7ee9ab90b9e9932b7b4effc9bb3ef45ca271d60d9ec6bc8c335242b5ec097b
+checksum=2658ff00dc045ac9fcefbf6bd26dffaf723b059a942a27df91bbb61bc503a285
patch_args="-p1"
nocross=yes
nopie=yes
From cc409944af04f12cbf255a3223cc41d8bfdc85f6 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 09:53:57 +0100
Subject: [PATCH 084/634] hopper: update to 4.7.1.
---
srcpkgs/hopper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1db801b8f4f..1d86b0dda2e 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
# Template file for 'hopper'
pkgname=hopper
-version=4.5.29
+version=4.7.1
revision=1
_build=1
create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="custom:EULA"
homepage="https://www.hopperapp.com"
distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=f01b1439f4561bb18dc49804ebe3df56b6b6859eed529b379c81ece88a7337ec
+checksum=24b46252cf29f8096cdf802731e2935fcdf1bfc1a0eec21dc1fba6f0c823f0d7
archs="x86_64"
restricted=yes
From 7c35677bac3ecb9eab423d71d87dd8deeda92859 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 10:12:07 +0100
Subject: [PATCH 085/634] thermald: update to 2.4.1.
---
srcpkgs/thermald/patches/musl.patch | 14 --------------
srcpkgs/thermald/template | 8 ++++----
2 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/thermald/patches/musl.patch
diff --git a/srcpkgs/thermald/patches/musl.patch b/srcpkgs/thermald/patches/musl.patch
deleted file mode 100644
index 4f33f846eb0..00000000000
--- a/srcpkgs/thermald/patches/musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git Makefile.am Makefile.am
-index 68c89d0..403407d 100644
---- Makefile.am
-+++ Makefile.am
-@@ -23,7 +23,8 @@ AM_CXXFLAGS = ${DBUS_CFLAGS}\
- -Wmissing-field-initializers\
- -Wtype-limits\
- -Wuninitialized\
-- -Werror
-+ -Werror\
-+ -Wno-error=cpp
-
- EXTRA_DIST=Makefile.glib \
- thermald.pc.in
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 83300cdf75d..af5821b77e7 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,19 +1,19 @@
# Template file for 'thermald'
pkgname=thermald
-version=1.9.1
+version=2.4.1
revision=1
_pkgname=thermal_daemon
archs="i686* x86_64*"
wrksrc="${_pkgname}-${version}"
build_style=gnu-configure
-hostmakedepends="automake pkg-config glib-devel"
-makedepends="dbus-glib-devel libxml2-devel libglib-devel libgomp-devel"
+hostmakedepends="automake pkg-config glib-devel gtk-doc autoconf-archive"
+makedepends="dbus-glib-devel libxml2-devel libglib-devel libgomp-devel upower-devel libevdev-devel"
short_desc="Linux Thermal Daemon program from 01.org"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later"
homepage="https://github.com/intel/${_pkgname}"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=aaf5ffdc12344eef2417b41b433094bb30e4ebf321f0140b090f97bfcf24ea1f
+checksum=7dc5c4e850a044f1ce11b746b048384372ad23bb1092bd9de1215f0dbb64eef7
conf_files='/etc/thermald/*'
if [ "$CROSS_BUILD" ]; then
From a2183f361bbeacbb126106be53a1abe67826eff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 17:10:40 -0300
Subject: [PATCH 086/634] kadu: remove package.
No longer working or necessary.
Closes #12548
---
srcpkgs/kadu-devel | 1 -
srcpkgs/kadu/patches/cmake-find-x11.patch | 40 -------------
srcpkgs/kadu/patches/gcc7.patch | 12 ----
srcpkgs/kadu/patches/qt5-5.15.0.patch | 10 ----
srcpkgs/kadu/patches/qt5-qcompare.patch | 11 ----
srcpkgs/kadu/patches/qt5-qdatastream.patch | 12 ----
srcpkgs/kadu/template | 65 ----------------------
srcpkgs/removed-packages/template | 1 +
8 files changed, 1 insertion(+), 151 deletions(-)
delete mode 120000 srcpkgs/kadu-devel
delete mode 100644 srcpkgs/kadu/patches/cmake-find-x11.patch
delete mode 100644 srcpkgs/kadu/patches/gcc7.patch
delete mode 100644 srcpkgs/kadu/patches/qt5-5.15.0.patch
delete mode 100644 srcpkgs/kadu/patches/qt5-qcompare.patch
delete mode 100644 srcpkgs/kadu/patches/qt5-qdatastream.patch
delete mode 100644 srcpkgs/kadu/template
diff --git a/srcpkgs/kadu-devel b/srcpkgs/kadu-devel
deleted file mode 120000
index c6b22664110..00000000000
--- a/srcpkgs/kadu-devel
+++ /dev/null
@@ -1 +0,0 @@
-kadu
\ No newline at end of file
diff --git a/srcpkgs/kadu/patches/cmake-find-x11.patch b/srcpkgs/kadu/patches/cmake-find-x11.patch
deleted file mode 100644
index acd56b65720..00000000000
--- a/srcpkgs/kadu/patches/cmake-find-x11.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- kadu-core/CMakeLists.txt 2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/CMakeLists.txt 2019-10-27 08:50:28.152486629 +0100
-@@ -111,7 +111,6 @@
- list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES})
-
- if (UNIX AND NOT APPLE)
-- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes)
- if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND)
- message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}")
- else ()
---- plugins/idle/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
-+++ plugins/idle/CMakeLists.txt 2019-10-27 08:52:28.448492835 +0100
-@@ -15,7 +15,6 @@
- )
-
- if (UNIX AND NOT APPLE)
-- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver)
- if (X11_Xscreensaver_FOUND)
- message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}")
- else ()
---- plugins/pcspeaker/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
-+++ plugins/pcspeaker/CMakeLists.txt 2019-10-27 08:55:53.297503403 +0100
-@@ -15,7 +15,6 @@
- set (LIBRARIES "")
-
- if (UNIX AND NOT APPLE)
-- find_package (X11 REQUIRED COMPONENTS X11)
- if (NOT X11_FOUND)
- message (SEND_ERROR "Could NOT find X11")
- endif ()
---- plugins/screenshot/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
-+++ plugins/screenshot/CMakeLists.txt 2019-10-27 09:02:31.066523924 +0100
-@@ -30,7 +30,6 @@
-
- if (UNIX AND NOT APPLE)
- set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras)
-- find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape)
- if (X11_Xshape_FOUND)
- message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}")
- else ()
diff --git a/srcpkgs/kadu/patches/gcc7.patch b/srcpkgs/kadu/patches/gcc7.patch
deleted file mode 100644
index 7c76910edad..00000000000
--- a/srcpkgs/kadu/patches/gcc7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-index 1e6a500..a231cba 100644
---- kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-+++ kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-@@ -22,6 +22,7 @@
- #include <QtCore/QObject>
- #include <map>
- #include <set>
-+#include <functional>
-
- #include "exports.h"
- #include "plugin/dependency-graph/plugin-dependency-graph.h"
diff --git a/srcpkgs/kadu/patches/qt5-5.15.0.patch b/srcpkgs/kadu/patches/qt5-5.15.0.patch
deleted file mode 100644
index ebc6e5fa93c..00000000000
--- a/srcpkgs/kadu/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kadu-core/gui/widgets/avatar-painter.cpp 2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/gui/widgets/avatar-painter.cpp 2020-08-07 20:18:18.050176596 +0200
-@@ -22,6 +22,7 @@
-
- #include <QtCore/QModelIndex>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmap>
- #include <QtGui/QPixmapCache>
- #include <QtWidgets/QStyleOptionViewItem>
diff --git a/srcpkgs/kadu/patches/qt5-qcompare.patch b/srcpkgs/kadu/patches/qt5-qcompare.patch
deleted file mode 100644
index 03da5cadee3..00000000000
--- a/srcpkgs/kadu/patches/qt5-qcompare.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kadu-core/plugin/state/plugin-state.test.cpp 2017-01-24 22:36:21.000000000 +0100
-+++ kadu-core/plugin/state/plugin-state.test.cpp 2020-06-04 19:24:50.219823920 +0200
-@@ -34,7 +34,7 @@
-
- void PluginStateTest::newTest()
- {
-- QCOMPARE(pluginStateToString(PluginState::New), {});
-+ QCOMPARE(pluginStateToString(PluginState::New), nullptr);
- QCOMPARE(stringToPluginState(""), PluginState::New);
- QCOMPARE(stringToPluginState("New"), PluginState::New);
- QCOMPARE(stringToPluginState("Invalid"), PluginState::New);
diff --git a/srcpkgs/kadu/patches/qt5-qdatastream.patch b/srcpkgs/kadu/patches/qt5-qdatastream.patch
deleted file mode 100644
index 2f8a9aeee25..00000000000
--- a/srcpkgs/kadu/patches/qt5-qdatastream.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt5 since 5.5.0 needs explicit include of QDataStream
-
---- kadu-core/os/single-application/single-application.cpp 2015-03-24 22:13:18.000000000 +0100
-+++ kadu-core/os/single-application/single-application.cpp 2015-07-10 22:10:02.633790611 +0200
-@@ -30,6 +30,7 @@
- #include <QtCore/QRegExp>
- #include <QtNetwork/QLocalServer>
- #include <QtNetwork/QLocalSocket>
-+#include <QDataStream>
- #include <memory>
-
- #if defined(Q_OS_WIN)
diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template
deleted file mode 100644
index 8587198ae71..00000000000
--- a/srcpkgs/kadu/template
+++ /dev/null
@@ -1,65 +0,0 @@
-# Template file for 'kadu'
-pkgname=kadu
-version=4.3
-revision=6
-build_style=cmake
-configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
- -DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
- -DX11_FOUND=1 -DX11_Xutil_FOUND=1 -DX11_Xshape_FOUND=1
- -DX11_Xfixes_FOUND=1 -DX11_Xscreensaver_FOUND=1
- -DX11_X11_LIB=X11 -DX11_Xext_LIB=Xext
- -DX11_Xfixes_LIB=Xfixes -DX11_Xscreensaver_LIB=Xss
- -DQCA2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/QtCrypto
- -DQCA2_LIBRARIES=qca -DENABLE_TESTS=OFF -Wno-dev"
-hostmakedepends="pkg-config qt5-host-tools"
-makedepends="libao-devel libsndfile-devel libarchive-devel
- enchant-devel injeqt-devel libgadu-devel libidn-devel libotr-devel
- qt5-devel qt5-xmlpatterns-devel qt5-declarative-devel qt5-multimedia-devel
- qt5-script-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel qt5-x11extras-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="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)"
-short_desc="Instant Messenger client"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-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"
-desc_option_mysql="Use MySQL database plugin"
-desc_option_odbc="Use ODBC database plugin"
-desc_option_pgsql="Use PostgreSQL database plugin"
-desc_option_sqlite="Use SQlite database plugin"
-desc_option_tds="Use Tabular Data Stream database plugin"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" ${makedepends}"
-fi
-
-pre_configure() {
- # Disable plugins which require pkgs Void does not ship (yet)
- # unity_integration: Ubuntu
- # indicator_docking: requires messaging-menu
- # word_fix: not packaged
- sed -i ${wrksrc}/Plugins.cmake \
- -e "s;unity_integration$;;" \
- -e "s;indicator_docking$;;" \
- -e "s;word_fix$;;"
-}
-
-kadu-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/share/cmake
- vmove usr/share/kadu/sdk
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7fa5d31e349..9286101886a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -38,6 +38,7 @@ replaces="
libgtkhtml<=4.10.0_1
httperf<=0.9.0_9
isl16<=0.16_2
+ kadu<=4.3_6
keepassx<=0.4.4_2
libapp<=20140527_2
libdbusmenu-qt<=0.9.2_4
From ae3eda7950cdf5bf98fa4672c1ce8a41403e7a5e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Jan 2021 11:07:01 +0100
Subject: [PATCH 087/634] wireguard-dkms: update to 1.0.20210124.
---
srcpkgs/wireguard-dkms/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wireguard-dkms/template b/srcpkgs/wireguard-dkms/template
index ad46fa03650..59f04c3fe2c 100644
--- a/srcpkgs/wireguard-dkms/template
+++ b/srcpkgs/wireguard-dkms/template
@@ -1,6 +1,6 @@
# Template file for 'wireguard-dkms'
pkgname=wireguard-dkms
-version=1.0.20201221
+version=1.0.20210124
revision=1
wrksrc="wireguard-linux-compat-${version}"
build_wrksrc="src"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.wireguard.com/"
distfiles="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"
-checksum=6e5289a8b602eaaf1383aebefcbc41b8ad2721269055858b150363076c1c2132
+checksum=dac6e68cd4c3db441499850dfa8a70706384a3295f37fda1b839a50b79faef54
dkms_modules="wireguard ${version}"
From 47ec72a9b24f81c9d7b3e12a4208708e27b3bb7e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Jan 2021 12:36:02 +0100
Subject: [PATCH 088/634] libguestfs: mark broken, unlock builder.
---
srcpkgs/libguestfs/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 198a4519b05..339bdafce66 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,3 +1,5 @@
+broken="https://build.voidlinux.org/builders/x86_64_builder/builds/29937/steps/shell_3/logs/stdio"
+
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.44.0
From aee48abce090f4710cfff4e428f0692fc75f0894 Mon Sep 17 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, 25 Jan 2021 19:02:44 +0700
Subject: [PATCH 089/634] racket: mark nocross, unlock builder
---
srcpkgs/racket/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 6415cf6d1ef..1fee0a65e39 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -15,6 +15,7 @@ homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
checksum=5578942066a9405fdbcad9522d08685356693f4ddd5dbe92b5273557a112b73e
nostrip=yes
+nocross=yes
if [ "$CROSS_BUILD" ]; then
configure_args+=" --enable-racket=/usr/bin/racket"
From b54d75afba23aea1e2d01d39bddb2ce687427700 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 23 Jan 2021 17:17:52 +0100
Subject: [PATCH 090/634] PrusaSlicer: update to 2.3.0.
---
srcpkgs/PrusaSlicer/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index aa195fe6ac8..dd0e76cb801 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,21 +1,22 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.2.0
-revision=4
+version=2.3.0
+revision=1
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
-configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1"
+configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel libcurl-devel nlopt-devel gtest-devel
- wxWidgets-devel glu-devel libpng-devel glew-devel cereal openvdb-devel
- cgal-devel gmpxx-devel eigen"
+makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
+ glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
+ libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
+ wxWidgets-gtk3-devel"
short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0
+checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
Slic3rPE_package() {
From 0483c9f59633be40afb740b5595c6e3bf7c5c11e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 25 Jan 2021 09:55:30 +0100
Subject: [PATCH 091/634] PrusaSlicer: fix musl build
---
...ace-get_current_thread_name-for-musl.patch | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
new file mode 100644
index 00000000000..8080380427b
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch
@@ -0,0 +1,30 @@
+--- src/libslic3r/Thread.cpp.orig 2021-01-24 13:50:00.469444149 +0100
++++ src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100
+@@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre
+ return true;
+ }
+
++#ifndef __GLIBC__
++thread_local char current_thread_name[16] = { 0 };
++#endif
++
+ bool set_current_thread_name(const char *thread_name)
+ {
++#ifndef __GLIBC__
++ strncpy(current_thread_name, thread_name, 15);
++#endif
+ pthread_setname_np(pthread_self(), thread_name);
+ return true;
+ }
+
+ std::optional<std::string> get_current_thread_name()
+ {
++#ifdef __GLIBC__
+ char buf[16];
+ return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : "");
++#else
++ return std::string(current_thread_name);
++#endif
+ }
+
+ #endif
From 0824e5aaa282c842e27b0c3d194cb5d1db82ce55 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 24 Jan 2021 22:55:56 +0100
Subject: [PATCH 092/634] revive: update to 1.0.3
---
srcpkgs/revive/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index 313a1ff9fc2..4090942ba42 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,16 +1,15 @@
# Template file for 'revive'
pkgname=revive
-version=1.0.2
+version=1.0.3
revision=1
build_style=go
go_import_path="github.com/mgechev/revive"
-hostmakedepends="git"
short_desc="Drop-in replacement for golint"
maintainer="Paper <paper@tilde.institute>"
license="MIT"
homepage="https://revive.run/"
distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=1d3b7a171afba55ee5a6cd7c87ebbcb452ec78a6cf0543584fada7d725ffca31
+checksum=3f829c35dcc8b94bb78c706c2a35bb1f5c77e83128614aa3867fe2952d0ce936
post_install() {
vdoc RULES_DESCRIPTIONS.md
From 75821d9045be653dbdb2611f362a0496a150713f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Jan 2021 22:21:50 +0200
Subject: [PATCH 093/634] xfce4-whiskermenu-plugin: update to 2.5.3.
---
srcpkgs/xfce4-whiskermenu-plugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 93a53ee68ad..62435ad6a56 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -1,6 +1,6 @@
# Template file for 'xfce4-whiskermenu-plugin'
pkgname=xfce4-whiskermenu-plugin
-version=2.5.2
+version=2.5.3
revision=1
build_style=cmake
hostmakedepends="gettext pkg-config"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin"
changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515
+checksum=39cc34c8a83381997c6faaacb6bf792339234303438a1fccd15c9a1770b87daf
From 3280d51ccf20a71974ec19999ead17cb0027489a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 24 Jan 2021 22:03:35 +0100
Subject: [PATCH 094/634] youtube-dl: update to 2021.01.24.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 e45004501bb..b78dd725ff6 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-dl'
pkgname=youtube-dl
-version=2021.01.16
+version=2021.01.24.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/${version}/${pkgname}-${version}.tar.gz"
-checksum=113a5272c1917d83f1c1e7e54971ab41aa6e22b43ba736f2b66816220bdf17e1
+checksum=de2516d3e6de73f2089dd0ccb0880364c7da34e5c902631feb96d4ebc6d13000
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 7707e8573973864b41613f63a3895aa4642c43b2 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Mon, 25 Jan 2021 07:32:48 +1100
Subject: [PATCH 095/634] android-studio: update to 4.1.2.
---
srcpkgs/android-studio/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 37ab37daf6b..f2117e44196 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,10 +1,10 @@
# Template file for 'android-studio'
pkgname=android-studio
-version=4.1.1
+version=4.1.2
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.6953283
+_studio_build=201.7042882
_studio_rev=0
archs="x86_64 i686"
create_wrksrc=yes
@@ -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=68032184959c54576f119b7c7c8ded175d848374f3954fa450530d78260dd68b
+checksum=89f7c3a03ed928edeb7bbb1971284bcb72891a77b4f363557a7ad4ed37652bb9
repository=nonfree
restricted=yes
python_version=2
From 4fba7c66a077d9b53be8dcdbca5a0f6483e78114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 13:38:35 +0100
Subject: [PATCH 096/634] linux4.4: update to 4.4.253
---
srcpkgs/linux4.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 49401ce2a9f..4561b3da097 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.4'
pkgname=linux4.4
-version=4.4.247
+version=4.4.253
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
-checksum=4a6433aaa393545d7446f70d6ddfe4bc6817234564a72cbc997996d27ddd07ca
+checksum=661e98b9448cbac948c705fd44cd7d30200422ee1cb02950d142aa99a1b3985a
python_version=2 #unverified
nocross=yes
From 6a2b5eeb4b459feb3bf9c07c0b523112f9a5f1db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 13:38:43 +0100
Subject: [PATCH 097/634] linux4.9: update to 4.9.253
---
srcpkgs/linux4.9/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 818e7092a92..9b875c7daa0 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.9'
pkgname=linux4.9
-version=4.9.247
+version=4.9.253
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=f73aeb0046a94c6cedcc3edc07d5609f1fc64a38c445983a68bf5d84f56acfd6
+checksum=9a5b51a8350201bd38e3ff13909323a6571b4572a7b3caed76e462b07619bc18
python_version=2 #unverified
patch_args="-Np1"
From ef94dc0727c166120649e6953a3bdd633e0aaea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 13:38:57 +0100
Subject: [PATCH 098/634] linux4.14: update to 4.14.217
---
srcpkgs/linux4.14/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 725cb6f79e8..97a9826f9a4 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.14'
pkgname=linux4.14
-version=4.14.210
+version=4.14.217
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=f91851d0b43c39732f9ee3afa1850145aee21e3bc71b3bf4b9a0b8a74dc4fd18
+checksum=62a36a25431016d98d0f1cff98be432086c51f86fd79042bd10a867b3a924d11
python_version=2 #unverified
patch_args="-Np1"
From bad7730561e17031e31469cfc1a6c38761c5f878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 09:37:13 +0100
Subject: [PATCH 099/634] webkit2gtk: fix bwrap-libdir32.patch
The LIB_DIR_WS string should be just the wordsize w/o "lib".
[ci skip]
---
srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch | 4 ++--
srcpkgs/webkit2gtk/template | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
index 1c83d3f4eb3..32d540a84e1 100644
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -19,9 +19,9 @@ index 889388a..a7a75a8 100644
return adoptGRef(g_subprocess_launcher_spawnv(launcher, argv, error));
+#if __UINTPTR_MAX__ > 0xFFFFFFFF
-+# define LIB_DIR_WS "lib64"
++# define LIB_DIR_WS "64"
+#else
-+# define LIB_DIR_WS "lib32"
++# define LIB_DIR_WS "32"
+#endif
+
Vector<CString> sandboxArgs = {
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 54762392d6a..9a6dae73f5a 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
# ping q66 before touching this
pkgname=webkit2gtk
version=2.30.4
-revision=4
+revision=5
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
From 2a7a627247dc1f908bfcb514df31da7a3186c05e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 03:07:13 +0100
Subject: [PATCH 100/634] linux5.10: unbreak page poisoning
also fix ppc dotconfigs
---
srcpkgs/linux5.10/files/ppc-dotconfig | 14 ++---
srcpkgs/linux5.10/files/ppc64-dotconfig | 18 ++----
.../linux5.10/patches/page-poison-fix.patch | 58 +++++++++++++++++++
3 files changed, 70 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/linux5.10/patches/page-poison-fix.patch
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index ca2207fddd4..b41439ce167 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1,11 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.1 Kernel Configuration
+# Linux/powerpc 5.10.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="powerpc-linux-musl-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
@@ -518,6 +518,8 @@ CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND=y
CONFIG_OLD_SIGACTION=y
CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
CONFIG_ARCH_HAS_PHYS_TO_DMA=y
# CONFIG_LOCK_EVENT_COUNTS is not set
CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -3217,7 +3219,6 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
CONFIG_MOUSE_ELAN_I2C_SMBUS=y
CONFIG_MOUSE_VSXXXAA=m
CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_GPIO=m
CONFIG_MOUSE_SYNAPTICS_I2C=m
CONFIG_MOUSE_SYNAPTICS_USB=m
CONFIG_INPUT_JOYSTICK=y
@@ -4166,7 +4167,6 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_RN5T618 is not set
# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SL28CPLD is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SKY81452 is not set
# CONFIG_ABX500_CORE is not set
@@ -5915,7 +5915,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@@ -8003,6 +8002,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
CONFIG_DYNAMIC_EVENTS=y
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 0a5ee22c539..4299f42e17c 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -1,11 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.1 Kernel Configuration
+# Linux/powerpc 5.10.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="powerpc64-linux-musl-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
@@ -4388,7 +4388,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_REGMAP=m
CONFIG_GPIO_MAX730X=m
#
@@ -4447,7 +4446,6 @@ CONFIG_GPIO_MAX77620=m
CONFIG_GPIO_MAX77650=m
CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_RC5T583=y
-CONFIG_GPIO_SL28CPLD=m
CONFIG_GPIO_STMPE=y
CONFIG_GPIO_TC3589X=y
CONFIG_GPIO_TPS65086=m
@@ -4741,7 +4739,6 @@ CONFIG_SENSORS_UCD9200=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_ZL6100=m
CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_SL28CPLD=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SHT3x=m
@@ -4835,7 +4832,6 @@ CONFIG_WM831X_WATCHDOG=m
# CONFIG_WM8350_WATCHDOG is not set
CONFIG_XILINX_WATCHDOG=m
CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_CADENCE_WATCHDOG=m
CONFIG_DW_WATCHDOG=m
CONFIG_RN5T618_WATCHDOG=m
@@ -4962,8 +4958,6 @@ CONFIG_MFD_RK808=m
CONFIG_MFD_RN5T618=m
# CONFIG_MFD_SEC_CORE is not set
CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SKY81452=m
@@ -7148,7 +7142,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@@ -8774,7 +8767,6 @@ CONFIG_PWM_FSL_FTM=m
CONFIG_PWM_IQS620A=m
CONFIG_PWM_LP3943=m
CONFIG_PWM_PCA9685=m
-CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_STMPE=y
# CONFIG_PWM_TWL is not set
# CONFIG_PWM_TWL_LED is not set
@@ -9688,7 +9680,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_DMA_DECLARE_COHERENT=y
CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
-CONFIG_DMA_VIRT_OPS=y
CONFIG_SWIOTLB=y
# CONFIG_DMA_API_DEBUG is not set
CONFIG_SGL_ALLOC=y
@@ -9936,6 +9927,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
CONFIG_DYNAMIC_EVENTS=y
diff --git a/srcpkgs/linux5.10/patches/page-poison-fix.patch b/srcpkgs/linux5.10/patches/page-poison-fix.patch
new file mode 100644
index 00000000000..d319dfec824
--- /dev/null
+++ b/srcpkgs/linux5.10/patches/page-poison-fix.patch
@@ -0,0 +1,58 @@
+This breaks page poisoning on some architectures. The commit is not
+very useful by itself, so revert it until a real fix is upstream.
+
+From 0cbb20875a8607653f02d799fd4b75a34d1b6636 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Mon, 25 Jan 2021 02:59:47 +0100
+Subject: [PATCH] Revert "mm/page_poison.c: replace bool variable with static
+ key"
+
+This reverts commit 11c9c7edae06da789abfdeefe5123162a3f1c7dc.
+---
+ mm/page_poison.c | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/mm/page_poison.c b/mm/page_poison.c
+index ae0482c..34b9181 100644
+--- a/mm/page_poison.c
++++ b/mm/page_poison.c
+@@ -8,23 +8,13 @@
+ #include <linux/ratelimit.h>
+ #include <linux/kasan.h>
+
+-static DEFINE_STATIC_KEY_FALSE_RO(want_page_poisoning);
++static bool want_page_poisoning __read_mostly;
+
+ static int __init early_page_poison_param(char *buf)
+ {
+- int ret;
+- bool tmp;
+-
+- ret = strtobool(buf, &tmp);
+- if (ret)
+- return ret;
+-
+- if (tmp)
+- static_branch_enable(&want_page_poisoning);
+- else
+- static_branch_disable(&want_page_poisoning);
+-
+- return 0;
++ if (!buf)
++ return -EINVAL;
++ return strtobool(buf, &want_page_poisoning);
+ }
+ early_param("page_poison", early_page_poison_param);
+
+@@ -41,7 +31,7 @@ bool page_poisoning_enabled(void)
+ * Page poisoning is debug page alloc for some arches. If
+ * either of those options are enabled, enable poisoning.
+ */
+- return (static_branch_unlikely(&want_page_poisoning) ||
++ return (want_page_poisoning ||
+ (!IS_ENABLED(CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC) &&
+ debug_pagealloc_enabled()));
+ }
+--
+2.30.0
+
From a8323619c62dcc011f03ae03588d713ce81e8053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 11:08:16 -0300
Subject: [PATCH 101/634] ZMusic: update to 1.1.4.
---
srcpkgs/ZMusic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index 4151153cc83..e2f72d46da2 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -1,6 +1,6 @@
# Template file for 'ZMusic'
pkgname=ZMusic
-version=1.1.3
+version=1.1.4
revision=1
build_style=cmake
configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
@@ -13,7 +13,7 @@ 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
+checksum=29a18a6a8d0db4978a9d5badbbd612be2337d64ef0d768e944ea70f526eae285
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" musl-fts-devel"
From b8b7ad1120e0c73f394c7e7e06e74324db4cde52 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 15:11:53 +0100
Subject: [PATCH 102/634] linux4*: refresh ppc dotconfigs
---
srcpkgs/linux4.14/files/ppc-dotconfig | 5 ++---
srcpkgs/linux4.14/files/ppc64-dotconfig | 7 ++-----
srcpkgs/linux4.4/files/ppc-dotconfig | 4 ++--
srcpkgs/linux4.4/files/ppc64-dotconfig | 4 ++--
srcpkgs/linux4.9/files/ppc-dotconfig | 4 ++--
srcpkgs/linux4.9/files/ppc64-dotconfig | 4 ++--
6 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/linux4.14/files/ppc-dotconfig b/srcpkgs/linux4.14/files/ppc-dotconfig
index 19046164278..9e68df353c0 100644
--- a/srcpkgs/linux4.14/files/ppc-dotconfig
+++ b/srcpkgs/linux4.14/files/ppc-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.204 Kernel Configuration
+# Linux/powerpc 4.14.217 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -280,6 +280,7 @@ CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -4610,7 +4611,6 @@ CONFIG_HDMI=y
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25
@@ -5124,7 +5124,6 @@ CONFIG_USB_IDMOUSE=m
CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.14/files/ppc64-dotconfig b/srcpkgs/linux4.14/files/ppc64-dotconfig
index 5be25f0f378..574f6935ace 100644
--- a/srcpkgs/linux4.14/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.14/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.204 Kernel Configuration
+# Linux/powerpc 4.14.217 Kernel Configuration
#
CONFIG_PPC64=y
@@ -309,6 +309,7 @@ CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
@@ -5410,9 +5411,6 @@ CONFIG_HDMI=y
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25
@@ -6120,7 +6118,6 @@ CONFIG_USB_IDMOUSE=m
CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.4/files/ppc-dotconfig b/srcpkgs/linux4.4/files/ppc-dotconfig
index ceadd703ad6..396b70bc042 100644
--- a/srcpkgs/linux4.4/files/ppc-dotconfig
+++ b/srcpkgs/linux4.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.237 Kernel Configuration
+# Linux/powerpc 4.4.253 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -3134,6 +3134,7 @@ CONFIG_SPI_MPC52xx_PSC=m
#
CONFIG_SPI_SPIDEV=y
# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_DYNAMIC is not set
# CONFIG_SPMI is not set
# CONFIG_HSI is not set
@@ -4781,7 +4782,6 @@ CONFIG_USB_IDMOUSE=m
CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.4/files/ppc64-dotconfig b/srcpkgs/linux4.4/files/ppc64-dotconfig
index f44d400e56c..dfbda625ae9 100644
--- a/srcpkgs/linux4.4/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.4/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.237 Kernel Configuration
+# Linux/powerpc 4.4.253 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3481,6 +3481,7 @@ CONFIG_SPI_DW_MMIO=m
#
CONFIG_SPI_SPIDEV=m
CONFIG_SPI_TLE62X0=m
+CONFIG_SPI_DYNAMIC=y
CONFIG_SPMI=m
CONFIG_HSI=m
CONFIG_HSI_BOARDINFO=y
@@ -5579,7 +5580,6 @@ CONFIG_USB_IDMOUSE=m
CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.9/files/ppc-dotconfig b/srcpkgs/linux4.9/files/ppc-dotconfig
index 9dbe117dc17..9039011c89a 100644
--- a/srcpkgs/linux4.9/files/ppc-dotconfig
+++ b/srcpkgs/linux4.9/files/ppc-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.9.237 Kernel Configuration
+# Linux/powerpc 4.9.253 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -3244,6 +3244,7 @@ CONFIG_SPI_MPC52xx_PSC=m
CONFIG_SPI_SPIDEV=y
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_DYNAMIC is not set
# CONFIG_SPMI is not set
# CONFIG_HSI is not set
@@ -4941,7 +4942,6 @@ CONFIG_USB_IDMOUSE=m
CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/linux4.9/files/ppc64-dotconfig b/srcpkgs/linux4.9/files/ppc64-dotconfig
index 475652dcd1e..4bc17d04843 100644
--- a/srcpkgs/linux4.9/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.9/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.9.237 Kernel Configuration
+# Linux/powerpc 4.9.253 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3644,6 +3644,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=m
CONFIG_SPI_SPIDEV=m
CONFIG_SPI_LOOPBACK_TEST=m
CONFIG_SPI_TLE62X0=m
+CONFIG_SPI_DYNAMIC=y
CONFIG_SPMI=m
CONFIG_HSI=m
CONFIG_HSI_BOARDINFO=y
@@ -5851,7 +5852,6 @@ CONFIG_USB_IDMOUSE=m
CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
From 715e5acdb3419db4136e06ec03a7533fd5d4625f Mon Sep 17 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, 25 Jan 2021 21:23:48 +0700
Subject: [PATCH 103/634] seahorse-sharing: fix localedir
---
.../seahorse-sharing/patches/fix-gnupg-version.patch | 11 -----------
srcpkgs/seahorse-sharing/template | 11 ++++++-----
2 files changed, 6 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch
diff --git a/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch b/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch
deleted file mode 100644
index 7130ee6a044..00000000000
--- a/srcpkgs/seahorse-sharing/patches/fix-gnupg-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac 2013-03-25 12:02:04.000000000 +0100
-+++ configure.ac 2016-08-31 01:03:33.238915208 +0200
-@@ -43,7 +43,7 @@
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..4fa4413e10b 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,10 +1,9 @@
# Template file for 'seahorse-sharing'
pkgname=seahorse-sharing
version=3.8.0
-revision=3
+revision=4
build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
- gpgme-devel gnupg"
+hostmakedepends="pkg-config intltool gnupg"
makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel
avahi-glib-libs-devel libSM-devel"
depends="gnupg"
@@ -15,6 +14,8 @@ homepage="http://www.gnome.org/projects/seahorse/"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=e216e7d5709e688e142b4e96710759f5be54c39ac6c2d58f2eec330e4dfef92b
-pre_configure() {
- autoreconf -fi
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \
+ -e '/accepted_versions=/s/2\.0/2.2/' \
+ configure
}
From 126cc48a5fd4d0e820918eb0fca01af1eadba310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 11:23:19 -0300
Subject: [PATCH 104/634] kstars: update to 3.5.1.
---
srcpkgs/kstars/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index a198306083e..53bc3fa360b 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,6 +1,6 @@
# Template file for 'kstars'
pkgname=kstars
-version=3.5.0
+version=3.5.1
revision=1
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
@@ -18,4 +18,4 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later"
homepage="https://edu.kde.org/kstars/"
distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a1aa6e859b90bedcf88664c13e0cdfef6407aca1ee6eef608310d8a5caa9f33a
+checksum=81ffb2697898405b8ed7f9ef74fe8e3ae0f842b46d3c0413c106406d834ac545
From 550e05941af8fc9c15b6b20cf49e957fa506905b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:03:24 -0300
Subject: [PATCH 105/634] kernel-libc-headers: ignore all updates.
We stick with LTS for this package and updating it for every point
release is unfeasible, due to the amount of cross toolchains. Ignore all
releases for now and let it be manually updated when necessary.
---
srcpkgs/kernel-libc-headers/update | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kernel-libc-headers/update b/srcpkgs/kernel-libc-headers/update
index 07d190a88ef..62a54c45e5f 100644
--- a/srcpkgs/kernel-libc-headers/update
+++ b/srcpkgs/kernel-libc-headers/update
@@ -1 +1,2 @@
pkgname="linux"
+ignore="*"
From 3c893951c42818d1b13d9c97115fd7ad764ff11c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 25 Jan 2021 08:36:52 -0600
Subject: [PATCH 106/634] ffuf: update to 1.2.1.
---
srcpkgs/ffuf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 7c18e6137d4..eecf6bd8a60 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
# Template file for 'ffuf'
pkgname=ffuf
-version=1.1.0
+version=1.2.1
revision=1
build_style=go
go_import_path="github.com/ffuf/ffuf"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/ffuf/ffuf"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=468963c6bec5390222802ec0b04c11187bb159f369edc2ebba1d228b8faf4f35
+checksum=ff474b21e192005a2df0f09f942b0370bdcb45d64ee35bd8782eb44a5c636e96
post_install() {
vlicense LICENSE
From 42cb3c749c02e56ab5c8678c5503e51f4f04a3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:19:35 -0300
Subject: [PATCH 107/634] yelp: update to 3.38.2, adopt.
Also add changelog for 3.38 branch.
---
srcpkgs/yelp/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index a1cfae98ad2..8d5856499f2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
# Template file for 'yelp'
pkgname=yelp
-version=3.38.1
+version=3.38.2
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile --disable-static"
@@ -9,11 +9,13 @@ makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
short_desc="Help browser for GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp"
+# change this when it moves to a new major release
+changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-3-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=74359e170be2bdc386d1bfb03b6f4fa887ca3b8406f9c144b86d0b24e1445f80
+checksum=9ba88b59a7c087fea56970549265ca8eb0a83a72ee2800aed03c455101d28c8b
yelp-devel_package() {
depends="yelp-${version}_${revision}"
From a450788caa907f0ccfa7aa362c8590d5afbe2cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:20:16 -0300
Subject: [PATCH 108/634] yelp-xsl: update to 3.38.2, adopt.
Also add changelog for 3.38 branch.
---
srcpkgs/yelp-xsl/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index fb6aa8e2865..b6191a67efb 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,14 +1,15 @@
# Template file for 'yelp-xsl'
# keep up to date with yelp
pkgname=yelp-xsl
-version=3.38.1
+version=3.38.2
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool itstool libxslt"
makedepends="libxslt-devel"
short_desc="Help browser for GNOME desktop - XSL and misc files"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
+changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-3-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b321563da6ab7fa8b989adaf1a91262059696316b4ddca2288fddcfed8dcdf67
+checksum=2c8472dc6c470145e8a01e5e7c8ceffe81eb2bd318f7282fdede9a3f975fb47b
From 39e232861f5548d67167c1020f581662cda80d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:32:22 -0300
Subject: [PATCH 109/634] mdBook: update to 0.4.6.
---
srcpkgs/mdBook/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6ebb2c6526d..38cd87b53dd 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
# Template file for 'mdBook'
pkgname=mdBook
-version=0.4.5
+version=0.4.6
revision=1
build_style=cargo
short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
homepage="https://github.com/rust-lang/mdBook"
changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=79fd98bddab8611cae9071aeb327edfcc67b4e449d5653d41d2ee5b04bee3afc
+checksum=a0a8f8e65030370cec8f5114ccb57334c9f2b7153dc51677e12dc74632d3ed23
post_install() {
vlicense LICENSE
From db723f20e89bfc88ae6442ac6e954a5b441f3f8f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 12:51:27 +0100
Subject: [PATCH 110/634] findutils: update to 4.8.0.
Closes: #27824 [via git-merge-pr]
---
srcpkgs/findutils/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index dac19bad8de..c6e225cf4c7 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,6 +1,6 @@
# Template file for 'findutils'
pkgname=findutils
-version=4.7.0
+version=4.8.0
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -9,8 +9,9 @@ short_desc="GNU Find Utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/findutils"
+changelog="https://git.savannah.gnu.org/cgit/findutils.git/plain/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
+checksum=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164
alternatives="
xargs:xargs:/usr/bin/gxargs
From 451a69c00c63928a6829713bcd6547aa1b136cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 25 Jan 2021 17:36:55 +0100
Subject: [PATCH 111/634] gifski: update to 1.2.7.
---
srcpkgs/gifski/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index 2a8ecdcf085..756b00a6247 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,6 +1,6 @@
# Template file for 'gifski'
pkgname=gifski
-version=1.2.4
+version=1.2.7
revision=1
build_style=cargo
configure_args="--features=openmp"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="AGPL-3.0-only"
homepage="https://gif.ski"
distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz"
-checksum=8a968a8b9f605746dfeaf1083a0c6a2a3c68e7d8d62f43bb6a6cd58e9a3d260e
+checksum=4894f70c351ce8440c9cdaca30f3bd59630dc10ce4bb60bc7686fe3f4bcf641c
post_install() {
vlicense LICENSE
From 61994e008f4718ab0d5e7c8fa1503e0fee2afb7c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 18:05:23 +0100
Subject: [PATCH 112/634] fwupd: fix non-uefi build
---
srcpkgs/fwupd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 78e80957ef9..a2b66a212af 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -54,7 +54,7 @@ if [ -n "$_have_uefi" ]; then
hostmakedepends+=" efivar"
makedepends+=" libefivar-devel gnu-efi-libs"
else
- configure_args+=" -Dplugin_uefi=false -Dplugin_redfish=false"
+ configure_args+=" -Dplugin_redfish=false -Dplugin_uefi_capsule=false -Dplugin_uefi_pk=false"
fi
if [ "$CROSS_BUILD" ]; then
From fe620de306538866c14a04c12a72a6f31a482650 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 09:53:19 -0500
Subject: [PATCH 113/634] python3-llfuse: update to 1.4.0.
---
srcpkgs/python3-llfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template
index 596f6cc8fc4..0902174ecda 100644
--- a/srcpkgs/python3-llfuse/template
+++ b/srcpkgs/python3-llfuse/template
@@ -1,6 +1,6 @@
# Template file for 'python3-llfuse'
pkgname=python3-llfuse
-version=1.3.8
+version=1.4.0
revision=1
wrksrc="llfuse-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/python-llfuse/python-llfuse"
distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.gz"
-checksum=b9b573108a840fbaa5c8f037160cc541f21b8cbdc15c5c8a39d5ac8c1b6c4cbc
+checksum=cb5dc6052bdd9c19dd15d44cd2876520007029a7733e7b9f0c2022c768e3ca52
From 5fb462b2839a4e311cd866c04298a921b10fcdb4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 09:54:03 -0500
Subject: [PATCH 114/634] python3-prompt_toolkit: update to 3.0.14.
---
srcpkgs/python3-prompt_toolkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index fcb29f44326..fbafe67b661 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
# Template file for 'python3-prompt_toolkit'
pkgname=python3-prompt_toolkit
-version=3.0.10
+version=3.0.14
revision=1
wrksrc="prompt_toolkit-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=b8b3d0bde65da350290c46a8f54f336b3cbf5464a4ac11239668d986852e79d5
+checksum=7e966747c18ececaec785699626b771c1ba8344c8d31759a1915d6b12fad6525
conflicts="python3-prompt_toolkit2<=2.0.9_4"
post_install() {
From 9e384dd7432e2669baea72b0ba300ff8766fb50c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 09:54:17 -0500
Subject: [PATCH 115/634] python3-ultrajson: update to 4.0.2.
---
srcpkgs/python3-ultrajson/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 6be2b6d92d5..59415d1249b 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,17 +1,23 @@
# Template file for 'python3-ultrajson'
pkgname=python3-ultrajson
-version=4.0.1
+version=4.0.2
revision=1
wrksrc="ujson-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
short_desc="Ultra fast JSON encoder and decoder for Python"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://github.com/ultrajson/ultrajson"
distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=26cf6241b36ff5ce4539ae687b6b02673109c5e3efc96148806a7873eaa229d3
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+
+do_check() {
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest
+}
post_install() {
vlicense LICENSE.txt
From c90535d002712a5e865587beb2fc5906fc71ea01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 09:54:42 -0500
Subject: [PATCH 116/634] python3-yaml: update to 5.4.1.
---
srcpkgs/python3-yaml/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template
index 87fcde69d6c..be593a82a91 100644
--- a/srcpkgs/python3-yaml/template
+++ b/srcpkgs/python3-yaml/template
@@ -1,6 +1,6 @@
# Template file for 'python3-yaml'
pkgname=python3-yaml
-version=5.4
+version=5.4.1
revision=1
wrksrc="PyYAML-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
license="MIT"
homepage="http://pyyaml.org/wiki/PyYAML"
distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
-checksum=3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a
+checksum=607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e
post_install() {
vlicense LICENSE
From 805e5b9d326734b8c28511e85f7885e0618a36d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 10:40:40 -0500
Subject: [PATCH 117/634] python3-breathe: update to 4.26.1.
---
srcpkgs/python3-breathe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index d81bb40c7df..f5d3bba8c59 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
# Template file for 'python3-breathe'
pkgname=python3-breathe
-version=4.26.0
+version=4.26.1
revision=1
wrksrc="breathe-${version}"
build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/michaeljones/breathe"
changelog="https://raw.githubusercontent.com/michaeljones/breathe/master/README.rst"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5b03a3576eaf49ef2816996c77cfae3dcad0d5c48c9a8aa2bc62e72989a2a1f5
+checksum=68e6a1507e9843049e39de12aea010e714a7072df7d71b6d7dd437952a7f7ee5
post_install() {
vlicense LICENSE
From 3c864655ab12bccba42cd6646037c6c22c98f23c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 12:33:58 -0500
Subject: [PATCH 118/634] grpc: update to 1.35.0.
---
srcpkgs/grpc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index de0182c3cd6..db501ccc3c3 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
# Template file for 'grpc'
pkgname=grpc
-version=1.34.1
+version=1.35.0
revision=1
_abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
homepage="https://github.com/grpc/grpc"
distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="c260a1dcdd26a78a9596494a3f41f9594ab5ec3a4d65cba4658bdee2b55ac844
+checksum="27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958
3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef"
if [ "$CROSS_BUILD" ]; then
From 455a62c182abdb9705f337f231fa86b7814e8791 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 12:34:01 -0500
Subject: [PATCH 119/634] python3-grpcio: update to 1.35.0.
---
srcpkgs/python3-grpcio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 73e0bc72cb4..76b88b3c8c4 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,6 +1,6 @@
# Template file for 'python3-grpcio'
pkgname=python3-grpcio
-version=1.34.1
+version=1.35.0
revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
wrksrc="${pkgname#*-}-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Apache-2.0"
homepage="https://grpc.io"
distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=1c746a3cd8a830d8d916a9d0476a786aaa98c5cc2a096344af2be955e439f8ac
+checksum=7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From c9bef1f3306a6be05c7bd9fed2c2ae9590abc6ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Jan 2021 12:34:03 -0500
Subject: [PATCH 120/634] python3-grpcio-tools: update to 1.35.0.
---
srcpkgs/python3-grpcio-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index cd96fdc8305..8d04abb9ac3 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-grpcio-tools'
pkgname=python3-grpcio-tools
-version=1.34.1
+version=1.35.0
revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Apache-2.0"
homepage="https://grpc.io"
distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08
+checksum=9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 4629b16289dba1c7f9457fa06f43c597451e00ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 13:04:27 -0300
Subject: [PATCH 121/634] ca-certificates: update to 20210119.
---
srcpkgs/ca-certificates/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 224c88c2232..5d3d01d7fa0 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,7 +1,7 @@
# Template file for 'ca-certificates'
pkgname=ca-certificates
-version=20200601
-revision=2
+version=20210119
+revision=1
bootstrap=yes
conf_files="/etc/ca-certificates.conf"
wrksrc="work"
@@ -12,14 +12,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, MPL-2.0"
homepage="https://tracker.debian.org/pkg/ca-certificates"
distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=43766d5a436519503dfd65ab83488ae33ab4d4ca3d0993797b58c92eb9ed4e63
+checksum=daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665
post_extract() {
$BUILD_CC $BUILD_CFLAGS ${FILESDIR}/certdata2pem.c -o ${wrksrc}/mozilla/certdata2pem
cp ${FILESDIR}/remove-expired-certs.sh ${wrksrc}/mozilla
- sed -i ${wrksrc}/mozilla/Makefile \
- -e 's,python certdata2pem.py,./certdata2pem,g'
- sed -i ${wrksrc}/mozilla/Makefile \
+ vsed -i ${wrksrc}/mozilla/Makefile \
+ -e 's,python3 certdata2pem.py,./certdata2pem,g'
+ vsed -i ${wrksrc}/mozilla/Makefile \
-e "s;\(.*\)\(certdata2pem.*\);\1\2\n\1./remove-expired-certs.sh;"
}
@@ -37,7 +37,7 @@ do_install() {
${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
cd ${DESTDIR}/usr/share/ca-certificates
find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
- sed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
+ vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
}
From 47e0a74712133202e8344a18b4e14b586fa1cc47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 16:50:37 -0300
Subject: [PATCH 122/634] dante: fix runtime on musl.
musl implements the sched_{set,get}scheduler functions as stubs.
Unfortunately, dante fails if the functions are available but return an
error, which is always the case for musl. Force it to think setscheduler
isn't available (var appropriated from Alpine).
Fixes #28180
---
srcpkgs/dante/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/dante/template b/srcpkgs/dante/template
index 44e08fd6ab1..17fe0f69ae6 100644
--- a/srcpkgs/dante/template
+++ b/srcpkgs/dante/template
@@ -1,7 +1,7 @@
# Template file for 'dante'
pkgname=dante
version=1.4.2
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="tar automake libtool"
short_desc="SOCKS server and client"
@@ -13,6 +13,8 @@ checksum=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7
if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
configure_args="--with-libc=libc.so.6"
+else
+ configure_args="ac_cv_func_sched_setscheduler=no"
fi
pre_configure() {
From f324e72fedf3b9a158a09705edb385e5bc4bdc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 25 Jan 2021 20:23:03 +0100
Subject: [PATCH 123/634] pcsc-ccid: update to 1.4.34
---
srcpkgs/pcsc-ccid/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pcsc-ccid/template b/srcpkgs/pcsc-ccid/template
index 73ee16d21ef..a4009021ec2 100644
--- a/srcpkgs/pcsc-ccid/template
+++ b/srcpkgs/pcsc-ccid/template
@@ -1,6 +1,6 @@
# Template file for 'pcsc-ccid'
pkgname=pcsc-ccid
-version=1.4.33
+version=1.4.34
revision=1
wrksrc="ccid-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later"
homepage="https://ccid.apdu.fr/"
changelog="https://salsa.debian.org/rousseau/CCID/-/raw/master/README.md"
distfiles="https://ccid.apdu.fr/files/ccid-${version}.tar.bz2"
-checksum=5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424
+checksum=e6f7645b59a9a2844eb4b1a7eff512960d7f04a4654af02f7fd2f8aded5db40a
post_install() {
From 4dd90dbb07f8806a8458a9648997c72f63e1bdd6 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Mon, 25 Jan 2021 20:39:02 +0100
Subject: [PATCH 124/634] nwg-launchers: update to 0.4.3
---
srcpkgs/nwg-launchers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template
index 5d241483260..700dfed4676 100644
--- a/srcpkgs/nwg-launchers/template
+++ b/srcpkgs/nwg-launchers/template
@@ -1,6 +1,6 @@
# Template file for 'nwg-launchers'
pkgname=nwg-launchers
-version=0.4.2
+version=0.4.3
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/nwg-piotr/nwg-launchers"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7a9377e01a517db3af5aec4f4b7a420474930d307aab67bd1beaac56c02b2f56
+checksum=59ca116a23210278f481bd5754d242455737e929aa2e5cc91a5a8fb1fcd2b2e6
From 3d9e0d47a7be0e00025ba52582d78a6168ea7993 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 20 Jan 2021 00:00:08 -0800
Subject: [PATCH 125/634] jetbrains-jdk-bin: update to 11.0.9.1b1257.1.
---
srcpkgs/jetbrains-jdk-bin/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 0d4f25e8b2b..6d502fc463f 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,7 @@
# Template file for 'jetbrains-jdk-bin'
pkgname=jetbrains-jdk-bin
-version=11.0.9.1b1244.2
+reverts=11.0.9b1183.9_1
+version=11.0.9.1b1257.1
revision=1
archs="x86_64"
wrksrc="jbrsdk"
@@ -12,7 +13,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=d0b47b6a8981da8c457642b7b35462e1711f6ec339bd1ba29f62f1173f172c04
+checksum=c9f40f9591a3d740963e12a668740525f6d84fe7f6756589ec99e695a34fe94a
fetch_cmd="wget --quiet"
# 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 26e3633111e012206b5b25aeb206a0718264f4cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 22:54:18 +0100
Subject: [PATCH 126/634] openjpeg2: patch cmake stuff to fix cross in other
packages
---
...c27e7c91f745a1dda9991b5deea3cbef2072.patch | 31 +++++++++++++++++++
...49edad7fb31ebbf03c60a45b72aaa7b7412b.patch | 26 ++++++++++++++++
srcpkgs/openjpeg2/template | 3 +-
3 files changed, 58 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
create mode 100644 srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
diff --git a/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch b/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
new file mode 100644
index 00000000000..3f658e849db
--- /dev/null
+++ b/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
@@ -0,0 +1,31 @@
+From 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 7 Jan 2021 14:09:50 +0100
+Subject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes
+ uclouvain#1174)"
+
+This reverts commit 65586374d639cfc0104419992f9022174b412594 which
+breaks cross-compilation of poppler under buildroot (because of
+DESTDIR usage).
+---
+ cmake/OpenJPEGConfig.cmake.in | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
+index 8a726697a..2925108ad 100644
+--- cmake/OpenJPEGConfig.cmake.in
++++ cmake/OpenJPEGConfig.cmake.in
+@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+ # This is an install tree
+ include(${SELF_DIR}/OpenJPEGTargets.cmake)
+
++ # We find a relative path from the PKG directory to header files.
++ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
+ set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
+- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
++ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
++
++ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
+
+ else()
+ if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
diff --git a/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch b/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
new file mode 100644
index 00000000000..9c6b47ce47e
--- /dev/null
+++ b/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
@@ -0,0 +1,26 @@
+From 4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 7 Jan 2021 14:11:26 +0100
+Subject: [PATCH] cmake/OpenJPEGConfig.cmake: replace ABSOLUTE by REALPATH
+
+Fix #1174 by replacing ABSOLUTE by REALPATH which will resolve symlinks:
+https://cmake.org/cmake/help/latest/command/get_filename_component.html
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ cmake/OpenJPEGConfig.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
+index 2925108ad..6e88036c6 100644
+--- cmake/OpenJPEGConfig.cmake.in
++++ cmake/OpenJPEGConfig.cmake.in
+@@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+ set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
+
+- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
++ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" REALPATH)
+
+ else()
+ if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template
index 372fb65370b..4e6f16ac7ce 100644
--- a/srcpkgs/openjpeg2/template
+++ b/srcpkgs/openjpeg2/template
@@ -1,7 +1,7 @@
# Template file for 'openjpeg2'
pkgname=openjpeg2
version=2.4.0
-revision=1
+revision=2
wrksrc="openjpeg-${version}"
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
@@ -12,7 +12,6 @@ license="BSD-2-Clause"
homepage="http://www.openjpeg.org/"
distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
-patch_args="-Np1"
post_install() {
vlicense LICENSE
From 4094d16b4552dbd67b20510e2c1c494dd0c03a4d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 21:32:23 +0000
Subject: [PATCH 127/634] libnfc: update to 1.8.0.
---
common/shlibs | 2 +-
srcpkgs/libnfc/template | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 979daeddbf1..276d8e6912c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2193,7 +2193,7 @@ libudns.so.0 udns-0.4_1
libcriu.so.2 criu-3.13_2
libcompel.so.1 criu-3.13_2
libwebsockets.so.15 libwebsockets-3.2.0_1
-libnfc.so.0 libnfc-1.7.1_1
+libnfc.so.6 libnfc-1.8.0_1
libfuzzy.so.2 libfuzzy-2.12_1
libSDL_gfx.so.15 SDL_gfx-2.0.25_2
libsfml-network.so.2.5 SFML-2.5.0_1
diff --git a/srcpkgs/libnfc/template b/srcpkgs/libnfc/template
index 0cbcee8e106..7737dad5690 100644
--- a/srcpkgs/libnfc/template
+++ b/srcpkgs/libnfc/template
@@ -1,7 +1,7 @@
# Template file for 'libnfc'
pkgname=libnfc
-version=1.7.1
-revision=3
+version=1.8.0
+revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
short_desc="Low level NFC SDK and Programmers API"
@@ -11,14 +11,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="http://nfc-tools.org/"
distfiles="https://github.com/nfc-tools/libnfc/archive/libnfc-${version}.tar.gz"
-checksum=30de35b4f1af3f57dab40d91ffb2275664a35859ff2b014ba7b226aa3f5465f5
+checksum=0ab7d9b41442e7edc2af7c54630396edc73ce51128aa28a5c6e4135dc5595495
CFLAGS="-D_GNU_SOURCE"
pre_configure() {
- sed -i "s|MODE=\"0664\", GROUP=\"plugdev\"|TAG+=\"uaccess\"|g" contrib/udev/42-pn53x.rules
+ sed -i "s|MODE=\"0664\", GROUP=\"plugdev\"|TAG+=\"uaccess\"|g" contrib/udev/93-pn53x.rules
}
post_install() {
- vinstall contrib/udev/42-pn53x.rules 644 usr/lib/udev/rules.d/
+ vinstall contrib/udev/93-pn53x.rules 644 usr/lib/udev/rules.d/
vinstall contrib/linux/blacklist-libnfc.conf 644 usr/lib/modprobe.d/
}
libnfc-devel_package() {
From 110bae820a2b16993ae506304bebc722cf065ea9 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:32:22 +0000
Subject: [PATCH 128/634] mfoc: bump for libnfc
---
srcpkgs/mfoc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mfoc/template b/srcpkgs/mfoc/template
index 7ddd3e9adf8..a6ce644c22c 100644
--- a/srcpkgs/mfoc/template
+++ b/srcpkgs/mfoc/template
@@ -1,7 +1,7 @@
# Template file for 'mfoc'
pkgname=mfoc
version=0.10.7
-revision=3
+revision=4
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config"
From ec24446037ee47d2276be3cbbe202f5fcdc5443f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:33:50 +0000
Subject: [PATCH 129/634] podofo: update to 0.9.7.
---
srcpkgs/podofo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index 03642c2a509..b0ed2e0e19c 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,7 +1,7 @@
# Template file for 'podofo'
pkgname=podofo
-version=0.9.6
-revision=5
+version=0.9.7
+revision=1
build_style=cmake
configure_args="-DPODOFO_BUILD_SHARED=TRUE"
makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://podofo.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/podofo/podofo/${version}/podofo-${version}.tar.gz"
-checksum=e9163650955ab8e4b9532e7aa43b841bac45701f7b0f9b793a98c8ca3ef14072
+checksum=7cf2e716daaef89647c54ffcd08940492fd40c385ef040ce7529396bfadc1eb8
disable_parallel_build=yes
libpodofo_package() {
From e3fd9527f5245b7ad4efca505f3c9732ea04be67 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:35:45 +0000
Subject: [PATCH 130/634] krename: rebuild for podofo
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 30d759f9e0d..8e3d7d0db8d 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.0
-revision=5
+revision=6
# 5.0.0 FTBFS thus use a git revision which fixes the issue for now
_gitrev=93726f3d4e177816337beaf5c8872859ef33e9d8
wrksrc="${pkgname}-${_gitrev}"
From 985852aa05a947f87c87861860d3325e631f2815 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:35:54 +0000
Subject: [PATCH 131/634] horizon: rebuild for podofo
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 7ee50466594..7daf6b6154d 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=1.3.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_use_env=yes
From a8c75dbeecc563d1ae485f5f51645d78a9060716 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 23:06:29 +0000
Subject: [PATCH 132/634] podofo: fix shlibs
---
common/shlibs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index 276d8e6912c..78416f43ed0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2551,7 +2551,7 @@ libdl.so android-studio-3.0.1_1
libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
libsearpc.so.1 libsearpc-3.0.7_1
libseafile.so.0 seafile-libclient-5.0.4_1
-libpodofo.so.0.9.6 libpodofo-0.9.6_1
+libpodofo.so.0.9.7 libpodofo-0.9.7_1
libIrcUtil.so.3 libcommuni-3.4.0_1
libIrcCore.so.3 libcommuni-3.4.0_1
libIrcModel.so.3 libcommuni-3.4.0_1
From aaced7389de64cdb0d0b6c4e1fc5735002b51d77 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 23:17:16 +0000
Subject: [PATCH 133/634] pd: update to 0.51.4.
---
srcpkgs/pd/patches/fix-musl.patch | 15 ---------------
srcpkgs/pd/template | 4 ++--
2 files changed, 2 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/pd/patches/fix-musl.patch
diff --git a/srcpkgs/pd/patches/fix-musl.patch b/srcpkgs/pd/patches/fix-musl.patch
deleted file mode 100644
index 6e1d1f0eaa2..00000000000
--- a/srcpkgs/pd/patches/fix-musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/x_text.c.orig 2019-08-29 10:11:27.734179939 +0200
-+++ src/x_text.c 2019-08-29 10:12:06.392225034 +0200
-@@ -475,9 +475,10 @@ found in msvcrt (which indeed it isn't i
- on this, just call qsort if we're Microsoft and single-instance. I hope nobody
- will try to compile multi-instance Pd for 32-bit windows, but if they
- do, they might run into my qsort_s problem again. */
--#if defined(_WIN32) && !defined(PDINSTANCE)
-+#if (!defined(__GLIBC__) || defined(_WIN32)) && !defined(PDINSTANCE)
- #define MICROSOFT_STUPID_SORT
--static void *stupid_zkeyinfo;
-+#include <threads.h>
-+thread_local static void *stupid_zkeyinfo;
- static int stupid_sortcompare(const void *z1, const void *z2) {
- return (text_sortcompare(z1, z2, stupid_zkeyinfo)); }
- #endif
diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template
index 7c298742f98..f40acaf9733 100644
--- a/srcpkgs/pd/template
+++ b/srcpkgs/pd/template
@@ -1,6 +1,6 @@
# Template file for 'pd'
pkgname=pd
-version=0.51.2
+version=0.51.4
revision=1
_ver=${version%.*}-${version##*.}
wrksrc="$pkgname-$_ver"
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="BSD-3-Clause"
homepage="https://puredata.info"
distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz"
-checksum=b09ad89ad6f419b410644ef7d8dcf34459d21a7ab61a593244ecfaae2ca3f3c9
+checksum=52591f18316e9f2471ca21c3d6b41c56336e0615ec40a093232e95cc230bfcc1
case "$XBPS_TARGET_MACHINE" in
*-musl) # Causes pd to fail if qsort is used without thread local storage.
CFLAGS="-DMICROSOFT_STUPID_SORT" ;;
From 75b1e6d1b29c2ecb512ab45ea8090f501d9dea3e Mon Sep 17 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, 25 Jan 2021 23:39:21 +0700
Subject: [PATCH 134/634] Revert "Thunar: update to 4.17.0."
This reverts commit 41ddb96f66b73ba818c997f21325fe2fc76ed4a0.
Close: #28223
---
srcpkgs/Thunar/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 2d3b6d277ad..004b48ee50c 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,8 @@
# Template file for 'Thunar'
pkgname=Thunar
-version=4.17.0
-revision=1
+reverts="4.17.0_1"
+version=4.16.1
+revision=2
wrksrc=thunar-${version}
build_style=gnu-configure
build_helper="gir"
@@ -11,13 +12,13 @@ configure_args="--enable-gio-unix --enable-gudev
hostmakedepends="pkg-config intltool"
makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Thunar File Manager for XFCE"
+short_desc="Thunar File Manager"
maintainer="Ulf <void@uw.anonaddy.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://docs.xfce.org/xfce/thunar/Start"
changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=ad004f02d8bda692d76ec2a264e3e1121ae065f3d2ecc9cfe7dd82cd5c69f8a5
+checksum=da2d17d2cb69eb33768690b714cc232ed367cbd71eb9543aaa2a805d05dc3ce1
post_install() {
rm -rf ${DESTDIR}/usr/lib/systemd
From 62c8f510afc7b69b036e978b98ea62a00c42f263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 07:36:18 +0700
Subject: [PATCH 135/634] podofo: remove applied patches
---
srcpkgs/podofo/patches/remove-copy_directory.patch | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 srcpkgs/podofo/patches/remove-copy_directory.patch
diff --git a/srcpkgs/podofo/patches/remove-copy_directory.patch b/srcpkgs/podofo/patches/remove-copy_directory.patch
deleted file mode 100644
index 7b4476beb2f..00000000000
--- a/srcpkgs/podofo/patches/remove-copy_directory.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- test/TokenizerTest/CMakeLists.txt 2007-09-16 11:33:38.000000000 +0200
-+++ test/TokenizerTest/CMakeLists.txt 2018-08-13 21:31:29.943414615 +0200
-@@ -2,10 +2,3 @@
- TARGET_LINK_LIBRARIES(TokenizerTest ${PODOFO_LIB} ${PODOFO_LIB_DEPENDS})
- SET_TARGET_PROPERTIES(TokenizerTest PROPERTIES COMPILE_FLAGS "${PODOFO_CFLAGS}")
- ADD_DEPENDENCIES(TokenizerTest ${PODOFO_DEPEND_TARGET})
--
--# Copy the test samples over to the build tree
--ADD_CUSTOM_COMMAND(
-- TARGET TokenizerTest
-- POST_BUILD
-- COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/objects" "${CMAKE_CURRENT_BINARY_DIR}/objects"
-- )
From 8d4b78a8c734fa153d020dcfb6ff3a83c66c1dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 07:48:22 +0700
Subject: [PATCH 136/634] pd: fix musl build
---
srcpkgs/pd/patches/musl-no-qsort_r.patch | 14 ++++++++++++++
srcpkgs/pd/template | 4 ----
2 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/pd/patches/musl-no-qsort_r.patch
diff --git a/srcpkgs/pd/patches/musl-no-qsort_r.patch b/srcpkgs/pd/patches/musl-no-qsort_r.patch
new file mode 100644
index 00000000000..dbc65956d0e
--- /dev/null
+++ b/srcpkgs/pd/patches/musl-no-qsort_r.patch
@@ -0,0 +1,14 @@
+Index: src/x_text.c
+===================================================================
+--- src/x_text.c.orig
++++ src/x_text.c
+@@ -475,7 +475,8 @@ equal:
+ * Both are not available in Emscripten, Android or older MSVC versions.
+ * 'stupid_sortcompare' is thread-safe but not reentrant.
+ */
+-#if defined(_WIN32) || defined(__EMSCRIPTEN__) || defined(__ANDROID__)
++#if defined(_WIN32) || defined(__EMSCRIPTEN__) || defined(__ANDROID__) \
++ || (defined(__linux__) && !defined(__GLIBC__))
+ #define STUPID_SORT
+ static PERTHREAD void *stupid_zkeyinfo;
+ static int stupid_sortcompare(const void *z1, const void *z2)
diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template
index f40acaf9733..544afccd541 100644
--- a/srcpkgs/pd/template
+++ b/srcpkgs/pd/template
@@ -15,10 +15,6 @@ license="BSD-3-Clause"
homepage="https://puredata.info"
distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz"
checksum=52591f18316e9f2471ca21c3d6b41c56336e0615ec40a093232e95cc230bfcc1
-case "$XBPS_TARGET_MACHINE" in
- *-musl) # Causes pd to fail if qsort is used without thread local storage.
- CFLAGS="-DMICROSOFT_STUPID_SORT" ;;
-esac
pre_configure() {
./autogen.sh
From ac8a20040e11be2e01568590adb738e863b46192 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Mon, 25 Jan 2021 21:58:50 +0100
Subject: [PATCH 137/634] shorewall: update to 5.2.8
---
srcpkgs/shorewall/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 932c9281c2b..b006e403d5e 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,7 +1,7 @@
# Template file for 'shorewall'
pkgname=shorewall
-version=5.2.7
-revision=2
+version=5.2.8
+revision=1
create_wrksrc=yes
depends="shorewall-core perl"
short_desc="Iptables-based firewall for Linux systems"
@@ -13,9 +13,9 @@ changelog="${_disturl}/releasenotes.txt"
distfiles="${_disturl}/${pkgname}-${version}.tar.bz2
${_disturl}/${pkgname}6-${version}.tar.bz2
${_disturl}/${pkgname}-core-${version}.tar.bz2"
-checksum="fea6cdab5d844c29c4c6dcd6d77aa6fd1700af29814c5259252f83fd0b34fa15
- 4fc5a1a9e18f1134925ce7edf094e5f4dd076ccf094521e55cc2000ee0e8fa9a
- ebfd03a4114fbf1a204b72b9d9b7a9fd12b406c4a6b819135d9864103c22542a"
+checksum="fbb5ab492ed372eaaf02817cc730f82c49a81c5a5f5cee4bc8f1bce846f2306d
+ e82c3a9538b6548195398dc39c83b01bcf66eb5a22814c915a924b9adc088cd1
+ 39996b9697a2017947049ad3f03cb278e8f939ff924b2bb4bf2a0bc17c59988e"
make_dirs="/var/lib/${pkgname} 0755 0 0"
conf_files="/etc/${pkgname}/*"
From f632a7ee4cf5c17121a6db433d75c21d874cd44a Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:43:30 +0100
Subject: [PATCH 138/634] gnome-settings-daemon: update to 3.38.1.
---
srcpkgs/gnome-settings-daemon/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index b6da28e2554..ecc62cf2778 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=3.38.0
+version=3.38.1
revision=1
build_style=meson
-configure_args+="-Dsystemd=false"
+configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
perl pkg-config"
makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b7ed5b5fab9aad192ceed6a95be2805124e3c63c46891bbae076f7ec3fd6792e
+checksum=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" polkit"
From ecb020bbc65f32cce5c5a9f052e129de9afba3a4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Jan 2021 23:03:29 +0200
Subject: [PATCH 139/634] wps-office: update to 11.1.0.10161.
---
srcpkgs/wps-office/template | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index f90dcfe9263..68180a6e4f5 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,29 +1,29 @@
# Template file for 'wps-office'
pkgname=wps-office
-version=11.1.0.9719
+version=11.1.0.10161
revision=1
archs="x86_64"
create_wrksrc=yes
makedepends="rpmextract"
short_desc="Linux office suite with similar appearance to MS Office"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-#The old Kingsoft WPS Community License has disappeared from the
-#site. There is an EULA in the archive which is instaled as license
-#and a non-downloadable EULA which is accesible from inside the program:
-#https://www.wps.com/eula?distsrc=2020help&lang=en_US&version=11.1.0.9719
+# The old Kingsoft WPS Community License has disappeared from the
+# site. There is an EULA in the archive which is instaled as license
+# and a non-downloadable EULA which is accesible from inside the program:
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
license="custom:EULA"
homepage="http://wps-community.org"
changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=6f3f1d2aa1f98aff397eac9b2d819d094dfc297b7340e20a70c5740eb6ea79f2
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
allow_unknown_shlibs=yes
nodebug=yes
restricted=yes
-#The programs themselves are PIE, but the error reporter isn't :/
+# The programs themselves are PIE, but the error reporter isn't :/
nopie=yes
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9719/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
_distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
distfiles="${_disturl}/${_distTar}"
@@ -34,13 +34,13 @@ do_install() {
post_install() {
- #Clean up:
- #Delete everything under /etc. It contains cron, logrotate and autostart
+ # Clean up:
+ # Delete everything under /etc. It contains cron, logrotate and autostart
# configuration for the update check and a seperate menu category for the
# wps programs that does not work.
rm -rf ${DESTDIR}/etc
- #Delete postinst and prerm scripts
+ # Delete postinst and prerm scripts
rm -rf ${DESTDIR}/opt/kingsoft/wps-office/INSTALL
# Install license
From a723df8a5ec14b498cd56a4ea233d5fffdd6bead Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 20:26:38 +0000
Subject: [PATCH 140/634] bettercap: update to 2.29.
---
srcpkgs/bettercap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index a32b9145c35..c42a23ca076 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,6 +1,6 @@
# Template file for 'bettercap'
pkgname=bettercap
-version=2.28
+version=2.29
revision=1
build_style=go
go_import_path=github.com/bettercap/bettercap
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://github.com/bettercap/bettercap"
distfiles="https://github.com/bettercap/bettercap/archive/v${version}.tar.gz"
-checksum=5bde85117679c6ed8b5469a5271cdd5f7e541bd9187b8d0f26dee790c37e36e9
+checksum=c414be98a48d9f279460b325dddaef8479132a1470c6f305790d79e04dac1297
if [ "$XBPS_TARGET_LIBC" = musl ]; then
CPPFLAGS="-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t"
From c8f63abedf8c7581b58650bae1342fe105b3b215 Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Sun, 24 Jan 2021 18:24:47 +0100
Subject: [PATCH 141/634] ncmpcpp: update to 0.9.2.
---
srcpkgs/ncmpcpp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index a0c09efdc6f..0e036b303a3 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,6 +1,6 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.1
+version=0.9.2
revision=1
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=cb814a39c975f5b19c466188433644d1cbdb6db0abe1481d525587b149b36574
+checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
From fa3a6a73c31f7fd5d01731bf1a27baaee4341eca Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 18:08:32 +0300
Subject: [PATCH 142/634] gallery-dl: update to 1.16.4
---
srcpkgs/gallery-dl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 83bc94c2ecd..1a761809852 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
# Template file for 'gallery-dl'
pkgname=gallery-dl
-version=1.16.3
+version=1.16.4
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,8 +11,8 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/mikf/gallery-dl"
changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ca1b8069a614fdc1f71ba9b33c157c1a0557efa8a77793236e2de4b20d27c053
+distfiles="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
+checksum=92b774e1406b35940861d9bc53f47ace7a096e60410b98560652688c61d8653c
do_check() {
make test
From f4c78c9d83c79907885e408459dd308fe9566150 Mon Sep 17 00:00:00 2001
From: Jaume Devesa <jaume@mailbox.org>
Date: Sun, 24 Jan 2021 06:52:18 +0100
Subject: [PATCH 143/634] sfeed_curses: update to 0.9.8
---
srcpkgs/sfeed_curses/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index 1676c0d06cb..f3922d028ec 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
# Template file for 'sfeed_curses'
pkgname=sfeed_curses
-version=0.9.7
+version=0.9.8
revision=1
build_style=gnu-makefile
make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
license="ISC"
homepage="https://git.codemadness.org/sfeed_curses"
distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=b45617e410894290bb1d5ca24d1ffb114b3eeaff4aa3d2830d15a465943d03ec
+checksum=d7ece9cb2ef94d0e97418dfea80d43a102a271f752c19e3afc4d645c9679c555
post_install() {
vlicense LICENSE
vdoc README
From c6e72bf900fb6cc84c38ee11139ae12e5b61358d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 11:31:24 +0100
Subject: [PATCH 144/634] onefetch: update to 2.9.1.
---
srcpkgs/onefetch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index f2995f3aea0..f71be1e0bfd 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,6 +1,6 @@
# Template file for 'onefetch'
pkgname=onefetch
-version=2.8.0
+version=2.9.1
revision=1
build_style=cargo
short_desc="Git repository summary on your terminal"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/o2sh/onefetch"
distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
-checksum=0be1a4a779ee01a72d104ef854163d67a5cbb5b988816046f5cfbee8bd08834d
+checksum=33ac8e019e5b7412fec3c7593843e0c3780ca473498c31e36cbe95371fff943b
post_install() {
vlicense LICENSE.md
From 5fa222e6e347cc91cd119ae0f013ae993415bc3d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 03:29:34 +0100
Subject: [PATCH 145/634] PopCorn: rebuild everywhere with gccgo again
---
srcpkgs/PopCorn/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index fe84490de6b..da4bfa9deac 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,14 +1,14 @@
# Template file for 'PopCorn'
pkgname=PopCorn
version=0.4
-revision=4
+revision=5
build_style=go
go_import_path=github.com/the-maldridge/popcorn
go_package="${go_import_path}/cmd/popcorn
${go_import_path}/cmd/popcornctl
${go_import_path}/cmd/statrepo
${go_import_path}/cmd/pqueryd"
-hostmakedepends="git"
+hostmakedepends="git gcc-go-tools"
depends="snooze"
short_desc="Package statistics system"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -17,10 +17,6 @@ homepage="https://github.com/the-maldridge/PopCorn"
distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz"
checksum=b25589802c5e1c277d2e9536add44704a012359b02d7fb4be1b4b0f11eb10d93
-if [ -z "$CROSS_BUILD" -o "$XBPS_TARGET_LIBC" != "musl" ]; then
- hostmakedepends+=" gcc-go-tools"
-fi
-
system_accounts="_popcorn"
_popcorn_homedir="/var/lib/popcorn"
make_dirs="
From dbddecb9ed44bdbcb537f982b9ea1532c562af24 Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Sun, 24 Jan 2021 05:25:10 +0300
Subject: [PATCH 146/634] FAudio: fix linking against libSDL
---
srcpkgs/FAudio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/FAudio/template b/srcpkgs/FAudio/template
index b60a953b4ca..846463ca51c 100644
--- a/srcpkgs/FAudio/template
+++ b/srcpkgs/FAudio/template
@@ -1,10 +1,10 @@
# Template file for 'FAudio'
pkgname=FAudio
version=20.11
-revision=1
+revision=2
build_style=cmake
configure_args="-DGSTREAMER=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
- -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib"
+ -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libSDL2.so"
hostmakedepends="pkg-config"
makedepends="SDL2-devel gstreamer1-devel gst-plugins-base1-devel"
short_desc="Accuracy-focused XAudio reimplementation for open platforms"
From b93236c2e9bf74de5fd8c2d11af045a8c411f1d1 Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Sun, 24 Jan 2021 05:25:46 +0300
Subject: [PATCH 147/634] wine: rebuild against fixed FAudio
---
srcpkgs/wine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e8b1fda250c..3694984c42d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=6.0
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
From e8d3fa208b745688e75d9c1628157de4180861e8 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Fri, 22 Jan 2021 19:29:20 +0100
Subject: [PATCH 148/634] gradle: update to 6.8.1.
---
srcpkgs/gradle/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index b1809a634e4..8e9f08a9910 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
# Template file for 'gradle'
pkgname=gradle
-version=6.7.1
+version=6.8.1
revision=1
depends="virtual?java-environment"
short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
homepage="https://gradle.org/"
changelog="https://docs.gradle.org/${version}/release-notes.html"
distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d
+checksum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
do_install() {
vmkdir "usr/lib/gradle"
From b2caed4fd62f7645cf97f2a3bdaddd0b84136725 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:42 -0700
Subject: [PATCH 149/634] libva: update to 2.10.0.
---
srcpkgs/libva/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 1514b24c6c2..a66eebcb82c 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,7 +1,8 @@
# Template file for 'libva'
+# NOTE: keep this pkg synchronized with libva-glx
pkgname=libva
-version=2.9.1
-revision=2
+version=2.10.0
+revision=1
build_style=meson
configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)"
hostmakedepends="pkg-config wayland-devel"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://01.org/linuxmedia/vaapi"
changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=4e8640f65ad659332c5d24b7715703c95e820083ee11126c9cd051d418e3d9e0
+checksum=f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5
build_options="wayland"
build_options_default="wayland"
From ca9a60ddcbecfe5eed234e0cafa3d0554b92c9e1 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:37 -0700
Subject: [PATCH 150/634] intel-gmmlib: update to 20.4.1.
---
srcpkgs/intel-gmmlib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index 131a7ba673e..de10b7059d9 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -1,6 +1,6 @@
# Template file for 'intel-gmmlib'
pkgname=intel-gmmlib
-version=20.3.3
+version=20.4.1
revision=1
archs="i686* x86_64*"
wrksrc=gmmlib-intel-gmmlib-${version}
@@ -11,7 +11,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
license="MIT"
homepage="https://github.com/intel/gmmlib"
distfiles="https://github.com/intel/gmmlib/archive/intel-gmmlib-${version}.tar.gz"
-checksum=a9ac5be82822652414fe1d7260c9fa80aa14c07c137de5c4d73f23989a13ff77
+checksum=d54d547f9f9e74196dead6a338923039ea10c859f1f693f33f10be1562b81d6d
lib32disabled=yes
From fb55a60b744b1707f3663bffc0a93710a670c14e Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:32 -0700
Subject: [PATCH 151/634] intel-media-driver: update to 20.4.5.
---
srcpkgs/intel-media-driver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 9877436f223..6120080c93a 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -1,6 +1,6 @@
# Template file for 'intel-media-driver'
pkgname=intel-media-driver
-version=20.4.1
+version=20.4.5
revision=1
archs="x86_64*"
wrksrc=media-driver-intel-media-${version}
@@ -13,7 +13,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
license="MIT, BSD-3-Clause"
homepage="https://github.com/intel/media-driver"
distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
-checksum=d72e8a71e4543e072172a8bb57432bcf9166931f341fe90349383cbff1e429d8
+checksum=3d856a963127ddd6690fc6dac521d7674947675d5f20452f1e6f45c0fc83f9e6
build_options="nonfree"
desc_option_nonfree="Enable nonfree kernels"
From ea52b4f4771a381de981756ef1481b4d09d51e93 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Tue, 19 Jan 2021 23:41:04 -0700
Subject: [PATCH 152/634] libva-glx: update to 2.10.0.
---
srcpkgs/libva-glx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template
index e408ac0622e..472694b56e1 100644
--- a/srcpkgs/libva-glx/template
+++ b/srcpkgs/libva-glx/template
@@ -7,7 +7,7 @@
# KEEP THIS PACKAGE SYNCHRONIZED WITH "libva".
#
pkgname=libva-glx
-version=2.9.1
+version=2.10.0
revision=1
wrksrc="libva-${version}"
build_style=meson
@@ -20,7 +20,7 @@ license="MIT"
homepage="https://01.org/linuxmedia/vaapi"
changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=4e8640f65ad659332c5d24b7715703c95e820083ee11126c9cd051d418e3d9e0
+checksum=f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5
post_install() {
# We are only interested in the glx component, remove everything else.
From 0d9735649917495624e9ff8375b7e574df2e610d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Thu, 14 Jan 2021 10:13:40 +0100
Subject: [PATCH 153/634] sof-firmware: use provided install script
Previous versions of this package manually linked firmware files.
This caused some firmwares to slip by unlinked.
As a consequence, the following errors were encountered on boot
with a Tiger Lake processor.
```
[ 11.829580] sof-audio-pci 0000:00:1f.3: error: request firmware intel/sof/sof-tgl.ri failed err: -2
[ 11.829709] sof-audio-pci 0000:00:1f.3: error: failed to load DSP firmware -2
[ 11.830177] sof-audio-pci 0000:00:1f.3: error: sof_probe_work failed err: -2
```
---
srcpkgs/sof-firmware/template | 30 +++++++-----------------------
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index cf237de16a6..544ce9c5893 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,7 +1,7 @@
# Template file for 'sof-firmware'
pkgname=sof-firmware
version=1.6.1
-revision=1
+revision=2
archs="i686* x86_64*"
wrksrc="sof-bin-${version}"
depends="alsa-ucm-conf"
@@ -13,27 +13,11 @@ distfiles="https://github.com/thesofproject/sof-bin/archive/v${version}.tar.gz"
checksum=587b320030bc84de1aacba5d86d89ba1a4f67201baf8b9b61bb885af60643bfb
do_install() {
- local intel_path="lib/firmware/intel"
- for f in ${intel_path}/sof/v${version}/*.{ldc,ri}; do
- vinstall ${f} 0644 /usr/${intel_path}/sof
- done
- for f in ${intel_path}/sof/v${version}/intel-signed/*; do
- vinstall ${f} 0644 /usr/${intel_path}/sof/intel-signed
- done
- for f in ${intel_path}/sof/v${version}/public-signed/*; do
- vinstall ${f} 0644 /usr/${intel_path}/sof/public-signed
- done
- for arc in {bdw,byt,cht}; do
- ln -s sof-${arc}-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-${arc}.ri
- done
- for arc in {apl,cnl,icl}; do
- ln -s intel-signed/sof-${arc}-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-${arc}.ri
- done
- ln -s intel-signed/sof-apl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-glk.ri
- ln -s intel-signed/sof-cnl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cfl.ri
- ln -s intel-signed/sof-cnl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cml.ri
- for f in ${intel_path}/sof-tplg-v${version}/*; do
- vinstall ${f} 0644 /usr/${intel_path}/sof-tplg
- done
vlicense LICENCE.NXP
+
+ export ROOT="${DESTDIR}/usr"
+ export SOF_VERSION="v${version}"
+
+ vmkdir usr/lib/firmware/intel
+ ./go.sh
}
From b160bb9e19c7bea169a09821e6560b91ab260acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 00:17:19 -0300
Subject: [PATCH 154/634] calibre: revbump for libpodofo.
---
srcpkgs/calibre/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 738dfda3d51..7a3d542de69 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
# Template file for 'calibre'
pkgname=calibre
version=5.9.0
-revision=1
+revision=2
build_style=python3-module
pycompile_dirs="/usr/lib/calibre/"
hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
From 416c777f896ee18a5b08de9cf7dde7aed7f9e4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 00:17:19 -0300
Subject: [PATCH 155/634] libgdal: revbump for libpodofo.
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 2bb083d3f5e..7175f0caf63 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
version=3.0.4
-revision=7
+revision=8
wrksrc="gdal-${version}"
build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
From 8ef2b91dd03541ff7641f4829f71bee70353a2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 00:57:28 -0300
Subject: [PATCH 156/634] libva-utils: update to 2.10.0.
---
srcpkgs/libva-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template
index 1b3d2578b26..2e988e97674 100644
--- a/srcpkgs/libva-utils/template
+++ b/srcpkgs/libva-utils/template
@@ -1,6 +1,6 @@
# Template file for 'libva-utils'
pkgname=libva-utils
-version=2.9.1
+version=2.10.0
revision=1
build_style=meson
configure_args="-Ddrm=true -Dx11=true -Dwayland=true"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://01.org/linuxmedia/vaapi"
changelog="https://raw.githubusercontent.com/intel/libva-utils/master/NEWS"
distfiles="https://github.com/intel/libva-utils/archive/${version}.tar.gz"
-checksum=7cd7111349cdc227c64d5ab68de4a03eacbea26441c7781ccd548491994f0320
+checksum=cbb7f9f6eae21d772e31b67bc8c311be6e35fe9c65e63acc57f9b16d72bf8dc0
post_install() {
vlicense COPYING
From 6ae5f5d2ed27d04f84ca2d9a30483243c7a2c83e Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Wed, 6 Jan 2021 14:47:35 +0100
Subject: [PATCH 157/634] python3-enchant: update to 3.2.0.
Closes: #28107 [via git-merge-pr]
---
srcpkgs/python3-enchant/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index f7593aef017..43ca65c3870 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -1,16 +1,16 @@
# Template file for 'python3-enchant'
pkgname=python3-enchant
-version=3.1.1
-revision=3
+version=3.2.0
+revision=1
wrksrc="pyenchant-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools enchant2-devel"
depends="enchant2"
# needs an en_US dict to run
-checkdepends="$depends python3-pytest python3-pytest-cov hunspell-en_US"
+checkdepends="$depends python3-pytest hunspell-en_US"
short_desc="Spellchecking library for Python 3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
-homepage="https://github.com/rfk/pyenchant"
+homepage="https://github.com/pyenchant/pyenchant"
distfiles="https://github.com/pyenchant/pyenchant/archive/v${version}.tar.gz"
-checksum=ced3a776116e63ed7e496401ed23ac4ba52ac7942cd808492e8e654b27dccacd
+checksum=3195bfc5cfbdeb8a60f9484390c2c982e59dd220d6f9a5f8418ba67551ead01a
From 788eba3ce4249cd5c6885762392aca6b87b06662 Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Thu, 17 Dec 2020 23:57:55 -0800
Subject: [PATCH 158/634] pinebookpro-kernel: update to 5.10.9, enable
instructions deprecated by ARMv8
The config change allows 32-bit userlands to run some older ARMv6/7
binaries, e.g. distributed for Android or Raspberry Pi, plus some game
dependencies like FMOD. It mirrors our main arm64 config and is toggleable
via sysctl anyway.
Miscellaneous config changes occurred for gcc/binutils/etc. bump.
---
srcpkgs/pinebookpro-kernel/files/dotconfig | 17 +++++++++--------
srcpkgs/pinebookpro-kernel/template | 4 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/pinebookpro-kernel/files/dotconfig b/srcpkgs/pinebookpro-kernel/files/dotconfig
index 5ea656568c1..c45b7930c76 100644
--- a/srcpkgs/pinebookpro-kernel/files/dotconfig
+++ b/srcpkgs/pinebookpro-kernel/files/dotconfig
@@ -1,11 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.1 Kernel Configuration
+# Linux/arm64 5.10.9 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=234000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
@@ -408,7 +408,10 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_COMPAT=y
CONFIG_KUSER_HELPERS=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
#
# ARMv8.1 architectural features
@@ -451,6 +454,7 @@ CONFIG_ARM64_TLB_RANGE=y
# ARMv8.5 architectural features
#
CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARCH_RANDOM=y
@@ -4484,7 +4488,6 @@ CONFIG_MFD_VIPERBOARD=m
CONFIG_MFD_RK808=m
# CONFIG_MFD_RN5T618 is not set
# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SL28CPLD is not set
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
# CONFIG_MFD_SKY81452 is not set
@@ -5906,7 +5909,6 @@ CONFIG_SND_SOC_AMD_ACP=m
CONFIG_SND_I2S_HI6210_I2S=m
# CONFIG_SND_SOC_IMG is not set
-# CONFIG_SND_SOC_INTEL_KEEMBAY is not set
# CONFIG_SND_SOC_MTK_BTCVSD is not set
CONFIG_SND_SOC_ROCKCHIP=m
CONFIG_SND_SOC_ROCKCHIP_I2S=m
@@ -6458,7 +6460,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
# CONFIG_APPLE_MFI_FASTCHARGE is not set
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index db12c82602f..79931617762 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,6 +1,6 @@
# Template file for 'pinebookpro-kernel'
pkgname=pinebookpro-kernel
-version=5.10.2
+version=5.10.9
revision=1
archs="aarch64*"
wrksrc="linux-${version}"
@@ -9,7 +9,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=3b84e13abae26af17ebccc4d7212f5843a991127a73a320848d5c6942ef781a2
+checksum=7f733e0dd8bbb6929aae2191cf6b9dc0b0ec1dad77ab3f5d3aad1b7fe96c4751
patch_args="-Np1"
python_version=3
From 19e6f36fa7980b89992e21743381f944580b4ed0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 06:21:15 +0100
Subject: [PATCH 159/634] stoken: bump to fix some nonsense
The commit 80c99fd1e35afe34c40b05612e44d8a9cfe8b559 changed revision
back, which seems horribly wrong
---
srcpkgs/stoken/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stoken/template b/srcpkgs/stoken/template
index 98293c153c1..1536d77d100 100644
--- a/srcpkgs/stoken/template
+++ b/srcpkgs/stoken/template
@@ -1,7 +1,7 @@
# Template file for 'stoken'
pkgname=stoken
version=0.92
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="pkgconf"
makedepends="libxml2-devel nettle-devel gtk+3-devel"
From 722ed759c38697db7d21f595941e47360c8d4926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 25 Jan 2021 12:56:25 -0300
Subject: [PATCH 160/634] epiphany: update to 3.38.2.
---
srcpkgs/epiphany/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index f23b23c6fbe..d4365e58bbb 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=3.38.0
+version=3.38.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,5 +15,6 @@ short_desc="Intuitive GNOME web browser"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-3-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=228e820d7c7f8541e4db5ecc6c81b5a88bde9b1ea17cae4a5f38446f7989c552
+checksum=8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d
From fc3ef1187c0f6a80bd21d028474cbdc4ed520c93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Jan 2021 10:10:33 +0100
Subject: [PATCH 161/634] kubecfg: update to 0.17.0.
---
srcpkgs/kubecfg/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 96510c9b335..b315f7246df 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
# Template file for 'kubecfg'
pkgname=kubecfg
-version=0.16.0
+version=0.17.0
revision=1
build_style=go
go_import_path="github.com/bitnami/kubecfg"
@@ -10,8 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/bitnami/kubecfg"
distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=08846d19db0250a21d553cdaf1f0461dc398031b9ac76ccd360b169703f63567
-
-if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
- broken="go-jsonnet/builtins.go fails for 32 bit architectures"
-fi
+checksum=3e98d4d328b2265b4105c77fb83d2af78cec7e10adc8964b7fd45bade8dcdb7d
From 69b61a6cc1239f58fa283364c5daf82433ad646b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 26 Jan 2021 10:53:36 +0100
Subject: [PATCH 162/634] librsvg: fix cross build
$XBPS_TARGET_MACHINE is empty when configure_args are expanded.
The --host is set by the build style for cross builds anyway.
Also remove the vala and gir build options and always build
the introspection and vala interface files.
Closes: #28234
---
srcpkgs/librsvg/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index f8398b9d5ef..3e4954a1332 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -5,12 +5,10 @@ version=2.48.8
revision=1
build_style=gnu-configure
build_helper="gir"
-configure_args="--disable-static --host=${XBPS_TARGET_TRIPLET}
- $(vopt_enable gir introspection) $(vopt_enable vala)"
-hostmakedepends="cargo pkg-config python glib-devel
- gdk-pixbuf-devel $(vopt_if vala vala)"
+configure_args="--disable-static --enable-introspection --enable-vala"
+hostmakedepends="cargo pkg-config python glib-devel gdk-pixbuf-devel vala"
makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel
- libglib-devel libxml2-devel pango-devel rust $(vopt_if vala vala)"
+ libglib-devel libxml2-devel pango-devel rust vala"
short_desc="SVG library for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
@@ -18,10 +16,6 @@ homepage="https://wiki.gnome.org/Projects/LibRsvg"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=f480a325bbdf26d1874eb6fb330ebc5920ba64e3e08de61931bb4506dfef2692
-# Package build options
-build_options="gir vala"
-build_options_default="gir vala"
-
do_check() {
# reference files are for pango 1.44.x, we're on 1.42.x
:
From 4728c2e431e9e812e086653cee04ba87917c902c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 26 Jan 2021 12:12:12 +0100
Subject: [PATCH 163/634] djvulibre: fix cross build
---
srcpkgs/djvulibre/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index ff103ff33cb..1425c483501 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -3,7 +3,6 @@ pkgname=djvulibre
version=3.5.28
revision=1
build_style=gnu-configure
-configure_args="--host=${XBPS_TRIPLET}"
hostmakedepends="pkg-config automake libtool"
makedepends="tiff-devel"
short_desc="Utilities for the DjVu image format"
From f4cc430256d736afd782e4cabf9b94695492e0ef Mon Sep 17 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, 24 Jan 2021 14:53:18 +0700
Subject: [PATCH 164/634] bootchart2: update to 0.14.9.
---
srcpkgs/bootchart2/patches/Makefile.patch | 20 -----------
srcpkgs/bootchart2/patches/python-3.9.patch | 35 +++++++++++++++++++
.../bootchart2/patches/rdinit-fix-panic.patch | 10 ++++++
srcpkgs/bootchart2/template | 25 +++++++------
4 files changed, 60 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/bootchart2/patches/Makefile.patch
create mode 100644 srcpkgs/bootchart2/patches/python-3.9.patch
create mode 100644 srcpkgs/bootchart2/patches/rdinit-fix-panic.patch
diff --git a/srcpkgs/bootchart2/patches/Makefile.patch b/srcpkgs/bootchart2/patches/Makefile.patch
deleted file mode 100644
index 52de44fad5a..00000000000
--- a/srcpkgs/bootchart2/patches/Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig 2017-12-10 19:54:55.223497878 -0500
-+++ Makefile 2017-12-10 19:37:39.909790719 -0500
-@@ -19,7 +19,7 @@
- EARLY_PREFIX ?=
-
- BINDIR ?= /usr/bin
--PYTHON ?= python
-+PYTHON ?= python2
- DOCDIR ?= /usr/share/docs/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)
- MANDIR ?= /usr/share/man/man1
- # never contains /usr; typically /lib, /lib64 or e.g. /lib/x86_64-linux-gnu
-@@ -99,7 +99,7 @@
- install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs
-
- install-collector: all install-chroot
-- install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
-+ install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/bin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
- install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf
- install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector
-
diff --git a/srcpkgs/bootchart2/patches/python-3.9.patch b/srcpkgs/bootchart2/patches/python-3.9.patch
new file mode 100644
index 00000000000..617e2e1586b
--- /dev/null
+++ b/srcpkgs/bootchart2/patches/python-3.9.patch
@@ -0,0 +1,35 @@
+Index: pybootchartgui/draw.py
+===================================================================
+--- pybootchartgui/draw.py.orig
++++ pybootchartgui/draw.py
+@@ -508,7 +508,7 @@ def draw_processes_recursively(ctx, proc
+ cmdString = proc.cmd
+ else:
+ cmdString = ''
+- if (OPTIONS.show_pid or OPTIONS.show_all) and ipid is not 0:
++ if (OPTIONS.show_pid or OPTIONS.show_all) and ipid != 0:
+ cmdString = cmdString + " [" + str(ipid // 1000) + "]"
+ if OPTIONS.show_all:
+ if proc.args:
+@@ -606,7 +606,7 @@ class CumlSample:
+ if self.color is None:
+ i = self.next() % HSV_MAX_MOD
+ h = 0.0
+- if i is not 0:
++ if i != 0:
+ h = (1.0 * i) / HSV_MAX_MOD
+ s = 0.5
+ v = 1.0
+Index: pybootchartgui/parsing.py
+===================================================================
+--- pybootchartgui/parsing.py.orig
++++ pybootchartgui/parsing.py
+@@ -98,7 +98,7 @@ class Trace:
+ def compile(self, writer):
+
+ def find_parent_id_for(pid):
+- if pid is 0:
++ if pid == 0:
+ return 0
+ ppid = self.parent_map.get(pid)
+ if ppid:
diff --git a/srcpkgs/bootchart2/patches/rdinit-fix-panic.patch b/srcpkgs/bootchart2/patches/rdinit-fix-panic.patch
new file mode 100644
index 00000000000..2027d5d5b03
--- /dev/null
+++ b/srcpkgs/bootchart2/patches/rdinit-fix-panic.patch
@@ -0,0 +1,10 @@
+--- bootchartd.in.orig 2021-01-24 15:52:43.339735933 +0700
++++ bootchartd.in 2021-01-24 15:53:30.256889311 +0700
+@@ -32,6 +32,7 @@
+ # some initrds don't have usleep etc.
+ USLEEP="$COLLECTOR_BIN --usleep"
+
++: "${OLDPATH:=/sbin:/bin:/usr/sbin:/usr/bin}"
+ # we need to find our tools
+ PATH="/sbin:/bin:/usr/sbin:/usr/bin:$PATH"
+
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 2131dd7d32a..62cd9d2116a 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -1,17 +1,22 @@
# Template file for 'bootchart2'
pkgname=bootchart2
-version=0.14.8.20170531
-revision=3
-_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
-wrksrc="bootchart-${_gitrev}"
+version=0.14.9
+revision=1
+wrksrc="bootchart-${version}"
build_style=gnu-makefile
-make_install_args="EARLY_PREFIX=/usr"
-makedepends="python"
-depends="pygtk git"
+make_install_args="EARLY_PREFIX=/usr DOCDIR=/usr/share/doc/bootchart2"
+hostmakedepends="python3"
+makedepends="python3"
+depends="python3-cairo"
short_desc="Startup graphing tool"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-3.0-or-later"
homepage="https://github.com/xrmx/bootchart"
-distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+distfiles="https://github.com/xrmx/bootchart/archive/${version}.tar.gz"
+checksum=cec7871c3dba47a1165873b0acde30a82221fde1d3a942da5e7dd09b513d2017
+make_dirs="/usr/lib/bootchart/tmpfs 0755 root root"
conflicts="bootchart>=0"
+
+post_patch() {
+ vsed -i -e 's,\$(EARLY_PREFIX)/sbin/,/usr/bin/,' Makefile
+}
From 6282a54af7a1343d79e719a0d09017c96b576ac9 Mon Sep 17 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, 24 Jan 2021 16:09:02 +0700
Subject: [PATCH 165/634] dracut: fix 00bootchart's requirements
---
.../dracut/patches/00bootchart-requirements.patch | 14 ++++++++++++++
srcpkgs/dracut/template | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dracut/patches/00bootchart-requirements.patch
diff --git a/srcpkgs/dracut/patches/00bootchart-requirements.patch b/srcpkgs/dracut/patches/00bootchart-requirements.patch
new file mode 100644
index 00000000000..a617565a0c1
--- /dev/null
+++ b/srcpkgs/dracut/patches/00bootchart-requirements.patch
@@ -0,0 +1,14 @@
+--- modules.d/00bootchart/module-setup.sh.orig 2021-01-24 16:00:46.529880095 +0700
++++ modules.d/00bootchart/module-setup.sh 2021-01-24 16:00:56.134911133 +0700
+@@ -19,10 +19,8 @@
+
+ inst_multiple bootchartd bash \
+ /lib/bootchart/bootchart-collector /etc/bootchartd.conf \
+- accton \
+ echo \
+- grep \
+- usleep
++ grep
+
+ inst /usr/bin/pkill /bin/pkill
+ inst /usr/bin/[ /bin/[
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 27743569eda..53cee6c4ff2 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=050
-revision=9
+revision=10
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
From 7febac226bf4a684e86428b480c3c07a1b0ab638 Mon Sep 17 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, 25 Jan 2021 07:41:21 +0700
Subject: [PATCH 166/634] android-tools: update to 30.0.5.
---
...s-fix-dependencies-on-protobuf-heade.patch | 63 +++++++++++++++++++
srcpkgs/android-tools/template | 34 +++-------
srcpkgs/android-tools/update | 2 +-
3 files changed, 71 insertions(+), 28 deletions(-)
create mode 100644 srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch
diff --git a/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch b/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch
new file mode 100644
index 00000000000..0d883b4f0fb
--- /dev/null
+++ b/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch
@@ -0,0 +1,63 @@
+From 41f92b797aa6bf4609b6b31e42bd37df710ae7aa Mon Sep 17 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, 25 Jan 2021 08:25:31 +0700
+Subject: [PATCH] vendor: CMakeLists: fix dependencies on protobuf header
+
+While we're at it, simplify OBJECT_DEPENDS as pointed out in
+https://cmake.org/cmake/help/v3.18/prop_sf/OBJECT_DEPENDS.html
+
+This fix a broken build because of a race as shown in:
+https://github.com/void-linux/void-packages/pull/28209/checks?check_run_id=1758983334
+---
+ vendor/CMakeLists.adb.txt | 23 ++++++++---------------
+ 1 file changed, 8 insertions(+), 15 deletions(-)
+
+diff --git vendor/CMakeLists.adb.txt vendor/CMakeLists.adb.txt
+index 1495a5d..5206a80 100644
+--- vendor/CMakeLists.adb.txt
++++ vendor/CMakeLists.adb.txt
+@@ -34,19 +34,10 @@ add_library(libadb STATIC
+ core/adb/sysdeps_unix.cpp
+ core/adb/sysdeps/errno.cpp
+ core/adb/sysdeps/posix/network.cpp
+- ${ADB_APP_PROCESSES_PROTO_SRCS}
+- ${ADB_KNOWN_HOSTS_PROTO_SRCS}
+- ${ADB_KEY_TYPE_PROTO_SRCS}
+- ${ADB_PAIRING_PROTO_SRCS})
+-
+-set_property(SOURCE core/adb/client/commandline.cpp
+- PROPERTY OBJECT_DEPENDS ${ADB_APP_PROCESSES_PROTO_HDRS})
+-set_property(SOURCE core/adb/client/adb_wifi.cpp
+- PROPERTY OBJECT_DEPENDS ${ADB_KNOWN_HOSTS_PROTO_HDRS})
+-set_property(SOURCE core/adb/client/auth.cpp
+- PROPERTY OBJECT_DEPENDS ${ADB_KEY_TYPE_PROTO_HDRS})
+-set_property(SOURCE core/adb/pairing_connection/pairing_connection.cpp
+- PROPERTY OBJECT_DEPENDS ${ADB_PAIRING_PROTO_HDRS})
++ ${ADB_APP_PROCESSES_PROTO_SRCS} ${ADB_APP_PROCESSES_PROTO_HDRS}
++ ${ADB_KNOWN_HOSTS_PROTO_SRCS} ${ADB_KNOWN_HOSTS_PROTO_HDRS}
++ ${ADB_KEY_TYPE_PROTO_SRCS} ${ADB_KEY_TYPE_PROTO_HDRS}
++ ${ADB_PAIRING_PROTO_SRCS} ${ADB_PAIRING_PROTO_HDRS})
+
+ target_compile_definitions(libadb PRIVATE -D_GNU_SOURCE)
+ target_compile_definitions(libadb PUBLIC -DADB_HOST=1)
+@@ -68,7 +59,8 @@ target_include_directories(libadb PUBLIC
+ add_library(libadb_crypto_defaults STATIC
+ core/adb/crypto/key.cpp
+ core/adb/crypto/rsa_2048_key.cpp
+- core/adb/crypto/x509_generator.cpp)
++ core/adb/crypto/x509_generator.cpp
++ ${ADB_KEY_TYPE_PROTO_HDRS})
+
+ target_include_directories(libadb_crypto_defaults PUBLIC
+ core/adb
+@@ -173,7 +165,8 @@ add_executable(adb
+ core/adb/transport_fd.cpp
+ core/adb/client/transport_local.cpp
+ core/adb/client/transport_usb.cpp
+- core/adb/types.cpp)
++ core/adb/types.cpp
++ ${ADB_KEY_TYPE_PROTO_HDRS})
+
+ target_compile_definitions(adb PRIVATE
+ -DPLATFORM_TOOLS_VERSION="${ANDROID_VERSION}"
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 343a543a9a2..a75a37d7076 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,46 +1,26 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=29.0.6
-revision=3
+version=30.0.5
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le*"
build_style=cmake
-hostmakedepends="perl go"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel"
+hostmakedepends="perl go protobuf"
+makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+ liblz4-devel libzstd-devel protobuf-devel brotli-devel"
short_desc="Android platform tools (adb and fastboot)"
maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="http://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=7fb1c127c36b0752657593838b6823743bf8e5730f9f8b0f7ba2c185424cf376
+checksum=1b870a3f28d75e4907c95dbe8e71b4014f56be636d089a75257ef3922ad39d62
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
fi
-pre_configure() {
- # Don't check for CROSS_COMPILING, since i686 container/chroot inside
- # x86_64 host will failed to build this.
- if [ "${XBPS_TARGET_MACHINE}" = i686 ] && [ "$(uname -m)" = "x86_64" ]; then
- boring_ssl_cmake_args="-DCMAKE_TOOLCHAIN_FILE=cross_boring_ssl.cmake"
- cat > cross_boring_ssl.cmake <<-_EOF
- SET(CMAKE_SYSTEM_NAME Linux)
- SET(CMAKE_SYSTEM_VERSION 1)
- SET(CMAKE_C_COMPILER ${CC})
- SET(CMAKE_CXX_COMPILER ${CXX})
- SET(CMAKE_SYSTEM_PROCESSOR x86)
- _EOF
- configure_args+=" ${boring_ssl_cmake_args}"
- fi
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- sed -i vendor/CMakeLists.adb.txt \
- -e "/target_link_libraries/s;$; atomic;"
- fi
-}
-
post_install() {
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
- vlicense vendor/boringssl/third_party/googletest/LICENSE gtest.LICENSE
vsv adb
}
diff --git a/srcpkgs/android-tools/update b/srcpkgs/android-tools/update
index 49895605477..f69b1910ad9 100644
--- a/srcpkgs/android-tools/update
+++ b/srcpkgs/android-tools/update
@@ -1,2 +1,2 @@
-site="https://android.googlesource.com/platform/system/core"
+site="https://android.googlesource.com/platform/system/core/+refs"
pattern='platform-tools-\K[\d._r]+'
From 20b2060d545743eec5f367bbb1c77d09370d4346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 20:54:47 +0700
Subject: [PATCH 167/634] volumeicon: fix l10n dir
---
srcpkgs/volumeicon/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..d92993ab771 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,10 +1,10 @@
# Template file for 'volumeicon'
pkgname=volumeicon
version=0.5.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-notify"
-hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
+hostmakedepends="pkg-config intltool"
makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
short_desc="Lightweight volume control that sits in your systray"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,10 +19,6 @@ post_patch() {
src/alsa_volume_mapping.c >LICENSE.ISC
}
-pre_configure() {
- autoreconf -fi
-}
-
post_install() {
vlicense LICENSE.MIT
vlicense LICENSE.ISC
From 9198fe13fbbf92755fd2fcd2714281eda1378ea1 Mon Sep 17 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, 24 Jan 2021 13:44:49 +0700
Subject: [PATCH 168/634] SLADE: fix build with gcc-10, link with system
libraries
---
srcpkgs/SLADE/patches/pointer-decay.patch | 29 ++++++++++++++++++++
srcpkgs/SLADE/patches/system-libraries.patch | 17 ++++++++++++
srcpkgs/SLADE/template | 5 ++--
3 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/SLADE/patches/pointer-decay.patch
create mode 100644 srcpkgs/SLADE/patches/system-libraries.patch
diff --git a/srcpkgs/SLADE/patches/pointer-decay.patch b/srcpkgs/SLADE/patches/pointer-decay.patch
new file mode 100644
index 00000000000..87f3370a85f
--- /dev/null
+++ b/srcpkgs/SLADE/patches/pointer-decay.patch
@@ -0,0 +1,29 @@
+--- src/External/sol/sol.hpp
++++ src/External/sol/sol.hpp
+@@ -6818,7 +6818,7 @@
+ }
+
+ static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) {
+- return stack::push<const wchar_t*>(L, str, str + sz);
++ return stack::push<const wchar_t*>(L, str + 0, str + sz);
+ }
+ };
+
+@@ -6829,7 +6829,7 @@
+ }
+
+ static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) {
+- return stack::push<const char16_t*>(L, str, str + sz);
++ return stack::push<const char16_t*>(L, str + 0, str + sz);
+ }
+ };
+
+@@ -6840,7 +6840,7 @@
+ }
+
+ static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) {
+- return stack::push<const char32_t*>(L, str, str + sz);
++ return stack::push<const char32_t*>(L, str + 0, str + sz);
+ }
+ };
+
diff --git a/srcpkgs/SLADE/patches/system-libraries.patch b/srcpkgs/SLADE/patches/system-libraries.patch
new file mode 100644
index 00000000000..9f114e04204
--- /dev/null
+++ b/srcpkgs/SLADE/patches/system-libraries.patch
@@ -0,0 +1,17 @@
+lzma is p7zip not liblzma
+--- src/External/CMakeLists.txt
++++ src/External/CMakeLists.txt
+@@ -24,12 +24,10 @@
+ file(GLOB_RECURSE EXTERNAL_SOURCES
+ *.cpp
+ *.cxx
+- dumb/*.c
+- lua/*.c
+ lzma/C/LzmaDec.c
+ ${SLADE_HEADERS}
+ )
+
+ add_library(external STATIC ${EXTERNAL_SOURCES})
+ target_link_libraries(external ${ZLIB_LIBRARY})
+-set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
++set(EXTERNAL_LIBRARIES external dumb lua5.3 PARENT_SCOPE)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 64a183b5498..b7ec0f0749c 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,12 +1,13 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.1.12a
-revision=3
+revision=4
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config p7zip which"
makedepends="SFML-devel fluidsynth-devel freeimage-devel ftgl-devel glew-devel
- gtk+3-devel libcurl-devel wxWidgets-gtk3-devel"
+ gtk+3-devel libcurl-devel wxWidgets-gtk3-devel bzip2-devel zlib-devel
+ lua53-devel dumb-devel liblzma-devel"
short_desc="Modern editor for Doom-engine based games"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
From 8d245c3de8a9f267d3d9174b568ffba5cd3b8a0a Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Fri, 22 Jan 2021 22:43:40 +0600
Subject: [PATCH 169/634] txr: update to 248.
---
srcpkgs/txr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index c3b0931c69a..a05cb92f7fc 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,6 +1,6 @@
# Template file for 'txr'
pkgname=txr
-version=244
+version=248
revision=1
archs="x86_64* i686* aarch64* arm* ppc64* mips*"
build_style=configure
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
homepage="http://www.nongnu.org/txr/"
changelog="http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=${pkgname}-${version}"
distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=192cebb4edf89fcf0010cf3982a058ee5019abf28336bcf47cd3a5c1bb392b58
+checksum=58d04f9112b966f0b32e5ddf198622c97b4caaf990db23b5980eae7b44e3415e
nopie=yes
if [ "$CROSS_BUILD" ]; then
From 4aebadd7c0148eb16819a1cba40c6924126ce551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:09:09 +0700
Subject: [PATCH 170/634] volumeicon: add missing patches
---
srcpkgs/volumeicon/patches/locale.patch | 14 +++++++++++
srcpkgs/volumeicon/patches/notify.patch | 31 +++++++++----------------
2 files changed, 25 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/volumeicon/patches/locale.patch
diff --git a/srcpkgs/volumeicon/patches/locale.patch b/srcpkgs/volumeicon/patches/locale.patch
new file mode 100644
index 00000000000..5ed00f1b9c7
--- /dev/null
+++ b/srcpkgs/volumeicon/patches/locale.patch
@@ -0,0 +1,14 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -5950,7 +5950,7 @@ fi
+ ;;
+ *)
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
diff --git a/srcpkgs/volumeicon/patches/notify.patch b/srcpkgs/volumeicon/patches/notify.patch
index dbcf7f4d700..7da67899194 100644
--- a/srcpkgs/volumeicon/patches/notify.patch
+++ b/srcpkgs/volumeicon/patches/notify.patch
@@ -1,22 +1,13 @@
-From 78a9c23775ebe12d3f3be93c0798144a6e732d90 Mon Sep 17 00:00:00 2001
-From: John Lindgren <john.lindgren@aol.com>
-Date: Wed, 30 Dec 2015 20:50:46 -0500
-Subject: [PATCH] Add missing space in NOTIFY_CFLAGS.
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git configure.ac configure.ac
-index 6ad78d5..c8b72bd 100644
---- configure.ac
-+++ configure.ac
-@@ -86,7 +86,7 @@ fi
- if test "x${notify}" = xyes; then
- # Check for libnotify
- PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.5.0])
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -6644,7 +6644,7 @@ else
+ $as_echo "yes" >&6; }
+
+ fi
-NOTIFY_CFLAGS+="-DCOMPILEWITH_NOTIFY"
-+NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY"
- AC_SUBST(NOTIFY_CFLAGS)
- AC_SUBST(NOTIFY_LIBS)
++NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY "
+
+
fi
From ad28ed05cc6d15d176bc26487be567fe000e4e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:13:10 +0700
Subject: [PATCH 171/634] seahorse-nautilus: fix l10n dir
---
srcpkgs/seahorse-nautilus/patches/locale.patch | 15 +++++++++++++++
srcpkgs/seahorse-nautilus/template | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
new file mode 100644
index 00000000000..1b63a313012
--- /dev/null
+++ b/srcpkgs/seahorse-nautilus/patches/locale.patch
@@ -0,0 +1,15 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -14606,8 +14606,8 @@ fi
+ DATADIRNAME=share
+ ;;
+ *)
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index a2584685866..04424cc4acd 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse-nautilus'
pkgname=seahorse-nautilus
version=3.10.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool gpgme-devel gnupg glib"
From ae2c37cc0c8d4aa96469c2debe53de4a8e04fd38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:33:55 +0700
Subject: [PATCH 172/634] GConf: fix l10n dir
---
srcpkgs/GConf/template | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..c107d556988 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,15 +1,14 @@
# Template file for 'GConf'
pkgname=GConf
version=3.2.6
-revision=9
+revision=10
build_style=gnu-configure
build_helper="gir"
configure_args="--without-openldap --enable-gtk --enable-defaults-service
--disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
$(vopt_enable gir introspection)"
conf_files="/etc/gconf/2/path"
-hostmakedepends="automake libtool pkg-config gettext-devel intltool gtk-doc
- glib-devel gobject-introspection"
+hostmakedepends="pkg-config intltool gtk-doc glib-devel gobject-introspection"
makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
depends="dconf"
short_desc="Process-transparent configuration system"
@@ -28,10 +27,6 @@ make_dirs="/usr/share/gconf/schemas 0755 root root
build_options="gir"
build_options_default="gir"
-pre_configure() {
- autoreconf -if
-}
-
GConf-devel_package() {
depends="glib-devel dbus-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 6fc03234267c591e2e6760f75bd65047faf30656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:37:02 +0700
Subject: [PATCH 173/634] GConf: add missing patch for musl
---
srcpkgs/GConf/patches/locale.patch | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/GConf/patches/locale.patch
diff --git a/srcpkgs/GConf/patches/locale.patch b/srcpkgs/GConf/patches/locale.patch
new file mode 100644
index 00000000000..1f7e22cd2e7
--- /dev/null
+++ b/srcpkgs/GConf/patches/locale.patch
@@ -0,0 +1,15 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -18589,8 +18589,8 @@ fi
+ DATADIRNAME=share
+ ;;
+ *)
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
From 52e24c28442aeb29dcc077f0dbb9f4e5658ab6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:46:21 +0700
Subject: [PATCH 174/634] parcellite: fix l10n dir
---
srcpkgs/parcellite/patches/locale.patch | 15 +++++++++++++++
srcpkgs/parcellite/template | 8 ++------
2 files changed, 17 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/parcellite/patches/locale.patch
diff --git a/srcpkgs/parcellite/patches/locale.patch b/srcpkgs/parcellite/patches/locale.patch
new file mode 100644
index 00000000000..dbe545e0994
--- /dev/null
+++ b/srcpkgs/parcellite/patches/locale.patch
@@ -0,0 +1,15 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -4981,8 +4981,8 @@ fi
+ DATADIRNAME=share
+ ;;
+ *)
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
+ ;;
+ esac
+ fi
diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..98f7b661cd7 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,9 +1,9 @@
# Template file for 'parcellite'
pkgname=parcellite
version=1.2.1
-revision=3
+revision=4
build_style=gnu-configure
-hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
+hostmakedepends="intltool glib-devel pkg-config"
makedepends="gtk+-devel"
depends="desktop-file-utils"
short_desc="GTK+ clipboard manager"
@@ -14,7 +14,3 @@ distfiles="${SOURCEFORGE_SITE}/parcellite/${version}/parcellite-${version}.tar.g
checksum=aba1c7c56c7607e219ce9855723eefa552c5376982891aefbfb5a2d3297ef046
export LIBS=-lgio-2.0
-
-pre_configure() {
- autoreconf -fi
-}
From ae2cafce4ade80ed43e8d4198b9fefa089b4e0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Jan 2021 21:56:50 +0700
Subject: [PATCH 175/634] tilp2: fix l10n dir
---
srcpkgs/tilp2/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..276c85e6e74 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,9 +1,10 @@
# Template file for 'tilp2'
pkgname=tilp2
version=1.18
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
+hostmakedepends="automake bison groff intltool libtool pkg-config texinfo
+ gettext-devel glib-devel"
makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
libticalcs2-devel"
@@ -15,11 +16,10 @@ homepage="https://www.ticalc.org"
distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${version}.tar.bz2"
checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" gettext-devel glib-devel"
-fi
-
pre_configure() {
mkdir -p m4
autoreconf -i -v -f
+ vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+ -e '/CATOBJEXT=/s/\.mo/.gmo/' \
+ configure
}
From b0f841ee9d88c02d6b848608ed4f93bd782ebba6 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 16:50:23 +0300
Subject: [PATCH 176/634] element-desktop: update to 1.7.18
---
srcpkgs/element-desktop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 194a88fbc3e..3dd6032b568 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'element-desktop'
pkgname=element-desktop
-version=1.7.16
+version=1.7.18
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
@@ -18,13 +18,13 @@ _ghpage="https://github.com/vector-im"
_archive="archive/v${version}.tar.gz"
distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="1aac1c80370d62c82d1c8befe167cf838f66ad477a47ea0c5a020913ed36e1ed
- 4a4821a046ea1f81852de95a4c83fe0f1aaa371fad65e63b48216889c065d155"
+checksum="364c6666cca3e8acee0f147fe8ac14825efa851bae4c89e2ce1cada5a817bff8
+ 08ed3b659ebbe79fb749b49f18257024469e7d5f28d15d007529a12a9196d297"
export USE_SYSTEM_APP_BUILDER=true
pre_build() {
- # Build dependencies for riot-web
+ # Build dependencies for element-web
yarn install
# Build dependencies and alterations for element-desktop
From ae10a8df924045785ee2cf1ff88b0f6b8558c369 Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sun, 24 Jan 2021 14:46:10 -0300
Subject: [PATCH 177/634] libsndfile: update to 1.0.31
---
srcpkgs/libsndfile/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template
index 3e5726d2fc6..15d21ab8f4a 100644
--- a/srcpkgs/libsndfile/template
+++ b/srcpkgs/libsndfile/template
@@ -1,6 +1,6 @@
# Template file for 'libsndfile'
pkgname=libsndfile
-version=1.0.30
+version=1.0.31
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config python3"
@@ -9,8 +9,8 @@ short_desc="C library for reading and writing files containing sampled sound"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://libsndfile.github.io/libsndfile/"
-distfiles="https://github.com/libsndfile/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=9df273302c4fa160567f412e10cc4f76666b66281e7ba48370fb544e87e4611a
+distfiles="https://github.com/libsndfile/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
+checksum=a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163
libsndfile-progs_package() {
short_desc+=" - bundled cmdline apps"
From 7fe46f722536553052d1f1904cf93760a2b3da79 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Jan 2021 14:30:43 +0100
Subject: [PATCH 178/634] perl: update to 5.32.1.
---
srcpkgs/perl/patches/Time-HiRes.diff | 34 ----------------------------
srcpkgs/perl/template | 14 ++++++------
2 files changed, 7 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/perl/patches/Time-HiRes.diff
diff --git a/srcpkgs/perl/patches/Time-HiRes.diff b/srcpkgs/perl/patches/Time-HiRes.diff
deleted file mode 100644
index 55800a14b54..00000000000
--- a/srcpkgs/perl/patches/Time-HiRes.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- dist/Time-HiRes/Makefile.PL.orig
-+++ dist/Time-HiRes/Makefile.PL
-@@ -603,6 +603,7 @@
- my $has_clock_gettime_emulation;
- if (exists $Config{d_clock_gettime}) {
- $has_clock_gettime++ if $Config{d_clock_gettime}; # Unlikely...
-+ $DEFINE .= ' -DTIME_HIRES_CLOCK_GETTIME';
- } elsif (has_clock_xxx('gettime')) {
- $has_clock_gettime++;
- $DEFINE .= ' -DTIME_HIRES_CLOCK_GETTIME';
-@@ -632,6 +633,7 @@
- my $has_clock_getres_emulation;
- if (exists $Config{d_clock_getres}) {
- $has_clock_getres++ if $Config{d_clock_getres}; # Unlikely...
-+ $DEFINE .= ' -DTIME_HIRES_CLOCK_GETRES';
- } elsif (has_clock_xxx('getres')) {
- $has_clock_getres++;
- $DEFINE .= ' -DTIME_HIRES_CLOCK_GETRES';
-@@ -661,6 +663,7 @@
- my $has_clock_nanosleep_emulation;
- if (exists $Config{d_clock_nanosleep}) {
- $has_clock_nanosleep++ if $Config{d_clock_nanosleep}; # Unlikely...
-+ $DEFINE .= ' -DTIME_HIRES_CLOCK_NANOSLEEP';
- } elsif (has_clock_nanosleep()) {
- $has_clock_nanosleep++;
- $DEFINE .= ' -DTIME_HIRES_CLOCK_NANOSLEEP';
-@@ -684,6 +687,7 @@
- my $has_clock;
- if (exists $Config{d_clock}) {
- $has_clock++ if $Config{d_clock}; # Unlikely...
-+ $DEFINE .= ' -DTIME_HIRES_CLOCK';
- } elsif (has_clock()) {
- $has_clock++;
- $DEFINE .= ' -DTIME_HIRES_CLOCK';
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index e5530344d7c..b1e985c3f25 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,8 +1,8 @@
# Template file for 'perl'
pkgname=perl
-version=5.32.0
+version=5.32.1
revision=1
-_perl_cross_version=1.3.4
+_perl_cross_version=1.3.5
build_style=gnu-configure
hostmakedepends="less"
makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
@@ -14,8 +14,8 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://www.perl.org"
distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4
- 755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba"
+checksum="03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c
+ 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
# Before updating this package to a new major version, run ${FILESDIR}/provides.pl
# against ${wrksrc} to find the list of built in packages.
@@ -32,7 +32,7 @@ provides="perl-Archive-Tar-2.36_1
perl-Compress-Raw-Zlib-2.093_1
perl-Config-Perl-V-0.32_1
perl-DB_File-1.853_1
- perl-Data-Dumper-2.174_1
+ perl-Data-Dumper-2.174_01_1
perl-Devel-PPPort-3.57_1
perl-Devel-SelfStubber-1.06_1
perl-Digest-1.17_01_1
@@ -73,7 +73,7 @@ provides="perl-Archive-Tar-2.36_1
perl-Math-BigRat-0.2614_1
perl-Math-Complex-1.5901_1
perl-Memoize-1.03_01_1
- perl-Module-CoreList-5.20200620_1
+ perl-Module-CoreList-5.20210123_1
perl-Module-Load-0.34_1
perl-Module-Load-Conditional-0.70_1
perl-Module-Loaded-0.08_1
@@ -89,7 +89,7 @@ provides="perl-Archive-Tar-2.36_1
perl-Pod-Perldoc-3.2801_1
perl-Pod-Simple-3.40_1
perl-Pod-Usage-1.69_1
- perl-Safe-2.41_1
+ perl-Safe-2.41_01_1
perl-Scalar-List-Utils-1.55_1
perl-Search-Dict-1.07_1
perl-SelfLoader-1.26_1
From 9d576c141811a7cf24308a60306d2de8f0cf0114 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 11:35:15 +0100
Subject: [PATCH 179/634] jgmenu: update to 4.3.0.
---
srcpkgs/jgmenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template
index d4a2c7dd72e..4f459c54689 100644
--- a/srcpkgs/jgmenu/template
+++ b/srcpkgs/jgmenu/template
@@ -1,6 +1,6 @@
# Template file for 'jgmenu'
pkgname=jgmenu
-version=4.2.1
+version=4.3.0
revision=1
build_style=gnu-configure
make_use_env=yes
@@ -16,4 +16,4 @@ license="GPL-2.0-only"
homepage="https://www.github.com/johanmalm/jgmenu"
changelog="https://raw.githubusercontent.com/johanmalm/jgmenu/master/docs/relnotes/${version}.txt"
distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz"
-checksum=8ce3250b6a726f068126a0b75e02a6caafcf651b8c6ef59b328ff70a81473fc5
+checksum=84daae2c544a2755d76e9bcd8cd2503e9cfbf8c48b3e97c8ec32dbcf269c6275
From 4c21ed9e056bb07744e4cd401f05729798ab695d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 19:53:19 +0100
Subject: [PATCH 180/634] build-style/void-cross: symlink bin on install
this is needed so that binaries go in sysroot/usr/bin instead
of sysroot/bin
---
common/build-style/void-cross.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 5ce5a0d4360..23b8d539dbf 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -547,6 +547,7 @@ do_install() {
# and we want to delete the libexec from glibc afterwards to save space
mkdir -p ${DESTDIR}/${sysroot}/usr/{bin,lib,libexec,include,share}
# Sysroot base symlinks
+ ln -sf usr/bin ${DESTDIR}/${sysroot}/bin
ln -sf usr/lib ${DESTDIR}/${sysroot}/lib
ln -sf usr/lib ${DESTDIR}/${sysroot}/lib${ws}
ln -sf lib ${DESTDIR}/${sysroot}/usr/lib${ws}
From 00a11db8df5658bd9e1855b534d9193fc7c7b037 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Jan 2021 20:04:43 +0100
Subject: [PATCH 181/634] NetworkManager: fix cross build
---
srcpkgs/NetworkManager/patches/fix-cross-gir.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index 2d0db910adb..c283d4dc105 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -24,7 +24,7 @@ index 51ca46d..f14d861 100644
- generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+ if meson.is_cross_build()
+ qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
++ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
+ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
+ else
+ generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
From 7af5a589bce0f52ed5cf3c45c97ab8ffea21d441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 15:50:26 -0300
Subject: [PATCH 182/634] sudo: update to 1.9.5p2.
Fixes CVE-2021-3156.
---
srcpkgs/sudo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 54b3a5a2f65..1ac86c242a0 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
# Template file for 'sudo'
pkgname=sudo
-version=1.9.5p1
+version=1.9.5p2
revision=1
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://www.sudo.ws/"
changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=4dddf37c22653defada299e5681e0daef54bb6f5fc950f63997bb8eb966b7882
+checksum=539e2ef43c8a55026697fb0474ab6a925a11206b5aa58710cb42a0e1c81f0978
conf_files="/etc/pam.d/sudo /etc/sudoers"
lib32disabled=yes
From 6694eea9f7e80cff3dffb4c415919ead17af48dc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:17:55 +0100
Subject: [PATCH 183/634] build-style/void-cross: always enable libssp
this way we'll be able to provide libssp(-devel) unconditionally
inside cross-vpkg-dummy, which should be the right thing to do
---
common/build-style/void-cross.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 23b8d539dbf..055b3dc3ce7 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -372,14 +372,12 @@ _void_cross_build_gcc() {
local extra_args
if [ -f ${wrksrc}/.musl_version ]; then
- extra_args+=" --enable-libssp"
# otherwise glibc hosts get confused and use the gnu impl
extra_args+=" --enable-clocale=generic"
extra_args+=" --disable-symvers"
extra_args+=" --disable-gnu-unique-object"
extra_args+=" libat_cv_have_ifunc=no"
else
- extra_args+=" --disable-libssp"
extra_args+=" --enable-gnu-unique-object"
fi
@@ -419,6 +417,7 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
+ --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
From 9e51ad8ecf371a2953d51be0bd334abc866935fe Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:46:36 +0100
Subject: [PATCH 184/634] common/shlibs: bump glibc version
looks like newer sudo, besides other things, will introduce
newer symvers; we need to make sure all new packages will also
update glibc with them
---
common/shlibs | 60 +++++++++++++++++++++++++--------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 78416f43ed0..1226e31c189 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -17,36 +17,36 @@
# one (order top->bottom) is preferred over the next ones.
#
libc.so musl-1.1.21_1
-libc.so.6 glibc-2.29_1
-libm.so.6 glibc-2.29_1
-libpthread.so.0 glibc-2.29_1
-librt.so.1 glibc-2.29_1
-libdl.so.2 glibc-2.29_1
-ld-linux-x86-64.so.2 glibc-2.29_1 x86_64
-ld-linux.so.2 glibc-2.29_1 i686
-ld-linux.so.3 glibc-2.29_1 armv5tel
-ld-linux-aarch64.so.1 glibc-2.29_1 aarch64
-ld64.so.2 glibc-2.29_1 ppc64
-ld.so.1 glibc-2.29_1 mips
-ld.so.1 glibc-2.29_1 ppc
-ld-linux-armhf.so.3 glibc-2.29_1
-libresolv.so.2 glibc-2.29_1
-libanl.so.1 glibc-2.29_1
-libthread_db.so.1 glibc-2.29_1
-libutil.so.1 glibc-2.29_1
-libnsl.so.1 glibc-2.29_1
-libnss_db.so.2 glibc-2.29_1
-libnss_files.so.2 glibc-2.29_1
-libnss_compat.so.2 glibc-2.29_1
-libnss_dns.so.2 glibc-2.29_1
-libnss_hesiod.so.2 glibc-2.29_1
-libcrypt.so.1 glibc-2.29_1
-libBrokenLocale.so.1 glibc-2.29_1
-libmemusage.so glibc-2.29_1
-libSegFault.so glibc-2.29_1
-libpcprofile.so glibc-2.29_1
-libcidn.so.1 glibc-2.29_1
-libmvec.so.1 glibc-2.29_1
+libc.so.6 glibc-2.32_1
+libm.so.6 glibc-2.32_1
+libpthread.so.0 glibc-2.32_1
+librt.so.1 glibc-2.32_1
+libdl.so.2 glibc-2.32_1
+ld-linux-x86-64.so.2 glibc-2.32_1 x86_64
+ld-linux.so.2 glibc-2.32_1 i686
+ld-linux.so.3 glibc-2.32_1 armv5tel
+ld-linux-aarch64.so.1 glibc-2.32_1 aarch64
+ld64.so.2 glibc-2.32_1 ppc64
+ld.so.1 glibc-2.32_1 mips
+ld.so.1 glibc-2.32_1 ppc
+ld-linux-armhf.so.3 glibc-2.32_1
+libresolv.so.2 glibc-2.32_1
+libanl.so.1 glibc-2.32_1
+libthread_db.so.1 glibc-2.32_1
+libutil.so.1 glibc-2.32_1
+libnsl.so.1 glibc-2.32_1
+libnss_db.so.2 glibc-2.32_1
+libnss_files.so.2 glibc-2.32_1
+libnss_compat.so.2 glibc-2.32_1
+libnss_dns.so.2 glibc-2.32_1
+libnss_hesiod.so.2 glibc-2.32_1
+libcrypt.so.1 glibc-2.32_1
+libBrokenLocale.so.1 glibc-2.32_1
+libmemusage.so glibc-2.32_1
+libSegFault.so glibc-2.32_1
+libpcprofile.so glibc-2.32_1
+libcidn.so.1 glibc-2.32_1
+libmvec.so.1 glibc-2.32_1
libz.so.1 zlib-1.2.3_1
libbz2.so.1 bzip2-1.0.5_1
libarchive.so.13 libarchive-3.3.3_5
From b9ae21f90d093169f62f0d3477c225e56a76cca1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:47:28 +0100
Subject: [PATCH 185/634] sudo: rebuild to get newer glibc ver
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 1ac86c242a0..1a088aaa033 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.5p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 20bcc8e9eed3a2a0d220d91226330d6170b12a5c Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 26 Jan 2021 18:51:23 +0100
Subject: [PATCH 186/634] terragrunt: update to 0.27.3.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9f1da160a16..a7dc8ef4686 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.27.1
+version=0.27.3
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/$pkgname"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=5cc13d6556b9206335be97a5e8f163c85e2097a44b352c284efb369ea6c0e446
+checksum=a9d2c8457ba532ca2bbf06312a7b1eb34789119af8ee5b867a11a217d3877272
post_install() {
vlicense LICENSE.txt
From a31074dd276f11afabe821141d6af0fdfdb097bf Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 26 Jan 2021 18:59:36 +0100
Subject: [PATCH 187/634] websocketd: update to 0.4.1.
---
srcpkgs/websocketd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 50b5bc2baeb..e0eba0cdb59 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,6 +1,6 @@
# Template file for 'websocketd'
pkgname=websocketd
-version=0.3.1
+version=0.4.1
revision=1
build_style=go
hostmakedepends="git"
@@ -10,4 +10,4 @@ license="BSD"
go_import_path="github.com/joewalnes/websocketd"
homepage="https://$go_import_path"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=323700908ca7fe7b69cb2cc492b4746c4cd3449e49fbab15a4b3a5eccf8757f4
+checksum=6b8fe0fad586d794e002340ee597059b2cfc734ba7579933263aef4743138fe5
From db1f9b30372a1eb2fca883c517c3c4a4c385c44a Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Tue, 26 Jan 2021 20:29:27 +0100
Subject: [PATCH 188/634] nvidia: update to 460.39.
Closes: #28251 [via git-merge-pr]
---
srcpkgs/nvidia/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 6e2f3231022..8929bf8f60a 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
_desc="NVIDIA drivers for linux"
pkgname=nvidia
-version=460.32.03
+version=460.39
revision=1
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
_pkg="NVIDIA-Linux-x86_64-${version}"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=4f2122fc23655439f214717c4c35ab9b4f5ab8537cddfdf059a5682f1b726061
+checksum=0bf0664078013aa62ed6840caed0637b226884b9398e1fb647e127ad3ad9a37f
# subpackages need to be processed in this specific order
subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
depends="nvidia-libs-${version}_${revision}
From 3cffe33d40a77f97de83e9b565deab38c56fddb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 15:36:17 -0300
Subject: [PATCH 189/634] wxWidgets-gtk3: fix some cross builds.
Projects that include <wx/setup.h> use wx-config to get flags for where
it's located. For example, "-I
/usr/armv7l-linux-musleabihf/lib/wx/include/gtk3-unicode-3.0".
Unfortunately, wx-config uses libdir from the native package,
/usr/lib$host_wordsize, which breaks cross builds for targets with
different word sizes.
Fix this by changing "lib$wordsize" to "lib".
Fixes #27495
---
srcpkgs/wxWidgets-gtk3/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template
index 1081bc8853d..7847442b405 100644
--- a/srcpkgs/wxWidgets-gtk3/template
+++ b/srcpkgs/wxWidgets-gtk3/template
@@ -1,7 +1,7 @@
# Template file for 'wxWidgets-gtk3'
pkgname=wxWidgets-gtk3
version=3.0.5.1
-revision=3
+revision=4
wrksrc="wxWidgets-${version}"
build_style=gnu-configure
configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl
@@ -34,11 +34,12 @@ post_install() {
ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3
# - ignore --host option; breaks configure scripts when
# cross compiling (isn’t necessary in our case anyway)
- sed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
+ vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
-e 's/is_cross().*/is_cross() { false; }/g' \
-e '/--\*=\*)/i --host=\*) continue;;' \
- $DESTDIR/usr/lib/wx/config/gtk3-unicode-3.0
+ -e "s/lib${XBPS_WORDSIZE}/lib/g" \
+ $DESTDIR/usr/lib/wx/config/${_config}
}
wxWidgets-common_package() {
From d91c4b11bb7868061f1e1e7f9c37abf0320e994e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:05:27 -0300
Subject: [PATCH 190/634] kicad-doc: update to 5.1.9.
---
srcpkgs/kicad-doc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kicad-doc/template b/srcpkgs/kicad-doc/template
index 8c9d44e7a86..780a7db122e 100644
--- a/srcpkgs/kicad-doc/template
+++ b/srcpkgs/kicad-doc/template
@@ -1,13 +1,13 @@
# Template file for 'kicad-doc'
pkgname=kicad-doc
-version=5.1.8
+version=5.1.9
revision=1
short_desc="KiCad documentation"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later, CC-BY-3.0"
homepage="http://kicad-pcb.org"
distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz"
-checksum=f2d96bae9bb44c089b155ee61bb589d51373647cdfdf28b5f931756e369bdf14
+checksum=61571f260bba67e26b9f7456ad6eb5da7c3b406412f506e7857d0ca70ca66393
do_install() {
vmkdir usr/
From 64c2ce6611d68d6dcb888445ca413ff559c063e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:05:46 -0300
Subject: [PATCH 191/634] kicad-footprints: update to 5.1.9.
---
srcpkgs/kicad-footprints/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template
index e082ad14a42..e5bc62c420c 100644
--- a/srcpkgs/kicad-footprints/template
+++ b/srcpkgs/kicad-footprints/template
@@ -1,6 +1,6 @@
# Template file for 'kicad-footprints'
pkgname=kicad-footprints
-version=5.1.8
+version=5.1.9
revision=1
build_style=cmake
depends="kicad"
@@ -9,7 +9,7 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="CC-BY-SA-4.0"
homepage="http://kicad-pcb.org"
distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=31c3676d71139259f1cc67b3a0254ec8a8659d35f2c51a273f5de542c651a819
+checksum=415e014364d1c12584f115a4adfeec1b71e41e2cd7f4ae543237ee71b8ef41bd
post_install() {
# otherwise KiCad will complain about a missing library when launched
From bcce0881a6a744ec6db8f818a17c28afc82b9e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:01 -0300
Subject: [PATCH 192/634] kicad-packages3D: update to 5.1.9.
---
srcpkgs/kicad-packages3D/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kicad-packages3D/template b/srcpkgs/kicad-packages3D/template
index 41e1d13f6ee..93b9241577a 100644
--- a/srcpkgs/kicad-packages3D/template
+++ b/srcpkgs/kicad-packages3D/template
@@ -1,6 +1,6 @@
# Template file for 'kicad-packages3D'
pkgname=kicad-packages3D
-version=5.1.8
+version=5.1.9
revision=1
build_style=cmake
depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="CC-BY-SA-4.0"
homepage="http://kicad-pcb.org"
distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=faf3ddf4036a6084618c1d90254b554f845693549afb2c483291133dca27ee3a
+checksum=efce7b0b65ece76b57002cd4b84152fb359f7c47fe0b3d71166e9255ffa5c5b0
From a8dcfffd7a3e71bae7becfe6bb4b93c15bb81e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:18 -0300
Subject: [PATCH 193/634] kicad-templates: update to 5.1.9.
---
srcpkgs/kicad-templates/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kicad-templates/template b/srcpkgs/kicad-templates/template
index 48d8ffda2eb..9cc44f0c139 100644
--- a/srcpkgs/kicad-templates/template
+++ b/srcpkgs/kicad-templates/template
@@ -1,6 +1,6 @@
# Template file for 'kicad-templates'
pkgname=kicad-templates
-version=5.1.8
+version=5.1.9
revision=1
build_style=cmake
depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="CC-BY-SA-4.0"
homepage="http://kicad-pcb.org"
distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=1afc8196f47d053937c2db9ee7f09b0d812e1ba93e57a0610ab1ced21c9134ca
+checksum=0c1bf3d2e6d8d1056a5da6c1f7a173551c154b4bdaddb86b6a34155b18e65da6
From a1d79d05851f060cf8d3a511eb6c2f11915bff60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:28 -0300
Subject: [PATCH 194/634] kicad-symbols: update to 5.1.9.
---
srcpkgs/kicad-symbols/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kicad-symbols/template b/srcpkgs/kicad-symbols/template
index 73c1c529bc2..9c699f97ff6 100644
--- a/srcpkgs/kicad-symbols/template
+++ b/srcpkgs/kicad-symbols/template
@@ -1,6 +1,6 @@
# Template file for 'kicad-symbols'
pkgname=kicad-symbols
-version=5.1.8
+version=5.1.9
revision=1
build_style=cmake
depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="CC-BY-SA-4.0"
homepage="http://kicad-pcb.org"
distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=a5ca226afbabdd1822c4a18e63a2943cd2913df11e8e50530768fbdd7997ba54
+checksum=cdb033cc755cc66a087b44fff1d2b77bf2dd44311a02c81a516b8ca1fbd242a7
From 860143ad86bbf454cdbc5103c343819fcefedec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:37 -0300
Subject: [PATCH 195/634] kicad-library: update to 5.1.9.
---
srcpkgs/kicad-library/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad-library/template b/srcpkgs/kicad-library/template
index c61f146fc2f..1ebed610fa0 100644
--- a/srcpkgs/kicad-library/template
+++ b/srcpkgs/kicad-library/template
@@ -1,6 +1,6 @@
# Template file for 'kicad-library'
pkgname=kicad-library
-version=5.1.8
+version=5.1.9
revision=1
build_style=meta
depends="kicad-footprints>=${version} kicad-packages3D>=${version}
From cc3caf5b24bdff033ac257156f71d0781195d897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:51 -0300
Subject: [PATCH 196/634] kicad-i18n: update to 5.1.9.
---
srcpkgs/kicad-i18n/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template
index 6fd55602335..46f6e9c5c79 100644
--- a/srcpkgs/kicad-i18n/template
+++ b/srcpkgs/kicad-i18n/template
@@ -1,8 +1,8 @@
# Template file for 'kicad-i18n'
pkgname=kicad-i18n
-version=5.1.8
+version=5.1.9
revision=1
-_commit=78adcd19e7ed53f4889d6db65a33dd8ec2d323e9
+_commit=04f3231f60d55400cb81564b2cd465a57d5192d5
wrksrc="${pkgname}-${version}-${_commit}"
build_style=cmake
hostmakedepends="gettext"
@@ -12,4 +12,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="CC-BY-SA-4.0"
homepage="http://kicad-pcb.org"
distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=807eeceaa5688ca800fe01464b466755e7b9e3243cb0a776e2ea5ea1f963967b
+checksum=edd1ff381fc767c48270395b49156891c626eb7760768b4b082cd575b4038cce
From cc2af4e32d9d911a641936871eff978cbaac27f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 12:06:59 -0300
Subject: [PATCH 197/634] kicad: update to 5.1.9.
---
srcpkgs/kicad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index f11077d93bb..22e74879754 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,6 +1,6 @@
# Template file for 'kicad'
pkgname=kicad
-version=5.1.8
+version=5.1.9
revision=1
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
@@ -19,7 +19,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="http://kicad-pcb.org"
distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
-checksum=bf24f8ef427b4a989479b8e4af0b8ae5c54766755f12748e2e88a922c5344ca4
+checksum=841be864b9dc5c761193c3ee9cbdbed6729952d7b38451aa8e1977bdfdb6081b
python_version=3
build_options="spice occt"
From 32b3364b3118cd14fd200aae8db4785a211456b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 26 Jan 2021 21:28:51 +0100
Subject: [PATCH 198/634] mame: update to 0.228
---
srcpkgs/mame/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index 4e52dae71b9..cd6dbb58ed7 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -1,6 +1,6 @@
# Template file for 'mame'
pkgname=mame
-version=0227
+version=0228
revision=1
wrksrc="mame-mame${version}"
hostmakedepends="pkg-config python3 qt5-host-tools tar xz which"
@@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="http://mamedev.org"
distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
-checksum=95dbce00a4f05a35f66ef966fe9efad1e4e78ce62e0eba3f7031dfa6737829a5
+checksum=1d8e6f20491492f8b15892ff958f9b067c48eb90cc2fc974b08bde297e657244
nodebug=yes
replaces="sdlmame>=0 sdlmess>=0"
From 63513a6d36dd91dd49435b747c80340bef2e936d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 27 Jan 2021 01:32:27 +0100
Subject: [PATCH 199/634] firefox-esr: update to 78.7.0
---
srcpkgs/firefox-esr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index b2670ec4c78..51ea21fb920 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
#
pkgname=firefox-esr
-version=78.6.1
+version=78.7.0
revision=1
wrksrc="firefox-${version}"
build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/organizations/"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=0d07b74cb66b94018e3d7f11531f95c76a955e0016a3c401241d0d85062ae7ce
+checksum=1aa041db28cd742e93d663a9da8defd33040b38d8b9470350538473251621643
lib32disabled=yes
conflicts="firefox>=0"
From 6e13bfa6a4d42276eaf802f60b203272d1785ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 27 Jan 2021 01:37:54 +0100
Subject: [PATCH 200/634] firefox-esr-i18n: update to 78.7.0
---
srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
1 file changed, 94 insertions(+), 94 deletions(-)
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 36c781fe3d2..3a5f568b6eb 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-esr-i18n'
pkgname=firefox-esr-i18n
-version=78.6.1
+version=78.7.0
revision=1
build_style=meta
short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
}
}
-checksum="a633f63ff5d676d465ca5ba956f04e962fb0d4107d2ee9a02d90e230065bba56
- e36fe673d65a64b33904970f970a05aaa82d9e47986fd5189d9b61fde9583e64
- 381003ca95867ce2c5fc23d5dded8b6496fc62564a1e49ba13a132e2e423662b
- 61ad12d1f0c0d9ff7680e1516788b32db7c834204a28a16775abb9dd56da28b9
- 8d5f79749c1851d32664343e92f0a39499962303b243e72c38f591f9538b2b8f
- 1a3ee5c4482ef9bd2d36f405c48de92bf2eab7d6ae4cb75b61121faf5ffc99dc
- a2644033b6129aea582de8b71a6fc168fd71550841aaf58349872e83dbcd71c1
- c706077dcc397924d79c869ada2437fda15e013953bd6755de2105825448f6c4
- e52b5342e68496b72f56abd6e7e856bc50f21fc0516e44ae9d8bcbf9a60d203e
- 4374938c61a4e0379b332ed24f3d9244f13c0e28d55143a2b846b6e4935a1c24
- 95f7d3c0d1c220aa9abdcda3460caf6868e0318620e4e35d97d707d7b0117ab0
- 6d315dfce61f1143cb89e32c9b47fabaf58e18cb93c49085504950bc2cfae5a0
- b563395548b0c8c438f318d366bdbc264e9118b09206070625dfc03958ee2d9c
- a36fd78b3baa4ab96dba2058db293dc8956b96cfef2fa2c0bdba60c348bc67e7
- 4b36605ab7cc9190d372b028ffc7b3ca56252893d9481f3ff869f2c42474b0b2
- d36df1747bf91e61cc19ed2396d02430f887a1ccae4c3631175b50c3caef880f
- 0484c7f7062a2dde94f02c09138dd3c9af01a3e379f14b6c401d44a96ed541aa
- 1247b69fa7a26f026ae16bc87e307201df85ffc875bfb019d4251e158d197fed
- 981b82c331df5ea81f42116d299b91bd2fc279f3fa85242b13ea120ebc401f37
- 0ae72aa1beb2ced286c966ead603afc18f2db3c25cc6f9152755b1ed629c3467
- d4501c7f0fc09aaf3a099f902966d539bed62a10cde69b80c3d0792d800f795a
- 0d5816c2e5954c87c8c0d073332ca29d034f719864268ac0e2d01b08c7b74f68
- 38ec953a80215e6e2d7623a8d1e8adefa5039f64ae708c57e23d9fe2f94e904e
- 0dae0cf9422f75e0cd4b105fa423d7074ee6285b99afba7e76bf0b440996710a
- 75a14ded5448e539636f569930e7d17d67646c151645e944c18c39e0593fb551
- c5523e887848da0856d50be613501d9d038e31094bb0f9a3d7e2592fcf05ab14
- bf58395da0f409962148b1777f1c8aa26721c204fad1589b1492bc0e35cfae62
- 91b473495a5c82589465cf0cf0e84faa9e5ba9a7e9e033c457bf9da5c9c08986
- fc064c6b177eb293f4b4dc1ab40e236a72be8a44d5f383422e2a42d925606053
- 43d0e461b2fb6576e285658bebcb41a4585502b3e403ad60b562eae6affb7766
- 63d811853765803cb64b95eded3a0de7b867186882efe3e9f925ffd4d7bb940f
- fa093681acdcf7f45216e49b5882ace38e653182d61ca9159a9dd7bc2c59a57c
- 216db3820478c951f4594c03dcfee5480a0efdfbe5838acc4e73affcb17df31a
- 0f7a116b3516ba31fd804a1311276fa5c644e1f398f636bd48bfc1ce72661e5b
- 1266fe9ef4d0dfe24b199d7844300d5fb5321d7bb7225f7c902b415023911bcb
- b0a1d851050e941fe28f967443b8d7287dab3ecc3303ec7f761ffec4cc10ef47
- 7df9c803e9edd0e4980706fb5e6c2422919fde6da3d10866297704e2e86d986f
- 02c7a7956783a2395171353ba5fc45dc5296b876ea7af35be755f8666b38abd9
- 650c8c94aea499ebaf6875691dcc0fe1f7535e35a409d65d7ab6e7052d63cdd9
- 103603c61cc5d0734a7eeea8326a463cf5cf9c6b8f7d431441d442ea9344b354
- 3cd7767ebc5a218843fe2914ac026956addc60f82693fc43e60af1fe8abccbbe
- a2a195c07ba2fce554d3997542da1c8c6cf45d49d326373508537005e5b31f7c
- c39f0318614f2ee222964e4fd3768f772eb7348f17f9c21e4adfd66439551be7
- 65416f6af10605a388251ce3add878c95ac1a1e6e925c087144608e3c95690e2
- 7d590d53d6244384a2a7d3776bd5c7ab5e37a3b2edabcca5d6448ed7cc56cd62
- d0708cb5ee33a9ed981ee3a4e855d78ad54a2ab23e0b5bb82fc4287224fb3a04
- cb4b1a89b03c39e332544099f1868703c61cbfb522372c6a6ab3ff893b7ea0fa
- a38e2a11f7696217d9c105b62b335dbd5b5ef3193804cecd2afcaf6a089dda03
- a2b8989050b3c36bca76b8ac169e212d4ec19f487db8d908b1792ce8de8d4bcb
- ffac3cc7a1eafdcee369d3a88aba6bf3116da37cd636084c8b0be50839c09cc3
- 56d99171547a442c55ad25c6252244d964a7c2db4717ece4659ae9f6e515e085
- 12e547ce451cfaaa1919748e206726a65434dba8f871f79f575c3c73b53493dc
- aefc3626f4e4fe33074b8a08687b18b2ecf113d389712da5d73ae4957b7a00ae
- 35b244f8be1e0c573cad64abf7da006bfd7a854aabb645fd35dbaf86316965fb
- e550338dc4599958f32e07e3c034d836ced197e962dbc6311122eec1d2c0d81c
- bbc3841e98942c828ad53ddb514cd86abb2a394f22407364b702777c828d330b
- 4822eb9cc0cd4cc42ae8d4029f784a7b9c3a62a0d5dee5b8b020f1728254070a
- 3354806c46e6bc3cc62fb05cd33ef481b09ee96a053c569a66dab28eb30d7d10
- b3994f37b027aee6171a089c88b10bc0dd56e10f9844ab710d2821fcc9197edb
- b44c4deea5e29f6cb8be705ab06de7527bd5fa9312b7d9322e219c834d310102
- 6396200e5d3e55cd942a1238630b82fb65e0575bd2d76d645e99862d91813102
- 4b6f6477a89a192fda19e2c5a1d52194e9350d70f60836b8411af9958d23e90f
- 61e0efbf0218bb4dde676218adaad46aa0f8f1b89429dbfe1b93646035f6efdf
- fe222029c0e2a175a8950bb0c3335c2a277eb87db528c67347f87ba05f78a8b6
- 30e64b32873e24b79f94b73ae2c404ecdade3426f3a89d894c5096dc417db332
- 229a275ba9547322bd0183b3b0d16f4ce7c992461f5378512dc865080b2cf990
- 9392b96907c50749ed460bd0570bcdf085cdc22c63119b0a3570b4eb5be4441b
- 70b436cf4c6ebdf02e6ba5fc84dfaee35477bb6085cf010283dcae9760f4b46f
- 9ed7ea612383205971a2ca0fb573daf4530abb4134d968b72d96e8530c1edcb6
- 5b24f85474d578f578ea505b3fc6c326181fbb6e52744895700d66c5507d94d1
- 49590b2c0422f35a465fdcff13df2661137817758a648f4f0fa9ba0da33d3d1d
- 030cd2d86671c8a2009a4512b15cbb5bbf08b69d6b1e7937cd483b1ecbeab43a
- e4d798752e4263d6f486cb7339d5963eb60c9908e6f2835af637275c15e35412
- 46731b30a6cb27805f7e8167e66b1dadde77a39ffdafebc03f11300e2fb10667
- 76f1fbe98c36f2486dd15a1f15e0da9f012d2254860eacce2bdab160b1744db1
- 7ec19b9293c3954e9e3326ed74297b46627ac5f5eb4056c66c724b6fdec260f0
- db1ff15a26fdde55e626bdb49af86dc8d6f0b070b763d13c10d855d45edf924a
- 55bf8c6ade4797dd39301244e8c1afa0c37c677373bc760edbffee26a8b3fcf2
- f4e93da0fe15ba7687687991b8d00f5c9deabe37b6528ae5524682c5a7b91ecd
- 57677bf4805c6de175eef204874f8fec55b7ff9f52d1f2b785e2b943e8cc5b60
- 9fd5979c24743b52946eb5ee57894b4e3bb175f9e537527cfab4ed7942753423
- 46b9917fb197b9d0e3a2dd53630aa1aeb2f0a163cce7cd0177bc3a050a552aca
- 78a73aeb7ff1446e711efa44cf786e02f2d7c3a5217f14081ebf952748b4593b
- 55549f13d07fd904190956146372c4fd6a0a3f96f7729f8cb96c20a7598b8b93
- a79aea11e5a2fff37d0074ef2a1a947f1fe45c3228af25fc7030aad56017050b
- a5237e51a1f712755778267fe30c51dfaf476b8031e4192d0ed3319495abdfe1
- b466f0c29278ed5a02d36d87d77476dd3879af620cb98edb3f3760732e6e3ff1
- 4b9252648f34c232a5bf65363fcad8682f123ce98f8c5b317df5b1a97497a814
- e1b4daa5988928808bfe581cdebc78a62170214be7ed7c1c38ed5e083c6acff5
- 63780cc2d60299e2187709639c6f7a7194526668289a448aeb2eb1754b12d2f5
- 9b0701a0be10f6480f54332a8312d271266f3097d582ca88483365bfb931e2d1
- 76dd82fb3c1e32ef21255cb635026443ae508ae8f5ed4a8bd22337d16acd9333
- 0b64873a216da58695bc285607f992140b5172f8e3abb6f71864ad9aa3e97980"
+checksum="e0680e2bf60e550998b86ecd04d34f8b4e76e3bb356d2061231af690c9a3c2e6
+ 70dddb39c8cf269b1975e4828204275dcb0b8e8c579f3fe572cf912680b3be94
+ d27d6525afc388fe2bb4a24ca635c6b361534c2d6510e40b01144c74025e5355
+ c8f3dd4ce919435317dd506ad532d84c27f58e2208b443586ce9b7b97ad1c333
+ 07f0a5bca9361af2cdbd6564ae3aabea1ffd7682dd4253b456294a7aaa2c4fd0
+ be86979f9dc828b700ce05dd312bb02cab482ad389a0103d6aa4baa24b19bc14
+ 9498b1fffa6bffd98ca29e2a7fbf71291a023746d35275596d3d0819c00c74ff
+ 96be0d5fa322388a0b8d9e6b2633c03cc654cb18ae37f80fc675537d87b11c89
+ af7042ae5777c5b634c8ca044d0b9d3188ae22f386b769e8c0e920290fd5704d
+ be6380eccbe91b3aec03fcb5c46278ec87f61d8c7e9677f2ef47f983c44d0cfb
+ bf840c2319ea9881148af9f20dd2ac83d57cd9e685d40b76dae3c239292f74b6
+ ccec321436bd37f548807d5b454819a772bf53222c0318d0609572b2360202aa
+ 2ab653f9a863ed9da46da4a4618681ed231ef58ca069f2e076786b95db3c6f14
+ 2298d3af606f4a1a516e903d5cb3fdb47110e385d5bd2aed6faa85a89b60164d
+ 1f3c877cb4e1d6685bd3602579287e2d93bfdc49c3d3dd56ab9c12c1892c1551
+ 4f2fc2a2a4e0b2d1197119b8bac77d19fbb3ee745b114e8b62e0f6d325dff5f3
+ cebcb5b8c6f8d5bdd5aabac064fff4f70cc8047662ee2ea6dc892c1a843165fb
+ 799c7931302a33a2f61be7a43f2619729ad7702fc3530c293944637f18daa739
+ 6137f868d7023af0166935591ff8c33f910f08be0b4c9bb631fc12ceb7965587
+ 7525673f9cd4db238dbb3c478edde1089e4d45d1939a13b135a44679c2cdf2e8
+ b804d47f398dee126352f81b83baa40d8936c062cc40705b70bdb16dbf646958
+ b1bd30e53070b9ad7d3c4ce392da4f9fcc800069f6c064ab4e2b6eb70a081952
+ 7248db932ca9beccc23c8c179e0adc0f4b2a280cb3a62d6b0bb91941772471fc
+ 7816adfbdedc2a0ebb90ed54823dd3320ae4f4ee200c00105249b37bbf3b552e
+ 9e0fe5d6790a3283642404f29bebb06e8f6368a1b4ec35a55c2baa585f4fafe3
+ bfd19f18c78f91aaacd6a77b526845ae7e43c24c55149fce39c03ef8da63121d
+ 0e10a7ea0f3ff9a2d83490b500c383b8c483d0a22885a5174e415f2e632ddb43
+ 3ae8d77fa6baebc128b7eadc85e59a45a194cc782a03365af0054ef7b6c131ef
+ b3a0335e35c60cd867948f1f25ceba5ede118966d585a8b272d6976ae018c96e
+ 0fb538b79ac396be79b123aec8591e2604090f12e7ce7a1d2a439152be015fb7
+ 3e4b4d7bf8227ff768063b3ec5622b6ab3d3a23249c4a03dfa096026a5cd5d10
+ d251feda253e695c77b93860a2ab00f3e99fa90e0b05756ae771ca6156b344e8
+ ce4d7e9c3ffab3122ec116b3e0ea18e0d5e8c23d2c121d1507180477e76bb80c
+ 479d7bda7991b87a287a00e985c538d2055f2cf22e6cc7121aae1fd4cf1e9757
+ 21e8ffe1a6919962bf286385b54e1859e23eb337c0cb4fbf310d722feca54e3f
+ 548009e17942238de9a2f69bcb226d32dded300e901a19026602d1141126fb85
+ 9af6ee2975ac7a1c2f4b3c1bd63a9f1fb4d6db04131aafbb9dca4f497df8677b
+ 360e655189f1404655989623bef3fdb6da33846a779f2196b1cb80ce3799ff63
+ 7bf793bdd0322c9a871a564d7a7e3eecb36401b4c98a2c417f7ba11f4d9d8ed1
+ 26cce49dd6bdee1490a1cc62210c91e32c875494c473e937c96999b119614b89
+ e2b20759682a9dabf22e8b7f52840dd603af7aef7dbe46d5c66c76c80d664958
+ 7d2b6baa832d5f3ef03849ba5f5d79be513869cdb7a06a3052f30b9858d72fe4
+ 6f2a3129858f2c439a4f19507215cc54406b65edad25a0f78bc3568583b2fcc8
+ 929e84780fb4907525511547a40497413b0ea5ec591a013c4d675822580939b4
+ 1b1eae14a4a5b9d88866a5a9c03d3ed4b87c6189c0f6fd33027fe94b1879f3e7
+ 4b44b4cc69718604a866fd16295e814a38e49012a7da423b3e24308f49c99eee
+ e050321ef8fe64ee6073c63461bccc95a3adb27533c9a70c84d290f9e67ce1c2
+ f867d5579ff631ccb08d40dd0ebc94f202a205cfc77b381b88527fd113af851b
+ 849fc82129c125b41aae2cebcb6dad070cf156eb491662f9fc3aae3a8450a4b5
+ 6e4b51223d2c0ecdf792d5728ec893afa6e5588d6be024e49d18233202918f25
+ e38865f03a27fa6754c1e16d7519f6378676f8da3ea6c96833820d74b2babb89
+ 21d19019d90eec96728c50eebc0d1c3a8fa39481e999dc56bb01cee9d05816c1
+ ab9e68d5497f7d1505a58842530f3e24e292247dfd01d694ddc6de22b5ed4e1f
+ 149ad1fafc2e44f232521473df66198c0e70be03f5bfc6db2502174090ac986a
+ cc7bee0d016416207e97e006d7f84e5e680e914cabaffa4f6d36ca68ca8e9168
+ a22606075c78c814dcfcf5fa85514fcd026a9b71519138d74c9012a47a6c6e30
+ bf99363e1849bf0ce4107639fee3b2b3eec4eccf21e24082c9c565f03d3899d3
+ e4e003a2552434c5489865aa666e664c71342b7d842b33d8b650ed841bcd49c8
+ 2f076598229ad82565ecae1458321c8497128aa8ac409c305f21281b90a3d46d
+ d460168e536e0560fb8444b2e79cc2f30f80699942cc40c8e93f93c8c9e3607a
+ b189e3d4d90e2d3a7d85a0a9381a3efe9fc7bdb3e8ca074ad1bd2d9b0c06220a
+ 249f5ffa15a2373c034b6c2c38377d6ef61cf063c1b906a3becb38f38167ac8e
+ 646c87f5918a6c261ec883aa589f42b00831d8d9b827e17b2a50fdf1237c0cec
+ fa49ea2518c0d49ecac0881d480a6ec991bf4a5e74c7f049061d51b07ccfca34
+ c824290dd4715abcae813491b974ce7a306eb2a07ba495a6925ec8b9a11953a8
+ d3ccb2b9c1ec7ba46dbd2118bd6fcf442d6b28927a4821ed0b503b5ec7a0b024
+ d280632c05436c3639b607cbaab0b268e7f03f7090ee86c5fb3fa72bb385db95
+ 922a937523f222b87d8ee30b74b5dbaa7e895989e4c0ea4e293e64751178e564
+ 90caad4cff7db7838673aa7ba6635de68937c5146cf955b6686be924115d2d5d
+ 3613227480ae4ae19a00673d9cd50014b9c42ae0f24c241b111693d03e49e92e
+ ff399f50ab7f52b9899c4e33da944ba8649fbff1b8a6e317a912a130bec7ce90
+ c21864cf17d6d8b6d8ead7d221eb19ff1d51842ddaecc961116c1e4c69426301
+ ef1e3a66f66cf5850f060dc02607de6d35ab27a7aa5512bf87a03a0492e8a0f1
+ cd1a549f293eadf20460f71d31182081e37aa7971073c68b27615937d7dde78a
+ 53751982192bff3bb6927f954f7307ae42ff0a592298f4c7d67a687372307d17
+ 35e0409118384857a4f6e0576362e01046c7b871c40a71dde4ee47c41305fc7e
+ f4c1dc455166d1eee3199215b4b521a5d33156ea6c5607eaf25a16cfbb2157b4
+ 9299724da6721b598508e4b4b3e612155175bde60c276ec83b8765ea67d96132
+ a61ccbb3eed3089a3ee5233333f2501d4fe226573828b6fb3fa314e1df0ba972
+ 00357932c13c8004c9766ad5eba0044d99ea2127971800ebc0ebeabb389b0bad
+ b1e699ccbb0b12d5bae96f1353c81635ce5bac471505a8407a2af1aa1e7313e7
+ 20d9500429a5b9b2f6341b8d1af95bfba8ec9e16757bf4cbf75dc71a0571da79
+ fb1293643e647f947a669a113d179cadbb8fdd3e563a08f569f8ed35ee3bd94b
+ 1b810baec4acfa15bf8af63dded213d6ba5048eec11dd721e08b7e936616cb70
+ bfa27acd239c7978e7fb8555e4ed6de6d65701ce4ca2abcfd7e4358ec3bba3ca
+ e4a806b55579cd7f6a1de04c601644af122cad80a1777314d2d13305fd48b162
+ 2c919b76de1ec61a36905d0c5ffebf21bfed8bea177f917a9412ff6e8ff99d72
+ 0817006cf0288f31e1fd496f9a33f42dd63de368727a70a8a0e6d7ff7bdd48ac
+ 6f54c41fe252a9ddbe245e525c96804636ab03598caf014b75f6d482a752210b
+ ae0916d2154ee8231330f05fb848bf041190c9453be130e39164192a57ea0c69
+ 8c0045761f74fff9b012785913d9b38f0b829f969d7770fbb04a6b01fec05d44
+ 6e79fbbf5bf4d8444302c626b05b57b5b25726d1a890b3c5bf43d425a3ba51e2
+ 61288b7808de9ce97a4750569362ff918d6c4476fcf620ec742b2270a9327d1a"
From 6f62e2bf5c138e6d2682e622a246b421e1283c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 17:33:09 -0300
Subject: [PATCH 201/634] mdocml: fix behavior when localized man pages are
present.
Using the -a option with makewhatis(8) makes it scan every file under
the configured manpaths, instead of only the ones in directories that
match "man*". When localized man pages are present, this makes it so
files under the "$some_lang/man*" directories are also indexed, which
can lead, as shown in #28146, to `man w3m` displaying a localized man
page instead of the default english one from /usr/share/man/man1/w3m.1.
Without a mandoc.db in the manpath, man(1) behaves predictably, and
removing from -a from the makewhatis(8) invocations makes it behave
predictably even with a mandoc.db available.
Users who wish to use localized man pages are expected to configure
manpaths in man.conf(5) or use the MANPATH env var.
Fixes #28146
---
srcpkgs/mdocml/INSTALL | 2 +-
srcpkgs/mdocml/files/makewhatis.cron.daily | 3 +--
srcpkgs/mdocml/template | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mdocml/INSTALL b/srcpkgs/mdocml/INSTALL
index 36be63101b7..7aa787b70f0 100644
--- a/srcpkgs/mdocml/INSTALL
+++ b/srcpkgs/mdocml/INSTALL
@@ -1,6 +1,6 @@
case "$ACTION" in
post)
echo "Regenerating man db..."
- usr/bin/makewhatis -a -Tutf8
+ usr/bin/makewhatis -Tutf8
;;
esac
diff --git a/srcpkgs/mdocml/files/makewhatis.cron.daily b/srcpkgs/mdocml/files/makewhatis.cron.daily
index ee334fa94f4..efe892e39fe 100755
--- a/srcpkgs/mdocml/files/makewhatis.cron.daily
+++ b/srcpkgs/mdocml/files/makewhatis.cron.daily
@@ -1,3 +1,2 @@
#!/bin/sh
-makewhatis -a -Tutf8
-exit $?
+exec makewhatis -Tutf8
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index d5759e2aefe..366c1f9180f 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
# Template file for 'mdocml'
pkgname=mdocml
version=1.14.5
-revision=6
+revision=7
wrksrc="mandoc-${version}"
build_style=configure
make_build_args="all man.cgi"
From e6aaff8eedd9020d489532f7ed18c7f6b30c687a Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:37:18 +0100
Subject: [PATCH 202/634] gnome-desktop: update to 3.38.3.
---
srcpkgs/gnome-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 86c1d11e182..1d225d66abf 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=3.38.1
+version=3.38.3
revision=1
build_style=meson
build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=17903513fed60814e967512dd892751cb6a1d2716136232884bc65bd53cc3be0
+checksum=bfe00257b2bb59fff04ac1c144804084d1c253e66f9d7408f6060bbf7ad1d831
build_options="gir"
build_options_default="gir"
From 5f9138d776ba87f91d65ab9bbc33da1c60c1ab52 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:40:33 +0100
Subject: [PATCH 203/634] mutter: update to 3.38.3.
---
.../patches/dont-pull-generated-headers.patch | 49 -------------------
srcpkgs/mutter/template | 26 ++++++----
2 files changed, 17 insertions(+), 58 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/dont-pull-generated-headers.patch
diff --git a/srcpkgs/mutter/patches/dont-pull-generated-headers.patch b/srcpkgs/mutter/patches/dont-pull-generated-headers.patch
deleted file mode 100644
index a75365a6324..00000000000
--- a/srcpkgs/mutter/patches/dont-pull-generated-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ff379fb93ae2539bf9fae70ccc8e0351e5665fb0 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 5 Oct 2020 12:13:07 +0200
-Subject: [PATCH] backend: Don't pull generated headers (indirectly)
-
-Use a typedef for MetaRemoteDesktop, so tests poking MetaBackend don't
-indirectly depend upon generated headers. This is arguably a code fix
-for a build system bug.
-
-https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1470
-
-Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1449
-(or something...)
----
- src/backends/meta-backend-private.h | 4 ----
- src/backends/meta-backend-types.h | 4 ++++
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git src/backends/meta-backend-private.h src/backends/meta-backend-private.h
-index 6d7d3ad758..5f4981fda5 100644
---- src/backends/meta-backend-private.h
-+++ src/backends/meta-backend-private.h
-@@ -42,10 +42,6 @@
- #include "backends/meta-settings-private.h"
- #include "core/util-private.h"
-
--#ifdef HAVE_REMOTE_DESKTOP
--#include "backends/meta-remote-desktop.h"
--#endif
--
- #define DEFAULT_XKB_RULES_FILE "evdev"
- #define DEFAULT_XKB_MODEL "pc105+inet"
-
-diff --git src/backends/meta-backend-types.h src/backends/meta-backend-types.h
-index 4753c07440..146a8c3d7c 100644
---- src/backends/meta-backend-types.h
-+++ src/backends/meta-backend-types.h
-@@ -59,4 +59,8 @@ typedef struct _MetaScreenCastStream MetaScreenCastStream;
-
- typedef struct _MetaWaylandCompositor MetaWaylandCompositor;
-
-+#ifdef HAVE_REMOTE_DESKTOP
-+typedef struct _MetaRemoteDesktop MetaRemoteDesktop;
-+#endif
-+
- #endif /* META_BACKEND_TYPE_H */
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 80bfe109da6..70df3b8cf4b 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,13 +1,14 @@
# Template file for 'mutter'
pkgname=mutter
-version=3.38.1
+version=3.38.3
revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
-Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland
-Dxwayland_initfd=disabled"
-hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server"
+hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
+ xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
@@ -18,22 +19,29 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33
+checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
-case "$XBPS_MACHINE" in i686*)
- pre_build() {
- ninja ${makejobs} -C build src/meta-dbus-display-config.h
- }
-;;
-esac
+# Upstream keeps pulling generated headers even though it can cause race
+# conditions in meson/ninja
+pre_build() {
+ ninja ${makejobs} -C build src/meta-dbus-display-config.h
+}
# needs X
do_check() {
:
}
+post_install() {
+ # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
+ # meant to be called with 'pkg-config --variable'
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
+ -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+}
+
mutter-devel_package() {
depends="gtk+3-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
From ab0f43a69855ed8b17026581a6e3e4ddb599a65e Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:41:23 +0100
Subject: [PATCH 204/634] gnome-shell: update to 3.38.3.
---
srcpkgs/gnome-shell/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 6753b6ac54e..448ad932381 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=3.38.1
+version=3.38.3
revision=1
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false"
hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
- asciidoc perl glib-devel mutter-devel gettext gjs-devel"
-makedepends="at-spi2-atk caribou-devel evolution-data-server-devel folks-devel
+ asciidoc perl glib-devel gettext gjs-devel"
+makedepends="at-spi2-atk evolution-data-server-devel folks-devel
gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-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
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"
+depends="elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell"
changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-30/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b789e3296463c4cbfa329ad1724df38439c3e6d7537a01025cd8f2fec8c90bb4
+checksum=5345b418cb12a972955ce5cceaed6662480027336b5c51daea5730575b621ced
# needs X
do_check() {
From 5ff63fe090be75e0efb5346b4b821e87131f77bf Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:43:13 +0100
Subject: [PATCH 205/634] gnome-control-center: update to 3.38.3.
---
srcpkgs/gnome-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index ad35007c4b2..a7ccbdbcfb9 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.2
+version=3.38.3
revision=2
build_style=meson
build_helper="gir"
@@ -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=1500e0ec0dbbb3f0b9289d084d6987b9430fe444872adbea5ca7fe0cd5f8476c
+checksum=3b4a4b18ba91803dce133f443f9d1d1f5a1b6c26b7727876e0a699349f5696e3
build_options="cheese"
build_options_default="cheese"
From 4645d3b0f5a417bef74ba0347e55988b6557bb6c Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Tue, 26 Jan 2021 11:23:48 +0100
Subject: [PATCH 206/634] gnome-core: remove caribou dependency.
---
srcpkgs/gnome-core/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 4aab60c6b74..075bd15cdd3 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=3.38.0
-revision=2
+revision=3
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="q66 <daniel@octaforge.org>"
@@ -13,7 +13,6 @@ depends="
at-spi2-core>=2.38.0
at-spi2-atk>=2.38.0
cantarell-fonts>=0.201
- caribou>=0.4.21
dconf>=0.36.0
evolution-data-server>=3.38.0
folks>=0.14.0
From f4352a8baeea362d57ab5a58163c1ed7b3afb264 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:42:16 +0100
Subject: [PATCH 207/634] gnome-shell-extensions: update to 3.38.2.
---
srcpkgs/gnome-shell-extensions/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 14c3c8a4466..4ea74032665 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=3.38.1
+version=3.38.2
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9da38631ffb804284753e5d592f88b7953215cb8967d7a1c4f652d289f040c94
+checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
From 6a1457fb7ef56ed5965cfff234d9c176baf7ecdf Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Sun, 24 Jan 2021 01:44:56 +0100
Subject: [PATCH 208/634] gdm: update to 3.38.2.1.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 60d528dac13..6ef190e057c 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=3.38.0
+version=3.38.2.1
revision=2
build_helper="gir"
build_style=meson
@@ -21,8 +21,8 @@ short_desc="GNOME Display Manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=46d4415c39c94ccee81fbac21102e2ebcd284d39858c893e759900b1e88435ba
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
conf_files="
/etc/gdm/custom.conf
From 7f6082135bf93a3a9df13f94fd88a84cf9211c64 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 00:29:52 -0500
Subject: [PATCH 209/634] rust: rust-std should not depend on itself
---
srcpkgs/rust/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 6bb928e1478..4d25635d409 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -354,6 +354,7 @@ rust-doc_package() {
rust-std_package() {
short_desc+=" - standard library"
+ depends=""
pkg_install() {
vmove usr/lib/rustlib
}
From 24e67ac81523b051d36af7d4ccb08aa85d3a6fe4 Mon Sep 17 00:00:00 2001
From: Enfau Kerus <kerus@enfa.uk>
Date: Wed, 27 Jan 2021 15:44:28 +0800
Subject: [PATCH 210/634] common/shlibs: add missing rtaudio libs
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 1226e31c189..92979332fb1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3043,6 +3043,7 @@ libPocoEncodings.so.64 poco-1.9.4_1
libPocoNetSSL.so.64 poco-1.9.4_1
libPocoCrypto.so.64 poco-1.9.4_1
libopenblas.so.0 openblas-0.2.19_1
+librtaudio.so.6 rtaudio-5.1.0_1
librtmidi.so.5 rtmidi-4.0.0_1
libbiblesync.so.2.1.0 biblesync-2.1.0_1
libbac-9.4.2.so bacula-common-9.4.2_1
From e9da7455216f4f70dd69ddad54537108e3e4ef77 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Jan 2021 12:58:18 +0100
Subject: [PATCH 211/634] linux5.10: update to 5.10.11.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index f7dd7929610..e5930f6f0bb 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.10
+version=5.10.11
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=60ed866fa951522a5255ea37ec3ac2006d3f3427d4783a13ef478464f37cdb19
+checksum=02ef2b56b00fc5145701c603a5235e1265772e40d488a936b27ba65fe78e710f
python_version=3
patch_args="-Np1"
From bbc225ca9cf908b2854e34b7c9d877fa2f8ab564 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 20 Jan 2021 17:06:26 -0500
Subject: [PATCH 212/634] chromium: update to 88.0.4324.96.
- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.
- Add API deprecation warning message.
---
srcpkgs/chromium/INSTALL.msg | 8 ++++
.../files/musl-patches/musl-fixes.patch | 10 ++---
.../chromium-87-CursorFactory-include.patch | 36 -----------------
...-87-ServiceWorkerContainerHost-crash.patch | 22 -----------
.../chromium-88-AXTreeFormatter-include.patch | 27 +++++++++++++
...ium-88-BookmarkModelObserver-include.patch | 21 ++++++++++
...um-88-CompositorFrameReporter-dcheck.patch | 36 +++++++++++++++++
.../chromium-88-StringPool-include.patch | 20 ++++++++++
...romium-88-federated_learning-include.patch | 21 ++++++++++
...hromium-88-ideographicSpaceCharacter.patch | 27 +++++++++++++
.../patches/chromium-88-ityp-include.patch | 25 ++++++++++++
.../patches/chromium-88-vaapi-attribute.patch | 39 +++++++++++++++++++
...remove-unsupported-compiler-warnings.patch | 13 ++++---
.../patches/xxx-ppc64le-support.patch | 33 ++++++++--------
srcpkgs/chromium/template | 6 +--
15 files changed, 256 insertions(+), 88 deletions(-)
create mode 100644 srcpkgs/chromium/INSTALL.msg
delete mode 100644 srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
create mode 100644 srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch
create mode 100644 srcpkgs/chromium/patches/chromium-88-StringPool-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch
create mode 100644 srcpkgs/chromium/patches/chromium-88-ityp-include.patch
create mode 100644 srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
diff --git a/srcpkgs/chromium/INSTALL.msg b/srcpkgs/chromium/INSTALL.msg
new file mode 100644
index 00000000000..ea95f5157e2
--- /dev/null
+++ b/srcpkgs/chromium/INSTALL.msg
@@ -0,0 +1,8 @@
+On March 15, 2021, Google will be limiting access to their private Chrome APIs:
+
+ https://blog.chromium.org/2021/01/limiting-private-api-availability-in.html
+
+This means that after this date, chromium users will no longer be able to take
+advantage of features such as Google account sync (including bookmarks), spell
+checking, translation, and safe browsing. These features will only be available
+with the restricted google-chrome package.
diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
index 6b50f61fcbd..a7832ff32e8 100644
--- a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
+++ b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
@@ -117,18 +117,18 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl
#include <arpa/inet.h>
#include <stdint.h>
#endif
---- ./base/logging.cc.orig
-+++ ./base/logging.cc
-@@ -545,8 +545,7 @@
+--- ./base/logging.cc.orig 2021-01-20 12:09:54.227038757 -0500
++++ ./base/logging.cc 2021-01-20 12:24:32.600301351 -0500
+@@ -557,8 +557,7 @@
LogMessage::~LogMessage() {
size_t stack_start = stream_.tellp();
-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
- !defined(OS_AIX)
+#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
- if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
+ if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
// Include a stack trace on a fatal, unless a debugger is attached.
- base::debug::StackTrace trace;
+ base::debug::StackTrace stack_trace;
--- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig
+++ ./third_party/blink/renderer/platform/wtf/stack_util.cc
@@ -28,7 +28,7 @@
diff --git a/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch b/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
deleted file mode 100644
index d345e584830..00000000000
--- a/srcpkgs/chromium/patches/chromium-87-CursorFactory-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 286b86691f1..00000000000
--- a/srcpkgs/chromium/patches/chromium-87-ServiceWorkerContainerHost-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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-88-AXTreeFormatter-include.patch b/srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
new file mode 100644
index 00000000000..54781098920
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
@@ -0,0 +1,27 @@
+From 6e402d97c2dec5726f37e95f97b7f7e12b1d3b1d Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 11 Nov 2020 11:02:13 +0100
+Subject: [PATCH] IWYU: include headers for std::vector and std::unique_ptr in AXTreeFormatter
+
+Fix these build errors with libstdc++:
+../../ui/accessibility/platform/inspect/tree_formatter.h:35:12: error: ‘std::vector’ has not been declared
+../../ui/accessibility/platform/inspect/tree_formatter.h:61:16: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
+
+Bug: 957519
+Change-Id: I402ac0644255b3cd4932ff2fe72d999b125a7895
+---
+
+diff --git a/ui/accessibility/platform/inspect/tree_formatter.h b/ui/accessibility/platform/inspect/tree_formatter.h
+index 4a70a4d..bb23768 100644
+--- ui/accessibility/platform/inspect/tree_formatter.h
++++ ui/accessibility/platform/inspect/tree_formatter.h
+@@ -5,6 +5,9 @@
+ #ifndef UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
+ #define UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
+
++#include <memory>
++#include <vector>
++
+ #include "ui/accessibility/platform/inspect/inspect.h"
+
+ #include "ui/gfx/native_widget_types.h"
diff --git a/srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch b/srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch
new file mode 100644
index 00000000000..0b26a60a36e
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch
@@ -0,0 +1,21 @@
+From 127ec3b1bf26ab37f2ae8333f284008868756274 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 21 Nov 2020 15:59:23 +0000
+Subject: [PATCH] IWYU: size_t is defined stddef.h
+
+Change-Id: I4400ac7c6004b49ec6e72c44f2754e2166642f88
+---
+
+diff --git a/components/bookmarks/browser/bookmark_model_observer.h b/components/bookmarks/browser/bookmark_model_observer.h
+index 69c40e7..0e5eb96 100644
+--- components/bookmarks/browser/bookmark_model_observer.h
++++ components/bookmarks/browser/bookmark_model_observer.h
+@@ -7,6 +7,8 @@
+
+ #include <set>
+
++#include <stddef.h>
++
+ class GURL;
+
+ namespace bookmarks {
diff --git a/srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch b/srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch
new file mode 100644
index 00000000000..aa1c52e0b7e
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch
@@ -0,0 +1,36 @@
+From 56c654a91600e3bf254aa9f66c1151b0850b6ee4 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 11 Nov 2020 10:24:47 +0100
+Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual pointer, in CompositorFrameReporter
+
+DCHECK_NE comparison requires CheckOpValueStr to be defined for the
+type, or providing an output stream operator. A unique_ptr does not
+provide any.
+
+Compilation in GCC is failing in CompositorFrameReporter because of
+this:
+../../cc/metrics/compositor_frame_reporter.cc: In member function ‘void cc::CompositorFrameReporter::ReportEventLatencyHistograms() const’:
+../../base/check_op.h:224:59: error: no matching function for call to ‘CheckOpValueStr(const std::unique_ptr<cc::EventMetrics>&)’
+
+Fixed comparing the result of get() method for unique_ptr instead of
+the unique_ptr.
+
+Bug: 819294
+Change-Id: I11103d1867c7196c1de92e72f9f12dcfd31c29f1
+
+(updated to use DCHECK as suggested in comments)
+---
+
+diff --git a/cc/metrics/compositor_frame_reporter.cc b/cc/metrics/compositor_frame_reporter.cc
+index 725beb0..fafd0f3 100644
+--- cc/metrics/compositor_frame_reporter.cc
++++ cc/metrics/compositor_frame_reporter.cc
+@@ -686,7 +686,7 @@
+
+ void CompositorFrameReporter::ReportEventLatencyHistograms() const {
+ for (const auto& event_metrics : events_metrics_) {
+- DCHECK_NE(event_metrics, nullptr);
++ DCHECK(event_metrics);
+ const std::string histogram_base_name =
+ GetEventLatencyHistogramBaseName(*event_metrics);
+ const int event_type_index = static_cast<int>(event_metrics->type());
diff --git a/srcpkgs/chromium/patches/chromium-88-StringPool-include.patch b/srcpkgs/chromium/patches/chromium-88-StringPool-include.patch
new file mode 100644
index 00000000000..e55bbae2ece
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-StringPool-include.patch
@@ -0,0 +1,20 @@
+From 372366b4180533f27d3250a50810828370d697b0 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 21 Nov 2020 16:12:18 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+Change-Id: Ia5226e1432a622f4f4abc8f1b18bcab8638a73c6
+---
+
+diff --git a/src/trace_processor/containers/string_pool.h b/src/trace_processor/containers/string_pool.h
+index 11ae91c..58c6db2 100644
+--- third_party/perfetto/src/trace_processor/containers/string_pool.h
++++ third_party/perfetto/src/trace_processor/containers/string_pool.h
+@@ -22,6 +22,7 @@
+
+ #include <unordered_map>
+ #include <vector>
++#include <limits>
+
+ #include "perfetto/ext/base/optional.h"
+ #include "perfetto/ext/base/paged_memory.h"
diff --git a/srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch b/srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch
new file mode 100644
index 00000000000..3eb1537d801
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch
@@ -0,0 +1,21 @@
+From bcb20babee602b55fe4bd026e13a41d10b89632f Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 21 Nov 2020 15:55:02 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+Change-Id: I1b6b07ebb397a29c84d3ed51ae41523e3ecab497
+---
+
+diff --git a/components/federated_learning/floc_constants.cc b/components/federated_learning/floc_constants.cc
+index df66e5d..2eb50f1 100644
+--- components/federated_learning/floc_constants.cc
++++ components/federated_learning/floc_constants.cc
+@@ -4,6 +4,8 @@
+
+ #include "components/federated_learning/floc_constants.h"
+
++#include <limits>
++
+ namespace federated_learning {
+
+ // This is only for experimentation and won't be served to websites.
diff --git a/srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch b/srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch
new file mode 100644
index 00000000000..38a11423b2d
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch
@@ -0,0 +1,27 @@
+From 75ff882bb5f2fcd14431e65fa638ae72bdb47086 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sun, 15 Nov 2020 14:31:23 +0000
+Subject: [PATCH] fix ideographicSpaceCharacter constant for system icu
+
+https://chromium-review.googlesource.com/c/chromium/src/+/1687411
+renamed ideographicSpaceCharacter to kIdeographicSpaceCharacter.
+---
+ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+index fb8ab05..5d4ea13 100644
+--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
++++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+@@ -432,7 +432,7 @@ String TextCodecICU::Decode(const char* bytes,
+ // ICU decodes it as U+E5E5.
+ if (!strcmp(encoding_.GetName(), "GBK")) {
+ if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
+- resultString.Replace(0xE5E5, ideographicSpaceCharacter);
++ resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
+ // Make GBK compliant to the encoding spec and align with GB18030
+ resultString.Replace(0x01F9, 0xE7C8);
+ // FIXME: Once https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3
+--
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-88-ityp-include.patch b/srcpkgs/chromium/patches/chromium-88-ityp-include.patch
new file mode 100644
index 00000000000..c54b6fffd54
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-ityp-include.patch
@@ -0,0 +1,25 @@
+From bc383a5dd7fa8f2b535f28815fd6932fbc0d2a45 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 28 Oct 2020 16:00:35 +0000
+Subject: [PATCH] IWYU: include stddef.h for size_t
+
+---
+ third_party/dawn/src/common/ityp_array.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/dawn/src/common/ityp_array.h b/third_party/dawn/src/common/ityp_array.h
+index 48e080f..c784198 100644
+--- third_party/dawn/src/common/ityp_array.h
++++ third_party/dawn/src/common/ityp_array.h
+@@ -21,6 +21,8 @@
+ #include <array>
+ #include <type_traits>
+
++#include <stddef.h>
++
+ namespace ityp {
+
+ // ityp::array is a helper class that wraps std::array with the restriction that
+--
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch b/srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
new file mode 100644
index 00000000000..e4161af45c7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
@@ -0,0 +1,39 @@
+From 4f4604877f3b666ac7a373ae443e3c3795424569 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 6 Nov 2020 11:18:42 +0000
+Subject: [PATCH] GCC: fix attribute on function definition
+
+GCC does not accept attributes at the end for function definitions.
+Solution is to move it before function name. Otherwise GCC fails like
+this:
+
+../../base/compiler_specific.h:97:28: error: attributes are not allowed
+on a function-definition
+ 97 | #define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+ | ^~~~~~~~~~~~~
+ ../../media/gpu/vaapi/vaapi_wrapper.h:322:36: note: in
+ expansion of macro 'WARN_UNUSED_RESULT'
+ 322 | const T* data) WARN_UNUSED_RESULT {
+ | ^~~~~~~~~~~~~~~~~~
+---
+ media/gpu/vaapi/vaapi_wrapper.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h
+index fd1fd82..deeda1f 100644
+--- media/gpu/vaapi/vaapi_wrapper.h
++++ media/gpu/vaapi/vaapi_wrapper.h
+@@ -318,8 +318,8 @@ class MEDIA_GPU_EXPORT VaapiWrapper
+ // Convenient templatized version of SubmitBuffer() where |size| is deduced to
+ // be the size of the type of |*data|.
+ template <typename T>
+- bool SubmitBuffer(VABufferType va_buffer_type,
+- const T* data) WARN_UNUSED_RESULT {
++ bool WARN_UNUSED_RESULT SubmitBuffer(VABufferType va_buffer_type,
++ const T* data) {
+ return SubmitBuffer(va_buffer_type, sizeof(T), data);
+ }
+ // Batch-version of SubmitBuffer(), where the lock for accessing libva is
+--
+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 4286b16b13f..3016b065212 100644
--- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
+++ b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- build/config/compiler/BUILD.gn.orig 2021-01-20 09:01:44.362114311 -0500
++++ build/config/compiler/BUILD.gn 2021-01-20 09:03:41.880232248 -0500
+@@ -1534,9 +1534,6 @@
# TODO(https://crbug.com/1028110): Evaluate and possible enable.
"-Wno-deprecated-copy",
@@ -10,9 +10,10 @@
]
cflags_c += [
- # TODO(https://crbug.com/995993): Clean up and enable.
- "-Wno-implicit-fallthrough",
- ]
+@@ -1548,13 +1545,6 @@
+ # TODO(https://crbug.com/1143700): Clean up and re-enable.
+ cflags_objc = [ "-Wno-gnu-folding-constant" ]
+ }
-
- if (enable_wmax_tokens) {
- cflags += [ "-Wmax-tokens" ]
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 17c3e0cfdde..805755c2125 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -211,17 +211,17 @@ diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
index f51915edc..ca2f4f106 100644
--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -36,7 +36,8 @@
- #include <sys/ioctl.h>
+@@ -40,7 +40,8 @@
#include <sys/ptrace.h>
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(__arm__) && \
-- !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA)
-+ !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA) && \
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+ !defined(__arm__) && !defined(__aarch64__) && \
+- !defined(PTRACE_GET_THREAD_AREA)
++ !defined(PTRACE_GET_THREAD_AREA) && \
+ !defined(__powerpc64__)
// Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
// the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
// asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
-@@ -45,6 +46,11 @@
+@@ -49,6 +50,11 @@
#endif
#endif // !OS_NACL_NONSFI
@@ -233,7 +233,7 @@ index f51915edc..ca2f4f106 100644
#if defined(OS_ANDROID)
#if !defined(F_DUPFD_CLOEXEC)
-@@ -107,6 +113,15 @@ inline bool IsArchitectureMips() {
+@@ -98,6 +104,15 @@
#endif
}
@@ -249,7 +249,7 @@ index f51915edc..ca2f4f106 100644
// Ubuntu's version of glibc has a race condition in sem_post that can cause
// it to call futex(2) with bogus op arguments. To workaround this, we need
// to allow those futex(2) calls to fail with EINVAL, instead of crashing the
-@@ -248,6 +263,8 @@ ResultExpr RestrictFcntlCommands() {
+@@ -239,6 +254,8 @@
uint64_t kOLargeFileFlag = O_LARGEFILE;
if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
kOLargeFileFlag = 0100000;
@@ -258,7 +258,7 @@ index f51915edc..ca2f4f106 100644
const Arg<int> cmd(1);
const Arg<long> long_arg(2);
-@@ -262,14 +279,23 @@ ResultExpr RestrictFcntlCommands() {
+@@ -253,14 +270,23 @@
F_SETLKW,
F_GETLK,
F_DUPFD,
@@ -285,15 +285,16 @@ index f51915edc..ca2f4f106 100644
ResultExpr RestrictSocketcallCommand() {
// Unfortunately, we are unable to restrict the first parameter to
// socketpair(2). Whilst initially sounding bad, it's noteworthy that very
-@@ -418,7 +444,7 @@ ResultExpr RestrictPrlimitToGetrlimit(pid_t target_pid) {
- ResultExpr RestrictPtrace() {
- const Arg<int> request(0);
- return Switch(request).CASES((
+@@ -413,7 +439,7 @@
+ #endif
+ return Switch(request)
+ .CASES((
-#if !defined(__aarch64__)
+#if !defined(__aarch64__) && !defined(__powerpc64__)
- PTRACE_GETREGS,
- PTRACE_GETFPREGS,
- PTRACE_GET_THREAD_AREA,
+ PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA,
+ PTRACE_GETREGSET,
+ #endif
+
diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
index ba4289f05..9a4d5ab2d 100644
--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 6a8ec3827dd..348389798a2 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,15 +1,15 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=87.0.4280.141
-revision=2
+version=88.0.4324.96
+revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
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=147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
+checksum=8995c5bb28559579f3bed51841420253637f912c425908fe5aa389ce40e9c79f
nocross=yes
lib32disabled=yes
From 2d0e0d6b68c42028401086cccdf26d9b176addd0 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Thu, 21 Jan 2021 13:20:08 -0500
Subject: [PATCH 213/634] chromium-widevine: update to 88.0.4324.96.
---
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 d4723ffdf1f..de1264d34d6 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
# INSTALL
-checksum=b7edb7cd5c166bf3c0a1d245baa5924e242c3b81b97090468bec778f41f40373
+checksum=4c3fca6ba917db4635368c99df61cd811c5138daa1ad890d4dc4271dd0014124
_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 be13eec954a..8dc78d1edec 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
_channel="stable"
pkgname=chromium-widevine
-version=87.0.4280.141
+version=88.0.4324.96
revision=1
archs="x86_64"
create_wrksrc=yes
From 59b159d1d47e383ac7c21308d923d628c67e0f89 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 26 Jan 2021 17:56:39 +0000
Subject: [PATCH 214/634] Thunar: update to 4.16.2.
sgn: Add back the reverts and glib-devel (required for thunar-uca)
Close: #28248
---
srcpkgs/Thunar/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 004b48ee50c..befa4cc39b8 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,15 +1,15 @@
# Template file for 'Thunar'
pkgname=Thunar
reverts="4.17.0_1"
-version=4.16.1
-revision=2
+version=4.16.2
+revision=1
wrksrc=thunar-${version}
build_style=gnu-configure
build_helper="gir"
configure_args="--enable-gio-unix --enable-gudev
--enable-exif --enable-pcre --disable-static --enable-notifications
--with-locales-dir=/usr/share/locale"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel"
makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Thunar File Manager"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://docs.xfce.org/xfce/thunar/Start"
changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=da2d17d2cb69eb33768690b714cc232ed367cbd71eb9543aaa2a805d05dc3ce1
+checksum=67a90b98c436192f9aa6cd18a22a089e713007864aebfa65f36f121c86ba7add
post_install() {
rm -rf ${DESTDIR}/usr/lib/systemd
From 9c9c8993c3f6283485ceba46156f6e056197513a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 09:36:39 -0500
Subject: [PATCH 215/634] python3-pybind11: update to 2.6.2.
---
srcpkgs/python3-pybind11/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template
index 1aa374b6b4e..6dcafe28636 100644
--- a/srcpkgs/python3-pybind11/template
+++ b/srcpkgs/python3-pybind11/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pybind11'
pkgname=python3-pybind11
-version=2.6.1
+version=2.6.2
revision=1
wrksrc="pybind11-${version}"
build_style=python3-module
@@ -13,13 +13,16 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://github.com/pybind/pybind11"
distfiles="https://github.com/pybind/pybind11/archive/v${version}.tar.gz"
-checksum=cdbe326d357f18b83d10322ba202d69f11b2f49e2d87ade0dc2be0c5c34f8e2a
+checksum=8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2
-post_build() {
+post_patch() {
# These dependencies are not packaged and don't affect the man page
vsed -e '/sphinxcontrib.rsvgconverter/d' \
-e '/sphinxcontrib.moderncmakedomain/d' -i docs/conf.py
+}
+
+post_build() {
# Build the man page
make $makejobs -C docs man
}
From 0cb26976351a5b4bd9e38094b4ce517c4e598bd0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 09:36:44 -0500
Subject: [PATCH 216/634] python3-pyopencl: update to 2021.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 49ef0a074a7..2ceffe9836f 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.1
+version=2021.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=abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36
+checksum=262a29708a5465bd12b75d838f8d1107cd9321f54cb1c553c0064db10f3d5041
do_configure() {
./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \
From 616611e8b5384daa2c7ffe2beb0da7738919b520 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 09:47:39 -0500
Subject: [PATCH 217/634] python3-hypothesis: update to 6.0.3.
---
srcpkgs/python3-hypothesis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 1a5c4de03b2..f7304f48399 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
# Template file for 'python3-hypothesis'
pkgname=python3-hypothesis
-version=5.49.0
+version=6.0.3
revision=1
wrksrc="hypothesis-hypothesis-python-${version}"
build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
homepage="https://hypothesis.works/"
changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=b756a941014df75f772d01cc4fde4383c8dabc6db95f32cce094012f576f6762
+checksum=c5cdf04d720b4746f04a2a541c73d3e3584e98bd2024b37b17c06511b668336e
do_check() {
# Manually run the tests that tox considers part of the "full" suite,
From 56fa1a8c7b86a8f611a375418fb91f571f556199 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:02:43 -0500
Subject: [PATCH 218/634] python3-pytest: update to 6.2.2.
---
srcpkgs/python3-pytest/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index 4c291e13efb..6a38a983b04 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest'
pkgname=python3-pytest
-version=6.2.1
+version=6.2.2
revision=1
wrksrc="pytest-${version}"
build_style=python3-module
@@ -16,7 +16,7 @@ license="MIT"
homepage="https://docs.pytest.org/en/latest/"
changelog="https://docs.pytest.org/en/latest/changelog.html"
distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306
+checksum=9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9
alternatives="
pytest:pytest:/usr/bin/pytest3
pytest:py.test:/usr/bin/py.test3"
From 92e630c0a46c1698db5968328594ebf184675178 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:02:49 -0500
Subject: [PATCH 219/634] python3-josepy: update to 1.6.0.
---
srcpkgs/python3-josepy/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index 46c6ecaf7cf..228f0a40502 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,14 +1,19 @@
# Template file for 'python3-josepy'
pkgname=python3-josepy
-version=1.5.0
+version=1.6.0
revision=1
wrksrc="josepy-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-cryptography python3-openssl python3-setuptools python3-six"
+checkdepends="python3-pytest python3-mock $depends"
short_desc="JOSE protocol implementation in Python3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/certbot/josepy"
distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=502a36f86efe2a6d09bf7018bca9fd8f8f24d8090a966aa037dbc844459ff9c8
+checksum=0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5
+
+pre_check() {
+ vsed -e '/addopts/d' -i pytest.ini
+}
From daa932e74b7e9d48474831a38fc110cf0b67f4a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:10:57 -0500
Subject: [PATCH 220/634] python3-pyzmq: update to 21.0.2.
---
srcpkgs/python3-pyzmq/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 230b21a0431..162a999f7a7 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pyzmq'
pkgname=python3-pyzmq
-version=21.0.1
+version=21.0.2
revision=1
wrksrc="pyzmq-${version}"
build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
homepage="https://pyzmq.readthedocs.io/"
changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=c3a630dd7716e8e127d43b22598e256a2d11a847b8cc3310350528960037fa06
+checksum=098c13c6198913c2a0690235fa74d2e49161755f66b663beaec89651554cc79c
pre_build() {
cat > setup.cfg <<-EOF
From e9eef6b812ba3788514448a7064b304c447643f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 11:34:44 -0500
Subject: [PATCH 221/634] python-urllib3: update to 1.26.3.
---
srcpkgs/python-urllib3/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 8a395f6aec6..4888a276095 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,6 +1,6 @@
# Template file for 'python-urllib3'
pkgname=python-urllib3
-version=1.26.2
+version=1.26.3
revision=1
wrksrc="urllib3-${version}"
build_style=python-module
@@ -11,14 +11,14 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://urllib3.readthedocs.io/"
distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
-checksum=19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08
+checksum=de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73
post_install() {
- # replace bundled copy of six
- for pyver in $py2_ver $py3_ver; do
- rm -f ${DESTDIR}/usr/lib/python${pyver}/site-packages/urllib3/packages/six.py
- ln -sf ../../six.py ${DESTDIR}/usr/lib/python${pyver}/site-packages/urllib3/packages/six.py
+ for sitelib in ${py3_sitelib} ${py2_sitelib}; do
+ rm ${DESTDIR}/${sitelib}/urllib3/packages/six.py
+ ln -sf ../../six.py ${DESTDIR}/${sitelib}/urllib3/packages/six.py
done
+
vlicense LICENSE.txt
}
From b77c31a3cd6c582a10c2da2267f81cc2f0a7af36 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 10:53:59 -0600
Subject: [PATCH 222/634] bpytop: update to 1.0.61.
---
srcpkgs/bpytop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index 9436b9d4be0..c4b2e00034c 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
# Template file for 'bpytop'
pkgname=bpytop
-version=1.0.60
+version=1.0.61
revision=1
build_style=gnu-makefile
depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/aristocratos/bpytop"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7fc1a40ac6b9cb8f78f1e0e2e7bd58b9197c333ad4c5a4f2cb464d3f8183835b
+checksum=01bc712df11cb7022fff510e118130f4834c3dcd1f85267ada9c50a30af5919b
pre_configure() {
vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py
From b6baab81bbdf0fa32c8ef5d89dd64d620899f3d7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 10:56:49 -0600
Subject: [PATCH 223/634] downloader-cli: update to 0.3.1.
---
srcpkgs/downloader-cli/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index f406399f0dd..f56449f6f96 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,7 +1,7 @@
# Template file for 'downloader-cli'
pkgname=downloader-cli
-version=0.2.0
-revision=2
+version=0.3.1
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-urllib3 python3-downloader-cli"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/deepjyoti30/downloader-cli"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c9c3e7c2ecc9cfe5d51032fc9783b6cc5e879746231535f86279f0a910659881
+checksum=bd88aad5967b2fc7f70f715725a51a398c56e4fae791463dafda3a69730b277d
post_install() {
vlicense LICENSE
From c70d47fae84a0ae73b5412021bfb1fefe143fbb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 27 Jan 2021 18:49:21 +0100
Subject: [PATCH 224/634] icecat: remove
---
srcpkgs/icecat-i18n-ach | 1 -
srcpkgs/icecat-i18n-af | 1 -
srcpkgs/icecat-i18n-an | 1 -
srcpkgs/icecat-i18n-ar | 1 -
srcpkgs/icecat-i18n-ast | 1 -
srcpkgs/icecat-i18n-az | 1 -
srcpkgs/icecat-i18n-be | 1 -
srcpkgs/icecat-i18n-bg | 1 -
srcpkgs/icecat-i18n-bn | 1 -
srcpkgs/icecat-i18n-br | 1 -
srcpkgs/icecat-i18n-bs | 1 -
srcpkgs/icecat-i18n-ca | 1 -
srcpkgs/icecat-i18n-cak | 1 -
srcpkgs/icecat-i18n-cs | 1 -
srcpkgs/icecat-i18n-cy | 1 -
srcpkgs/icecat-i18n-da | 1 -
srcpkgs/icecat-i18n-de | 1 -
srcpkgs/icecat-i18n-dsb | 1 -
srcpkgs/icecat-i18n-el | 1 -
srcpkgs/icecat-i18n-en-CA | 1 -
srcpkgs/icecat-i18n-en-GB | 1 -
srcpkgs/icecat-i18n-en-US | 1 -
srcpkgs/icecat-i18n-eo | 1 -
srcpkgs/icecat-i18n-es-AR | 1 -
srcpkgs/icecat-i18n-es-CL | 1 -
srcpkgs/icecat-i18n-es-ES | 1 -
srcpkgs/icecat-i18n-es-MX | 1 -
srcpkgs/icecat-i18n-et | 1 -
srcpkgs/icecat-i18n-eu | 1 -
srcpkgs/icecat-i18n-fa | 1 -
srcpkgs/icecat-i18n-ff | 1 -
srcpkgs/icecat-i18n-fi | 1 -
srcpkgs/icecat-i18n-fr | 1 -
srcpkgs/icecat-i18n-fy-NL | 1 -
srcpkgs/icecat-i18n-ga-IE | 1 -
srcpkgs/icecat-i18n-gd | 1 -
srcpkgs/icecat-i18n-gl | 1 -
srcpkgs/icecat-i18n-gn | 1 -
srcpkgs/icecat-i18n-gu-IN | 1 -
srcpkgs/icecat-i18n-he | 1 -
srcpkgs/icecat-i18n-hi-IN | 1 -
srcpkgs/icecat-i18n-hr | 1 -
srcpkgs/icecat-i18n-hsb | 1 -
srcpkgs/icecat-i18n-hu | 1 -
srcpkgs/icecat-i18n-hy-AM | 1 -
srcpkgs/icecat-i18n-ia | 1 -
srcpkgs/icecat-i18n-id | 1 -
srcpkgs/icecat-i18n-is | 1 -
srcpkgs/icecat-i18n-it | 1 -
srcpkgs/icecat-i18n-ja | 1 -
srcpkgs/icecat-i18n-ka | 1 -
srcpkgs/icecat-i18n-kab | 1 -
srcpkgs/icecat-i18n-kk | 1 -
srcpkgs/icecat-i18n-km | 1 -
srcpkgs/icecat-i18n-kn | 1 -
srcpkgs/icecat-i18n-ko | 1 -
srcpkgs/icecat-i18n-lij | 1 -
srcpkgs/icecat-i18n-lt | 1 -
srcpkgs/icecat-i18n-lv | 1 -
srcpkgs/icecat-i18n-mk | 1 -
srcpkgs/icecat-i18n-mr | 1 -
srcpkgs/icecat-i18n-ms | 1 -
srcpkgs/icecat-i18n-my | 1 -
srcpkgs/icecat-i18n-nb-NO | 1 -
srcpkgs/icecat-i18n-ne-NP | 1 -
srcpkgs/icecat-i18n-nl | 1 -
srcpkgs/icecat-i18n-nn-NO | 1 -
srcpkgs/icecat-i18n-oc | 1 -
srcpkgs/icecat-i18n-pa-IN | 1 -
srcpkgs/icecat-i18n-pl | 1 -
srcpkgs/icecat-i18n-pt-BR | 1 -
srcpkgs/icecat-i18n-pt-PT | 1 -
srcpkgs/icecat-i18n-rm | 1 -
srcpkgs/icecat-i18n-ro | 1 -
srcpkgs/icecat-i18n-ru | 1 -
srcpkgs/icecat-i18n-si | 1 -
srcpkgs/icecat-i18n-sk | 1 -
srcpkgs/icecat-i18n-sl | 1 -
srcpkgs/icecat-i18n-son | 1 -
srcpkgs/icecat-i18n-sq | 1 -
srcpkgs/icecat-i18n-sr | 1 -
srcpkgs/icecat-i18n-sv-SE | 1 -
srcpkgs/icecat-i18n-ta | 1 -
srcpkgs/icecat-i18n-te | 1 -
srcpkgs/icecat-i18n-th | 1 -
srcpkgs/icecat-i18n-tr | 1 -
srcpkgs/icecat-i18n-uk | 1 -
srcpkgs/icecat-i18n-ur | 1 -
srcpkgs/icecat-i18n-uz | 1 -
srcpkgs/icecat-i18n-vi | 1 -
srcpkgs/icecat-i18n-xh | 1 -
srcpkgs/icecat-i18n-zh-CN | 1 -
srcpkgs/icecat-i18n-zh-TW | 1 -
srcpkgs/icecat/files/icecat-wayland | 2 -
srcpkgs/icecat/files/icecat.desktop | 116 ---
srcpkgs/icecat/files/mozconfig | 35 -
srcpkgs/icecat/files/stab.h | 71 --
srcpkgs/icecat/files/vendor.js | 9 -
.../patches/big-endian-image-decoders.patch | 88 --
.../icecat/patches/fix-arm-opus-include.patch | 11 -
srcpkgs/icecat/patches/fix-cross.patch | 16 -
.../patches/fix-desktop-icon-path.patch | 11 -
.../icecat/patches/fix-fortify-inline.patch | 11 -
.../icecat/patches/fix-i686-ppc-musl.patch | 11 -
.../patches/fix-image-format-warning.patch | 39 -
srcpkgs/icecat/patches/fix-tools.patch | 13 -
srcpkgs/icecat/patches/fix-wasm-arm.patch | 15 -
.../icecat/patches/fix-webrtc-glibcisms.patch | 20 -
srcpkgs/icecat/patches/flac-no-ffvpx.patch | 26 -
srcpkgs/icecat/patches/mallinfo.patch | 34 -
.../icecat/patches/musl-rust.configure.patch | 26 -
srcpkgs/icecat/patches/ppc32-fix-build.patch | 36 -
srcpkgs/icecat/patches/rust-configure.patch | 42 -
srcpkgs/icecat/patches/rust-has-i128.patch | 21 -
srcpkgs/icecat/patches/sandbox-fork.patch | 13 -
.../icecat/patches/sandbox-largefile.patch | 17 -
srcpkgs/icecat/patches/skia-sucks1.patch | 77 --
srcpkgs/icecat/patches/skia-sucks2.patch | 44 -
srcpkgs/icecat/patches/skia-sucks3.patch | 56 --
srcpkgs/icecat/patches/sndio.patch | 52 -
srcpkgs/icecat/template | 951 ------------------
srcpkgs/icecat/update | 2 -
122 files changed, 1958 deletions(-)
delete mode 120000 srcpkgs/icecat-i18n-ach
delete mode 120000 srcpkgs/icecat-i18n-af
delete mode 120000 srcpkgs/icecat-i18n-an
delete mode 120000 srcpkgs/icecat-i18n-ar
delete mode 120000 srcpkgs/icecat-i18n-ast
delete mode 120000 srcpkgs/icecat-i18n-az
delete mode 120000 srcpkgs/icecat-i18n-be
delete mode 120000 srcpkgs/icecat-i18n-bg
delete mode 120000 srcpkgs/icecat-i18n-bn
delete mode 120000 srcpkgs/icecat-i18n-br
delete mode 120000 srcpkgs/icecat-i18n-bs
delete mode 120000 srcpkgs/icecat-i18n-ca
delete mode 120000 srcpkgs/icecat-i18n-cak
delete mode 120000 srcpkgs/icecat-i18n-cs
delete mode 120000 srcpkgs/icecat-i18n-cy
delete mode 120000 srcpkgs/icecat-i18n-da
delete mode 120000 srcpkgs/icecat-i18n-de
delete mode 120000 srcpkgs/icecat-i18n-dsb
delete mode 120000 srcpkgs/icecat-i18n-el
delete mode 120000 srcpkgs/icecat-i18n-en-CA
delete mode 120000 srcpkgs/icecat-i18n-en-GB
delete mode 120000 srcpkgs/icecat-i18n-en-US
delete mode 120000 srcpkgs/icecat-i18n-eo
delete mode 120000 srcpkgs/icecat-i18n-es-AR
delete mode 120000 srcpkgs/icecat-i18n-es-CL
delete mode 120000 srcpkgs/icecat-i18n-es-ES
delete mode 120000 srcpkgs/icecat-i18n-es-MX
delete mode 120000 srcpkgs/icecat-i18n-et
delete mode 120000 srcpkgs/icecat-i18n-eu
delete mode 120000 srcpkgs/icecat-i18n-fa
delete mode 120000 srcpkgs/icecat-i18n-ff
delete mode 120000 srcpkgs/icecat-i18n-fi
delete mode 120000 srcpkgs/icecat-i18n-fr
delete mode 120000 srcpkgs/icecat-i18n-fy-NL
delete mode 120000 srcpkgs/icecat-i18n-ga-IE
delete mode 120000 srcpkgs/icecat-i18n-gd
delete mode 120000 srcpkgs/icecat-i18n-gl
delete mode 120000 srcpkgs/icecat-i18n-gn
delete mode 120000 srcpkgs/icecat-i18n-gu-IN
delete mode 120000 srcpkgs/icecat-i18n-he
delete mode 120000 srcpkgs/icecat-i18n-hi-IN
delete mode 120000 srcpkgs/icecat-i18n-hr
delete mode 120000 srcpkgs/icecat-i18n-hsb
delete mode 120000 srcpkgs/icecat-i18n-hu
delete mode 120000 srcpkgs/icecat-i18n-hy-AM
delete mode 120000 srcpkgs/icecat-i18n-ia
delete mode 120000 srcpkgs/icecat-i18n-id
delete mode 120000 srcpkgs/icecat-i18n-is
delete mode 120000 srcpkgs/icecat-i18n-it
delete mode 120000 srcpkgs/icecat-i18n-ja
delete mode 120000 srcpkgs/icecat-i18n-ka
delete mode 120000 srcpkgs/icecat-i18n-kab
delete mode 120000 srcpkgs/icecat-i18n-kk
delete mode 120000 srcpkgs/icecat-i18n-km
delete mode 120000 srcpkgs/icecat-i18n-kn
delete mode 120000 srcpkgs/icecat-i18n-ko
delete mode 120000 srcpkgs/icecat-i18n-lij
delete mode 120000 srcpkgs/icecat-i18n-lt
delete mode 120000 srcpkgs/icecat-i18n-lv
delete mode 120000 srcpkgs/icecat-i18n-mk
delete mode 120000 srcpkgs/icecat-i18n-mr
delete mode 120000 srcpkgs/icecat-i18n-ms
delete mode 120000 srcpkgs/icecat-i18n-my
delete mode 120000 srcpkgs/icecat-i18n-nb-NO
delete mode 120000 srcpkgs/icecat-i18n-ne-NP
delete mode 120000 srcpkgs/icecat-i18n-nl
delete mode 120000 srcpkgs/icecat-i18n-nn-NO
delete mode 120000 srcpkgs/icecat-i18n-oc
delete mode 120000 srcpkgs/icecat-i18n-pa-IN
delete mode 120000 srcpkgs/icecat-i18n-pl
delete mode 120000 srcpkgs/icecat-i18n-pt-BR
delete mode 120000 srcpkgs/icecat-i18n-pt-PT
delete mode 120000 srcpkgs/icecat-i18n-rm
delete mode 120000 srcpkgs/icecat-i18n-ro
delete mode 120000 srcpkgs/icecat-i18n-ru
delete mode 120000 srcpkgs/icecat-i18n-si
delete mode 120000 srcpkgs/icecat-i18n-sk
delete mode 120000 srcpkgs/icecat-i18n-sl
delete mode 120000 srcpkgs/icecat-i18n-son
delete mode 120000 srcpkgs/icecat-i18n-sq
delete mode 120000 srcpkgs/icecat-i18n-sr
delete mode 120000 srcpkgs/icecat-i18n-sv-SE
delete mode 120000 srcpkgs/icecat-i18n-ta
delete mode 120000 srcpkgs/icecat-i18n-te
delete mode 120000 srcpkgs/icecat-i18n-th
delete mode 120000 srcpkgs/icecat-i18n-tr
delete mode 120000 srcpkgs/icecat-i18n-uk
delete mode 120000 srcpkgs/icecat-i18n-ur
delete mode 120000 srcpkgs/icecat-i18n-uz
delete mode 120000 srcpkgs/icecat-i18n-vi
delete mode 120000 srcpkgs/icecat-i18n-xh
delete mode 120000 srcpkgs/icecat-i18n-zh-CN
delete mode 120000 srcpkgs/icecat-i18n-zh-TW
delete mode 100644 srcpkgs/icecat/files/icecat-wayland
delete mode 100644 srcpkgs/icecat/files/icecat.desktop
delete mode 100644 srcpkgs/icecat/files/mozconfig
delete mode 100644 srcpkgs/icecat/files/stab.h
delete mode 100644 srcpkgs/icecat/files/vendor.js
delete mode 100644 srcpkgs/icecat/patches/big-endian-image-decoders.patch
delete mode 100644 srcpkgs/icecat/patches/fix-arm-opus-include.patch
delete mode 100644 srcpkgs/icecat/patches/fix-cross.patch
delete mode 100644 srcpkgs/icecat/patches/fix-desktop-icon-path.patch
delete mode 100644 srcpkgs/icecat/patches/fix-fortify-inline.patch
delete mode 100644 srcpkgs/icecat/patches/fix-i686-ppc-musl.patch
delete mode 100644 srcpkgs/icecat/patches/fix-image-format-warning.patch
delete mode 100644 srcpkgs/icecat/patches/fix-tools.patch
delete mode 100644 srcpkgs/icecat/patches/fix-wasm-arm.patch
delete mode 100644 srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch
delete mode 100644 srcpkgs/icecat/patches/flac-no-ffvpx.patch
delete mode 100644 srcpkgs/icecat/patches/mallinfo.patch
delete mode 100644 srcpkgs/icecat/patches/musl-rust.configure.patch
delete mode 100644 srcpkgs/icecat/patches/ppc32-fix-build.patch
delete mode 100644 srcpkgs/icecat/patches/rust-configure.patch
delete mode 100644 srcpkgs/icecat/patches/rust-has-i128.patch
delete mode 100644 srcpkgs/icecat/patches/sandbox-fork.patch
delete mode 100644 srcpkgs/icecat/patches/sandbox-largefile.patch
delete mode 100644 srcpkgs/icecat/patches/skia-sucks1.patch
delete mode 100644 srcpkgs/icecat/patches/skia-sucks2.patch
delete mode 100644 srcpkgs/icecat/patches/skia-sucks3.patch
delete mode 100644 srcpkgs/icecat/patches/sndio.patch
delete mode 100644 srcpkgs/icecat/template
delete mode 100644 srcpkgs/icecat/update
diff --git a/srcpkgs/icecat-i18n-ach b/srcpkgs/icecat-i18n-ach
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ach
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-af b/srcpkgs/icecat-i18n-af
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-af
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-an b/srcpkgs/icecat-i18n-an
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-an
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ar b/srcpkgs/icecat-i18n-ar
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ar
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ast b/srcpkgs/icecat-i18n-ast
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ast
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-az b/srcpkgs/icecat-i18n-az
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-az
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-be b/srcpkgs/icecat-i18n-be
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-be
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-bg b/srcpkgs/icecat-i18n-bg
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-bg
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-bn b/srcpkgs/icecat-i18n-bn
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-bn
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-br b/srcpkgs/icecat-i18n-br
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-br
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-bs b/srcpkgs/icecat-i18n-bs
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-bs
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ca b/srcpkgs/icecat-i18n-ca
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ca
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-cak b/srcpkgs/icecat-i18n-cak
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-cak
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-cs b/srcpkgs/icecat-i18n-cs
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-cs
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-cy b/srcpkgs/icecat-i18n-cy
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-cy
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-da b/srcpkgs/icecat-i18n-da
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-da
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-de b/srcpkgs/icecat-i18n-de
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-de
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-dsb b/srcpkgs/icecat-i18n-dsb
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-dsb
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-el b/srcpkgs/icecat-i18n-el
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-el
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-en-CA b/srcpkgs/icecat-i18n-en-CA
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-en-CA
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-en-GB b/srcpkgs/icecat-i18n-en-GB
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-en-GB
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-en-US b/srcpkgs/icecat-i18n-en-US
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-en-US
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-eo b/srcpkgs/icecat-i18n-eo
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-eo
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-es-AR b/srcpkgs/icecat-i18n-es-AR
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-es-AR
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-es-CL b/srcpkgs/icecat-i18n-es-CL
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-es-CL
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-es-ES b/srcpkgs/icecat-i18n-es-ES
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-es-ES
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-es-MX b/srcpkgs/icecat-i18n-es-MX
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-es-MX
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-et b/srcpkgs/icecat-i18n-et
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-et
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-eu b/srcpkgs/icecat-i18n-eu
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-eu
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-fa b/srcpkgs/icecat-i18n-fa
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-fa
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ff b/srcpkgs/icecat-i18n-ff
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ff
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-fi b/srcpkgs/icecat-i18n-fi
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-fi
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-fr b/srcpkgs/icecat-i18n-fr
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-fr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-fy-NL b/srcpkgs/icecat-i18n-fy-NL
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-fy-NL
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ga-IE b/srcpkgs/icecat-i18n-ga-IE
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ga-IE
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-gd b/srcpkgs/icecat-i18n-gd
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-gd
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-gl b/srcpkgs/icecat-i18n-gl
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-gl
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-gn b/srcpkgs/icecat-i18n-gn
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-gn
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-gu-IN b/srcpkgs/icecat-i18n-gu-IN
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-gu-IN
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-he b/srcpkgs/icecat-i18n-he
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-he
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hi-IN b/srcpkgs/icecat-i18n-hi-IN
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-hi-IN
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hr b/srcpkgs/icecat-i18n-hr
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-hr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hsb b/srcpkgs/icecat-i18n-hsb
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-hsb
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hu b/srcpkgs/icecat-i18n-hu
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-hu
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-hy-AM b/srcpkgs/icecat-i18n-hy-AM
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-hy-AM
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ia b/srcpkgs/icecat-i18n-ia
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ia
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-id b/srcpkgs/icecat-i18n-id
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-id
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-is b/srcpkgs/icecat-i18n-is
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-is
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-it b/srcpkgs/icecat-i18n-it
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-it
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ja b/srcpkgs/icecat-i18n-ja
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ja
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ka b/srcpkgs/icecat-i18n-ka
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ka
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-kab b/srcpkgs/icecat-i18n-kab
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-kab
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-kk b/srcpkgs/icecat-i18n-kk
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-kk
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-km b/srcpkgs/icecat-i18n-km
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-km
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-kn b/srcpkgs/icecat-i18n-kn
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-kn
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ko b/srcpkgs/icecat-i18n-ko
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ko
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-lij b/srcpkgs/icecat-i18n-lij
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-lij
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-lt b/srcpkgs/icecat-i18n-lt
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-lt
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-lv b/srcpkgs/icecat-i18n-lv
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-lv
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-mk b/srcpkgs/icecat-i18n-mk
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-mk
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-mr b/srcpkgs/icecat-i18n-mr
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-mr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ms b/srcpkgs/icecat-i18n-ms
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ms
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-my b/srcpkgs/icecat-i18n-my
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-my
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-nb-NO b/srcpkgs/icecat-i18n-nb-NO
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-nb-NO
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ne-NP b/srcpkgs/icecat-i18n-ne-NP
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ne-NP
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-nl b/srcpkgs/icecat-i18n-nl
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-nl
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-nn-NO b/srcpkgs/icecat-i18n-nn-NO
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-nn-NO
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-oc b/srcpkgs/icecat-i18n-oc
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-oc
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-pa-IN b/srcpkgs/icecat-i18n-pa-IN
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-pa-IN
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-pl b/srcpkgs/icecat-i18n-pl
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-pl
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-pt-BR b/srcpkgs/icecat-i18n-pt-BR
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-pt-BR
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-pt-PT b/srcpkgs/icecat-i18n-pt-PT
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-pt-PT
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-rm b/srcpkgs/icecat-i18n-rm
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-rm
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ro b/srcpkgs/icecat-i18n-ro
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ro
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ru b/srcpkgs/icecat-i18n-ru
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ru
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-si b/srcpkgs/icecat-i18n-si
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-si
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sk b/srcpkgs/icecat-i18n-sk
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-sk
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sl b/srcpkgs/icecat-i18n-sl
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-sl
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-son b/srcpkgs/icecat-i18n-son
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-son
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sq b/srcpkgs/icecat-i18n-sq
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-sq
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sr b/srcpkgs/icecat-i18n-sr
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-sr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-sv-SE b/srcpkgs/icecat-i18n-sv-SE
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-sv-SE
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ta b/srcpkgs/icecat-i18n-ta
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ta
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-te b/srcpkgs/icecat-i18n-te
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-te
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-th b/srcpkgs/icecat-i18n-th
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-th
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-tr b/srcpkgs/icecat-i18n-tr
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-tr
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-uk b/srcpkgs/icecat-i18n-uk
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-uk
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-ur b/srcpkgs/icecat-i18n-ur
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-ur
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-uz b/srcpkgs/icecat-i18n-uz
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-uz
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-vi b/srcpkgs/icecat-i18n-vi
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-vi
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-xh b/srcpkgs/icecat-i18n-xh
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-xh
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-zh-CN b/srcpkgs/icecat-i18n-zh-CN
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-zh-CN
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat-i18n-zh-TW b/srcpkgs/icecat-i18n-zh-TW
deleted file mode 120000
index 7659ab69f6a..00000000000
--- a/srcpkgs/icecat-i18n-zh-TW
+++ /dev/null
@@ -1 +0,0 @@
-icecat
\ No newline at end of file
diff --git a/srcpkgs/icecat/files/icecat-wayland b/srcpkgs/icecat/files/icecat-wayland
deleted file mode 100644
index ca6010f3044..00000000000
--- a/srcpkgs/icecat/files/icecat-wayland
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec env MOZ_ENABLE_WAYLAND= /usr/lib/icecat/icecat "$@"
diff --git a/srcpkgs/icecat/files/icecat.desktop b/srcpkgs/icecat/files/icecat.desktop
deleted file mode 100644
index 5bc7c6c8698..00000000000
--- a/srcpkgs/icecat/files/icecat.desktop
+++ /dev/null
@@ -1,116 +0,0 @@
-[Desktop Entry]
-Name=GNU-IceCat
-GenericName=GNU Web Browser
-GenericName[af]=GNU Web Blaaier
-GenericName[ar]=GNU متصفح ويب
-GenericName[az]=GNU Veb Səyyahı
-GenericName[bg]=GNU Браузър
-GenericName[bn]=GNU ওয়েব ব্রাউজার
-GenericName[br]=GNU Furcher ar Gwiad
-GenericName[bs]=GNU WWW Preglednik
-GenericName[ca]=GNU Fullejador web
-GenericName[cs]=GNU WWW prohlížeč
-GenericName[cy]=GNU Porydd Gwe
-GenericName[da]=GNU Browser
-GenericName[de]=GNU Web-Browser
-GenericName[el]=GNU Περιηγητής Ιστού
-GenericName[eo]=GNU TTT-legilo
-GenericName[es]=GNU Navegador web
-GenericName[et]=GNU Veebilehitseja
-GenericName[eu]=GNU Web arakatzailea
-GenericName[fa]=GNU مرورگر وب
-GenericName[fi]=GNU WWW-selain
-GenericName[fo]=GNU Alnótsfar
-GenericName[fr]=GNU Navigateur web
-GenericName[gl]=GNU Navegador Web
-GenericName[he]=GNU דפדפן אינטרנט
-GenericName[hi]=GNU वेब ब्राउज़र
-GenericName[hr]=GNU Web preglednik
-GenericName[hu]=GNU Webböngésző
-GenericName[is]=GNU Vafri
-GenericName[it]=GNU Browser Web
-GenericName[ja]=GNU ウェブブラウザ
-GenericName[ko]=GNU 웹 브라우저
-GenericName[lo]=GNU ເວັບບຣາວເຊີ
-GenericName[lt]=GNU Žiniatinklio naršyklė
-GenericName[lv]=GNU Web Pārlūks
-GenericName[mk]=GNU Прелистувач на Интернет
-GenericName[mn]=GNU Веб-Хөтөч
-GenericName[nb]=GNU Nettleser
-GenericName[nds]=GNU Nettkieker
-GenericName[nl]=GNU Webbrowser
-GenericName[nn]=GNU Nettlesar
-GenericName[nso]=GNU Seinyakisi sa Web
-GenericName[pa]=GNU ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=GNU Przeglądarka WWW
-GenericName[pt]=GNU Navegador Web
-GenericName[pt_BR]=GNU Navegador Web
-GenericName[ro]=GNU Navigator de web
-GenericName[ru]=GNU Веб-браузер
-GenericName[se]=GNU Fierpmádatlogan
-GenericName[sk]=GNU Webový prehliadač
-GenericName[sl]=GNU Spletni brskalnik
-GenericName[sr]=GNU Веб претраживач
-GenericName[sr@Latn]=GNU Veb pretraživač
-GenericName[ss]=GNU Ibrawuza yeWeb
-GenericName[sv]=GNU Webbläsare
-GenericName[ta]=GNU வலை உலாவி
-GenericName[tg]=GNU Тафсиргари вэб
-GenericName[th]=GNU เว็บบราวเซอร์
-GenericName[tr]=GNU Web Tarayıcı
-GenericName[uk]=GNU Навігатор Тенет
-GenericName[uz]=GNU Веб-браузер
-GenericName[ven]=GNU Buronza ya Webu
-GenericName[vi]=GNU Trình duyệt Web
-GenericName[wa]=GNU Betchteu waibe
-GenericName[xh]=GNU Umkhangeli zincwadi we Web
-GenericName[zh_CN]=GNU 网页浏览器
-GenericName[zh_TW]=GNU 網頁瀏覽器
-GenericName[zu]=GNU Umcingi we-Web
-Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
-Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
-Comment[sv]=Surfa på webben
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
-Exec=icecat %u
-Icon=icecat
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
diff --git a/srcpkgs/icecat/files/mozconfig b/srcpkgs/icecat/files/mozconfig
deleted file mode 100644
index 708ee9eded9..00000000000
--- a/srcpkgs/icecat/files/mozconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-icu
-# XXX: the system's libpng doesn't have APNG support
-ac_add_options --without-system-png
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-ffi
-
-nspr_config_args="
- --libdir=${XBPS_CROSS_BASE}/usr/lib
- --includedir=${XBPS_CROSS_BASE}/usr/include/nspr"
-
-nss_config_args="
- --libdir=${XBPS_CROSS_BASE}/usr/lib
- --includedir=${XBPS_CROSS_BASE}/usr/include/nss"
-
-ac_add_options --disable-tests
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-install-strip
-ac_add_options --disable-strip
-ac_add_options --disable-profiling
-ac_add_options --enable-release
-ac_add_options --enable-optimize="$CFLAGS"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-application=browser
-ac_add_options --allow-addon-sideload
diff --git a/srcpkgs/icecat/files/stab.h b/srcpkgs/icecat/files/stab.h
deleted file mode 100644
index 6f70af39897..00000000000
--- a/srcpkgs/icecat/files/stab.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $OpenBSD: stab.h,v 1.3 2003/06/02 19:34:12 millert Exp $ */
-/* $NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $ */
-
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)stab.h 5.2 (Berkeley) 4/4/91
- */
-
-#ifndef _STAB_H_
-#define _STAB_H_
-
-/*
- * The following are symbols used by various debuggers and by the Pascal
- * compiler. Each of them must have one (or more) of the bits defined by
- * the N_STAB mask set.
- */
-
-#define N_GSYM 0x20 /* global symbol */
-#define N_FNAME 0x22 /* F77 function name */
-#define N_FUN 0x24 /* procedure name */
-#define N_STSYM 0x26 /* data segment variable */
-#define N_LCSYM 0x28 /* bss segment variable */
-#define N_MAIN 0x2a /* main function name */
-#define N_PC 0x30 /* global Pascal symbol */
-#define N_RSYM 0x40 /* register variable */
-#define N_SLINE 0x44 /* text segment line number */
-#define N_DSLINE 0x46 /* data segment line number */
-#define N_BSLINE 0x48 /* bss segment line number */
-#define N_SSYM 0x60 /* structure/union element */
-#define N_SO 0x64 /* main source file name */
-#define N_LSYM 0x80 /* stack variable */
-#define N_BINCL 0x82 /* include file beginning */
-#define N_SOL 0x84 /* included source file name */
-#define N_PSYM 0xa0 /* parameter variable */
-#define N_EINCL 0xa2 /* include file end */
-#define N_ENTRY 0xa4 /* alternate entry point */
-#define N_LBRAC 0xc0 /* left bracket */
-#define N_EXCL 0xc2 /* deleted include file */
-#define N_RBRAC 0xe0 /* right bracket */
-#define N_BCOMM 0xe2 /* begin common */
-#define N_ECOMM 0xe4 /* end common */
-#define N_ECOML 0xe8 /* end common (local name) */
-#define N_LENG 0xfe /* length of preceding entry */
-
-#endif /* !_STAB_H_ */
diff --git a/srcpkgs/icecat/files/vendor.js b/srcpkgs/icecat/files/vendor.js
deleted file mode 100644
index d8d606bc15d..00000000000
--- a/srcpkgs/icecat/files/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
diff --git a/srcpkgs/icecat/patches/big-endian-image-decoders.patch b/srcpkgs/icecat/patches/big-endian-image-decoders.patch
deleted file mode 100644
index ccb417b61f1..00000000000
--- a/srcpkgs/icecat/patches/big-endian-image-decoders.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1626236
-https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
-
-# HG changeset patch
-# User msirringhaus@suse.de
-# Date 1582805876 -3600
-# Thu Feb 27 13:17:56 2020 +0100
-# Node ID cc3d09abea31068e57f1ab918782f9f86fc6a158
-# Parent 9cd90914846f667f18babc491a74c164ae5d6e9f
-imported patch decoder_workaround.patch
-
-diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
---- image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100
-@@ -422,6 +422,9 @@
- MOZ_ASSERT(mSwizzleFn);
- uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
- mSwizzleFn(data, data, aColors);
-+#if MOZ_BIG_ENDIAN()
-+ SwizzleRow(SurfaceFormat::A8R8G8B8, SurfaceFormat::B8G8R8A8)(data, data, aColors);
-+#endif
- }
-
- LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
-diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
---- image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
-@@ -263,6 +263,9 @@
- case JCS_YCbCr:
- // By default, we will output directly to BGRA. If we need to apply
- // special color transforms, this may change.
-+#if MOZ_BIG_ENDIAN()
-+ mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
-+#else
- switch (SurfaceFormat::OS_RGBX) {
- case SurfaceFormat::B8G8R8X8:
- mInfo.out_color_space = JCS_EXT_BGRX;
-@@ -277,6 +280,7 @@
- mState = JPEG_ERROR;
- return Transition::TerminateFailure();
- }
-+#endif
- break;
- case JCS_CMYK:
- case JCS_YCCK:
-diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
---- image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
-@@ -361,7 +361,7 @@
- IResumable* aOnResume) {
- MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
-
-- return mLexer.Lex(aIterator, aOnResume,
-+ LexerResult res = mLexer.Lex(aIterator, aOnResume,
- [=](State aState, const char* aData, size_t aLength) {
- switch (aState) {
- case State::PNG_DATA:
-@@ -371,6 +371,14 @@
- }
- MOZ_CRASH("Unknown State");
- });
-+
-+#if MOZ_BIG_ENDIAN()
-+ if(res.is<TerminalState>() && res.as<TerminalState>() == TerminalState::SUCCESS) {
-+ NativeEndian::swapToLittleEndianInPlace<uint32_t>((uint32_t*)(mImageData), mImageDataLength / 4);
-+ }
-+#endif
-+
-+ return res;
- }
-
- LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
-diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
---- image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
-@@ -237,7 +237,12 @@
- // WebP doesn't guarantee that the alpha generated matches the hint in the
- // header, so we always need to claim the input is BGRA. If the output is
- // BGRX, swizzling will mask off the alpha channel.
-+#if MOZ_BIG_ENDIAN()
-+ mBuffer.colorspace = MODE_ARGB;
-+ SurfaceFormat inFormat = mFormat;
-+#else
- SurfaceFormat inFormat = SurfaceFormat::OS_RGBA;
-+#endif
-
- SurfacePipeFlags pipeFlags = SurfacePipeFlags();
- if (mFormat == SurfaceFormat::OS_RGBA &&
diff --git a/srcpkgs/icecat/patches/fix-arm-opus-include.patch b/srcpkgs/icecat/patches/fix-arm-opus-include.patch
deleted file mode 100644
index 6e0c5875da3..00000000000
--- a/srcpkgs/icecat/patches/fix-arm-opus-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/libopus/silk/arm/arm_silk_map.c.orig 2019-03-19 20:55:01.249609964 +0100
-+++ media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100
-@@ -28,7 +28,7 @@
- # include "config.h"
- #endif
-
--#include "main_FIX.h"
-+#include "../fixed/main_FIX.h"
- #include "NSQ.h"
- #include "SigProc_FIX.h"
-
diff --git a/srcpkgs/icecat/patches/fix-cross.patch b/srcpkgs/icecat/patches/fix-cross.patch
deleted file mode 100644
index 9b8a816d269..00000000000
--- a/srcpkgs/icecat/patches/fix-cross.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-terrible hack to fix cross builds
-overwrite HOST_* flags to get rid of -MF
-
-note: this patch was used from firefox-77 until 80, dropped with the update to 81
-
---- third_party/rust/glslopt/build.rs
-+++ third_party/rust/glslopt/build.rs
-@@ -28,6 +28,8 @@
- env::remove_var(format!("CXXFLAGS_{}", &target));
- env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
- env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
-+ env::set_var("HOST_CFLAGS", "-O2");
-+ env::set_var("HOST_CXXFLAGS", "-O2");
-
- configure(&mut cc::Build::new())
- .warnings(false)
diff --git a/srcpkgs/icecat/patches/fix-desktop-icon-path.patch b/srcpkgs/icecat/patches/fix-desktop-icon-path.patch
deleted file mode 100644
index c2c34db5377..00000000000
--- a/srcpkgs/icecat/patches/fix-desktop-icon-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- taskcluster/docker/icecat-snap/icecat.desktop.orig 2019-01-18 19:31:39.428839442 +0100
-+++ taskcluster/docker/icecat-snap/icecat.desktop 2019-01-18 19:32:20.689063456 +0100
-@@ -154,7 +154,7 @@
- Terminal=false
- X-MultipleArgs=false
- Type=Application
--Icon=/browser/chrome/icons/default/default128.png
-+Icon=icecat
- Categories=GNOME;GTK;Network;WebBrowser;
- MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
- StartupNotify=true
diff --git a/srcpkgs/icecat/patches/fix-fortify-inline.patch b/srcpkgs/icecat/patches/fix-fortify-inline.patch
deleted file mode 100644
index c1190197d32..00000000000
--- a/srcpkgs/icecat/patches/fix-fortify-inline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-+++ media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-@@ -27,8 +27,5 @@
- typedef int16_t int16;
- typedef unsigned short ushort;
- typedef unsigned long ulong;
--#ifndef __GNUC_STDC_INLINE__
--#define inline
--#endif
-
- #endif /* _SDP_OS_DEFS_H_ */
diff --git a/srcpkgs/icecat/patches/fix-i686-ppc-musl.patch b/srcpkgs/icecat/patches/fix-i686-ppc-musl.patch
deleted file mode 100644
index 6df609bbf16..00000000000
--- a/srcpkgs/icecat/patches/fix-i686-ppc-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200
-+++ mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
- #endif
-
--#if (defined(linux) && \
-+#if defined(__GLIBC__) && (defined(linux) && \
- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
- defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
diff --git a/srcpkgs/icecat/patches/fix-image-format-warning.patch b/srcpkgs/icecat/patches/fix-image-format-warning.patch
deleted file mode 100644
index 9b3b38d9065..00000000000
--- a/srcpkgs/icecat/patches/fix-image-format-warning.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1462463631 14400
-# Thu May 05 11:53:51 2016 -0400
-# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
-# Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
-handle big-endian formats in Cairo format conversions
-
---- gfx/2d/HelpersCairo.h
-+++ gfx/2d/HelpersCairo.h
-@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
- case SurfaceFormat::R5G6B5_UINT16:
- return CAIRO_FORMAT_RGB16_565;
- default:
-- gfxCriticalError() << "Unknown image format " << (int)format;
-+ // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
-+ // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
-+ // See bug 1269654
-+ if (format == SurfaceFormat::B8G8R8X8) {
-+ return CAIRO_FORMAT_RGB24;
-+ } else if (format != SurfaceFormat::B8G8R8A8) {
-+ gfxCriticalError() << "Unknown image format " << (int)format;
-+ }
- return CAIRO_FORMAT_ARGB32;
- }
- }
-@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
- case SurfaceFormat::A8:
- return CAIRO_CONTENT_ALPHA;
- default:
-- gfxCriticalError() << "Unknown image content format " << (int)format;
-+ if (format == SurfaceFormat::B8G8R8X8) {
-+ return CAIRO_CONTENT_COLOR;
-+ } else if (format != SurfaceFormat::B8G8R8A8) {
-+ gfxCriticalError() << "Unknown image content format " << (int)format;
-+ }
- return CAIRO_CONTENT_COLOR_ALPHA;
- }
- }
diff --git a/srcpkgs/icecat/patches/fix-tools.patch b/srcpkgs/icecat/patches/fix-tools.patch
deleted file mode 100644
index 1af39bc6118..00000000000
--- a/srcpkgs/icecat/patches/fix-tools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/profiler/core/platform-linux-android.cpp.orig 2019-01-29 12:09:40.980448579 +0100
-+++ tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100
-@@ -497,8 +501,10 @@
- ucontext_t sSyncUContext;
-
- void Registers::SyncPopulate() {
-+#if defined(__GLIBC__)
- if (!getcontext(&sSyncUContext)) {
- PopulateRegsFromContext(*this, &sSyncUContext);
- }
-+#endif
- }
- #endif
diff --git a/srcpkgs/icecat/patches/fix-wasm-arm.patch b/srcpkgs/icecat/patches/fix-wasm-arm.patch
deleted file mode 100644
index e6ad61c9f44..00000000000
--- a/srcpkgs/icecat/patches/fix-wasm-arm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- js/src/wasm/WasmSignalHandlers.cpp
-+++ js/src/wasm/WasmSignalHandlers.cpp
-@@ -243,9 +243,9 @@
- // If you run into compile problems on a tier-3 platform, you can disable the
- // emulation here.
-
--#if defined(__linux__) && defined(__arm__)
--# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#endif
-+// #if defined(__linux__) && defined(__arm__)
-+// # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-+// #endif
-
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
- # include <sys/user.h>
diff --git a/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch b/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch
deleted file mode 100644
index cf895dd8448..00000000000
--- a/srcpkgs/icecat/patches/fix-webrtc-glibcisms.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2019-01-29 11:20:52.298793223 +0100
-+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100
-@@ -14,7 +14,7 @@
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(a, b) 0
- #endif
--#if __GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
- #include <sys/auxv.h>
- #else
- #include <fcntl.h>
-@@ -32,7 +32,7 @@
- int architecture = 0;
- unsigned long hwcap = 0;
- const char* platform = NULL;
--#if __GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
- hwcap = getauxval(AT_HWCAP);
- platform = (const char*)getauxval(AT_PLATFORM);
- #else
diff --git a/srcpkgs/icecat/patches/flac-no-ffvpx.patch b/srcpkgs/icecat/patches/flac-no-ffvpx.patch
deleted file mode 100644
index e3f60e8ecf6..00000000000
--- a/srcpkgs/icecat/patches/flac-no-ffvpx.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Enable FLAC on platforms without ffvpx like powerpc*
-
-diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
-index 53fc3c9937f7..b23771ab80fa 100644
---- dom/media/flac/FlacDecoder.cpp
-+++ dom/media/flac/FlacDecoder.cpp
-@@ -7,6 +7,7 @@
- #include "FlacDecoder.h"
- #include "MediaContainerType.h"
- #include "mozilla/StaticPrefs_media.h"
-+#include "PDMFactory.h"
-
- namespace mozilla {
-
-@@ -14,6 +15,11 @@ namespace mozilla {
- bool FlacDecoder::IsEnabled() {
- #ifdef MOZ_FFVPX
- return StaticPrefs::media_flac_enabled();
-+#elif defined(MOZ_FFMPEG)
-+ RefPtr<PDMFactory> platform = new PDMFactory();
-+ return StaticPrefs::media_flac_enabled() &&
-+ platform->SupportsMimeType("audio/flac"_ns,
-+ /* DecoderDoctorDiagnostics* */ nullptr);
- #else
- // Until bug 1295886 is fixed.
- return false;
diff --git a/srcpkgs/icecat/patches/mallinfo.patch b/srcpkgs/icecat/patches/mallinfo.patch
deleted file mode 100644
index afea86c0a2c..00000000000
--- a/srcpkgs/icecat/patches/mallinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- xpcom/base/nsMemoryReporterManager.cpp.orig 2019-03-19 17:12:20.844810044 +0100
-+++ xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100
-@@ -123,6 +123,7 @@
- return GetProcSelfSmapsPrivate(aN);
- }
-
-+#ifdef __GLIBC__
- # ifdef HAVE_MALLINFO
- # define HAVE_SYSTEM_HEAP_REPORTER 1
- static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) {
-@@ -142,6 +143,7 @@
- return NS_OK;
- }
- # endif
-+#endif // __GLIBC__
-
- #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
- defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
-@@ -642,6 +644,7 @@
- return NS_OK;
- }
-
-+#ifdef __GLIBC__
- # define HAVE_SYSTEM_HEAP_REPORTER 1
- // Windows can have multiple separate heaps. During testing there were multiple
- // heaps present but the non-default ones had sizes no more than a few 10s of
-@@ -698,6 +701,7 @@
- *aSizeOut = heapsSize;
- return NS_OK;
- }
-+#endif // __GLIBC__
-
- struct SegmentKind {
- DWORD mState;
diff --git a/srcpkgs/icecat/patches/musl-rust.configure.patch b/srcpkgs/icecat/patches/musl-rust.configure.patch
deleted file mode 100644
index d8f387136e0..00000000000
--- a/srcpkgs/icecat/patches/musl-rust.configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
-+++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
-@@ -297,11 +297,20 @@
- suffix = 'hf'
- else:
- suffix = ''
-+
-+ narrowed = []
- for p in prefixes:
- for c in candidates:
-- if c.rust_target.startswith('{}-'.format(p)) and \
-- c.rust_target.endswith(suffix):
-- return c.rust_target
-+ if c.rust_target.startswith('{}-'.format(p)):
-+ narrowed.append(c.rust_target)
-+
-+ for target in narrowed:
-+ if target.endswith(host_or_target.raw_os):
-+ return target
-+
-+ for target in narrowed:
-+ if target.endswith(suffix):
-+ return target
-
- # See if we can narrow down on the exact alias
- narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/icecat/patches/ppc32-fix-build.patch b/srcpkgs/icecat/patches/ppc32-fix-build.patch
deleted file mode 100644
index c1a8f422d0a..00000000000
--- a/srcpkgs/icecat/patches/ppc32-fix-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This is not a complete/correct patch, but it makes firefox build. For now
-mostly for tracking, so a real fix can be made, but right now it still
-segfaults on start.
-
-Ref: https://hg.mozilla.org/mozilla-central/rev/08339a56f3ae
-Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60
-Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e
-Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
-
---- xpcom/reflect/xptcall/xptcall.h
-+++ xpcom/reflect/xptcall/xptcall.h
-@@ -71,6 +71,11 @@ struct nsXPTCVariant {
- ExtendedVal ext;
- };
-
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-+ // this field is still necessary on ppc32, as an address
-+ // to it is taken certain places in xptcall
-+ void *ptr;
-+#endif
- nsXPTType type;
- uint8_t flags;
-
-@@ -91,7 +96,12 @@ struct nsXPTCVariant {
- };
-
- void ClearFlags() { flags = 0; }
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-+ void SetIndirect() { ptr = &val; flags |= IS_INDIRECT; }
-+ bool IsPtrData() const { return IsIndirect(); }
-+#else
- void SetIndirect() { flags |= IS_INDIRECT; }
-+#endif
-
- bool IsIndirect() const { return 0 != (flags & IS_INDIRECT); }
-
diff --git a/srcpkgs/icecat/patches/rust-configure.patch b/srcpkgs/icecat/patches/rust-configure.patch
deleted file mode 100644
index 887c102bc55..00000000000
--- a/srcpkgs/icecat/patches/rust-configure.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Mozilla rustc check does not support crossbuild: let's remove it
-Remove calls to unwrap_rustup, they fail if rustup isn't present
-
---- build/moz.configure/rust.configure.orig 2019-10-17 04:19:59.000000000 +0700
-+++ build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700
-@@ -78,9 +78,6 @@
-
- return unwrap
-
--rustc = unwrap_rustup(rustc, 'rustc')
--cargo = unwrap_rustup(cargo, 'cargo')
--
-
- set_config('CARGO', cargo)
- set_config('RUSTC', rustc)
-@@ -348,26 +345,6 @@
-
- os.write(in_fd, source)
- os.close(in_fd)
--
-- cmd = [
-- rustc,
-- '--crate-type', 'staticlib',
-- target_arg,
-- '-o', out_path,
-- in_path,
-- ]
--
-- def failed():
-- die(dedent('''\
-- Cannot compile for {} with {}
-- The target may be unsupported, or you may not have
-- a rust std library for that target installed. Try:
--
-- rustup target add {}
-- '''.format(host_or_target.alias, rustc, rustc_target)))
-- check_cmd_output(*cmd, onerror=failed)
-- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
-- failed()
- finally:
- os.remove(in_path)
- os.remove(out_path)
diff --git a/srcpkgs/icecat/patches/rust-has-i128.patch b/srcpkgs/icecat/patches/rust-has-i128.patch
deleted file mode 100644
index 4c90cd3d106..00000000000
--- a/srcpkgs/icecat/patches/rust-has-i128.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-The configure check fails for cross builds.
-i128 is supported since rust-1.26, so it is safe for us to assume it is always present
-
---- third_party/rust/num-traits/build.rs.orig 2020-02-14 23:57:25.985355610 +0100
-+++ third_party/rust/num-traits/build.rs 2020-02-14 23:58:36.255710188 +0100
-@@ -1,14 +1,5 @@
--extern crate autocfg;
--
--use std::env;
--
- fn main() {
-- let ac = autocfg::new();
-- if ac.probe_type("i128") {
-- println!("cargo:rustc-cfg=has_i128");
-- } else if env::var_os("CARGO_FEATURE_I128").is_some() {
-- panic!("i128 support was not detected!");
-- }
-+ println!("cargo:rustc-cfg=has_i128");
-
- autocfg::rerun_path("build.rs");
- }
diff --git a/srcpkgs/icecat/patches/sandbox-fork.patch b/srcpkgs/icecat/patches/sandbox-fork.patch
deleted file mode 100644
index 72640cb7f70..00000000000
--- a/srcpkgs/icecat/patches/sandbox-fork.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-make SYS_fork non-fatal, musl uses it for fork(2)
-
---- security/sandbox/linux/SandboxFilter.cpp
-+++ security/sandbox/linux/SandboxFilter.cpp
-@@ -1253,6 +1253,8 @@
- // usually do something reasonable on error.
- case __NR_clone:
- return ClonePolicy(Error(EPERM));
-+ case __NR_fork:
-+ return Error(ENOSYS);
-
- # ifdef __NR_fadvise64
- case __NR_fadvise64:
diff --git a/srcpkgs/icecat/patches/sandbox-largefile.patch b/srcpkgs/icecat/patches/sandbox-largefile.patch
deleted file mode 100644
index 494ca82df5a..00000000000
--- a/srcpkgs/icecat/patches/sandbox-largefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100
-+++ security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100
-@@ -68,7 +68,13 @@
-
- // The headers define O_LARGEFILE as 0 on x86_64, but we need the
- // actual value because it shows up in file flags.
--#define O_LARGEFILE_REAL 00100000
-+#if defined(__x86_64__) || defined(__i386__) || defined(__mips__)
-+#define O_LARGEFILE_REAL 0100000
-+#elif defined(__powerpc__)
-+#define O_LARGEFILE_REAL 0200000
-+#else
-+#define O_LARGEFILE_REAL O_LARGEFILE
-+#endif
-
- // Not part of UAPI, but userspace sees it in F_GETFL; see bug 1650751.
- #define FMODE_NONOTIFY 0x4000000
diff --git a/srcpkgs/icecat/patches/skia-sucks1.patch b/srcpkgs/icecat/patches/skia-sucks1.patch
deleted file mode 100644
index 05ad34a3fc3..00000000000
--- a/srcpkgs/icecat/patches/skia-sucks1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
-https://bugzilla.mozilla.org/attachment.cgi?id=9028600
-
---- gfx/skia/skia/third_party/skcms/skcms.cc
-+++ gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -30,6 +30,8 @@
- #include <avx512fintrin.h>
- #include <avx512dqintrin.h>
- #endif
-+#elif defined(__BIG_ENDIAN__)
-+ #define SKCMS_PORTABLE
- #endif
-
- // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
-@@ -280,20 +282,28 @@ enum {
- static uint16_t read_big_u16(const uint8_t* ptr) {
- uint16_t be;
- memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
-- return _byteswap_ushort(be);
-+#if defined(__BIG_ENDIAN__)
-+ return be;
- #else
-+ #if defined(_MSC_VER)
-+ return _byteswap_ushort(be);
-+ #else
- return __builtin_bswap16(be);
-+ #endif
- #endif
- }
-
- static uint32_t read_big_u32(const uint8_t* ptr) {
- uint32_t be;
- memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
-- return _byteswap_ulong(be);
-+#if defined(__BIG_ENDIAN__)
-+ return be;
- #else
-+ #if defined(_MSC_VER)
-+ return _byteswap_ulong(be);
-+ #else
- return __builtin_bswap32(be);
-+ #endif
- #endif
- }
-
---- gfx/2d/DrawTargetSkia.cpp
-+++ gfx/2d/DrawTargetSkia.cpp
-@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
- return surfaceBounds.Intersect(bounds);
- }
-
--static const int kARGBAlphaOffset =
-- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
-+static const int kARGBAlphaOffset = 0;
-
- static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
- const int32_t aStride, SurfaceFormat aFormat) {
---- gfx/2d/Types.h
-+++ gfx/2d/Types.h
-@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
--#if MOZ_LITTLE_ENDIAN()
- A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
- X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
--#elif MOZ_BIG_ENDIAN()
-- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
-- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB
--#else
--# error "bad endianness"
--#endif
-
- // The following values are OS and endian-independent synonyms.
- //
diff --git a/srcpkgs/icecat/patches/skia-sucks2.patch b/srcpkgs/icecat/patches/skia-sucks2.patch
deleted file mode 100644
index 207b3cf6733..00000000000
--- a/srcpkgs/icecat/patches/skia-sucks2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# HG changeset patch
-# Parent aecb4600e5da17443b224c79eee178c1d8e155e3
-For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
-right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
-
-diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
---- gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200
-+++ gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200
-@@ -238,7 +238,18 @@
- AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
- AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
-
-+ // On Big endian the commented out variant doesn't work,
-+ // and honestly, I have no idea why it exists in the first place.
-+ // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
-+ // which gets a 64-bit integer, and FromBits returns 32-bit,
-+ // cutting off the wrong half again.
-+ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
-+ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
-+#ifdef SK_CPU_BENDIAN
-+ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
-+#else
- AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
-+#endif
- AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
- AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
-
-diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
---- gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200
-+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200
-@@ -203,7 +203,13 @@
- // ~~~>
- // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
- // c = 0*aa + d(1-1*aa) = d(1-aa)
-+
-+ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
-+#ifdef SK_CPU_BENDIAN
-+ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
-+#else
- return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
-+#endif
- + d.approxMulDiv255(aa.inv());
- };
- while (h --> 0) {
diff --git a/srcpkgs/icecat/patches/skia-sucks3.patch b/srcpkgs/icecat/patches/skia-sucks3.patch
deleted file mode 100644
index f4e890f0536..00000000000
--- a/srcpkgs/icecat/patches/skia-sucks3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-CompositableHost.cpp patch added by @q66, based on patch in issue 1602730.
-
-# HG changeset patch
-# Parent 46ea866ca3acb8bb5e1709ceb799b9c94f591dec
-Problem description: Tab-titles that are too long to fit into a tab get faded out.
- On big endian this is broken and instead of fading out, the
- tab gets white and the font transparent, leading to an unreadable
- tab-title
-Solution: This is not a real solution, but a hack. The real solution would have been
- to byte-swap the correct buffer, but I could not find it.
- So the next best thing is to deactivate the fading-effect. Now all tab-titles
- are readable, albeit not as pretty to look at as they could be.
-Side-effects: I have not yet found an unwanted side-effect.
-
-diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
---- gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200
-+++ gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100
-@@ -1861,6 +1861,14 @@
- SkCanvas::kPreserveLCDText_SaveLayerFlag |
- (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
-
-+#if MOZ_BIG_ENDIAN()
-+ // Pushing a layer where an aMask is defined produces wrong output.
-+ // We _should_ endian swap the data, but I couldn't find a workable way to do so
-+ // Therefore I deactivate those layers in the meantime.
-+ // The result is: Tab-titles that are longer than the available space should be faded out.
-+ // The fading doesn't work, so we deactivate the fading-effect here.
-+ if (!aMask)
-+#endif
- mCanvas->saveLayer(saveRec);
-
- SetPermitSubpixelAA(aOpaque);
---- gfx/layers/composite/CompositableHost.cpp
-+++ gfx/layers/composite/CompositableHost.cpp
-@@ -13,6 +13,7 @@
- #include "ImageHost.h" // for ImageHostBuffered, etc
- #include "Layers.h"
- #include "TiledContentHost.h" // for TiledContentHost
-+#include "mozilla/EndianUtils.h"
- #include "mozilla/gfx/gfxVars.h"
- #include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
- #include "mozilla/layers/TextureHost.h" // for TextureHost, etc
-@@ -92,9 +93,13 @@ bool CompositableHost::AddMaskEffect(EffectChain& aEffects,
- }
- MOZ_ASSERT(source);
-
-+ // Setting an alpha-mask here breaks the URL-bar on big endian (s390x)
-+ // if the typed URL is too long for the textbox (automatic scrolling needed)
-+#if MOZ_LITTLE_ENDIAN()
- RefPtr<EffectMask> effect =
- new EffectMask(source, source->GetSize(), aTransform);
- aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;
-+#endif
- return true;
- }
-
diff --git a/srcpkgs/icecat/patches/sndio.patch b/srcpkgs/icecat/patches/sndio.patch
deleted file mode 100644
index c5e5c486dd1..00000000000
--- a/srcpkgs/icecat/patches/sndio.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- old-configure.in.orig
-+++ old-configure.in
-@@ -2818,6 +2818,22 @@
- _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
- fi
-
-+dnl ==================================
-+dnl = Check sndio availability
-+dnl ==================================
-+
-+MOZ_ARG_ENABLE_BOOL(sndio,
-+[ --enable-sndio Enable sndio support],
-+ MOZ_SNDIO=1,
-+ MOZ_SNDIO=)
-+
-+if test -n "$MOZ_SNDIO"; then
-+ MOZ_SNDIO_LIBS="-lsndio"
-+ AC_SUBST_LIST(MOZ_SNDIO_LIBS)
-+fi
-+
-+AC_SUBST(MOZ_SNDIO)
-+
- dnl ========================================================
- dnl =
- dnl = Maintainer debug option (no --enable equivalent)
---- media/libcubeb/src/moz.build.orig
-+++ media/libcubeb/src/moz.build
-@@ -44,11 +44,13 @@
- ]
- DEFINES['USE_JACK'] = True
-
--if CONFIG['OS_ARCH'] == 'OpenBSD':
-+if CONFIG['MOZ_SNDIO']:
- SOURCES += [
- 'cubeb_sndio.c',
- ]
- DEFINES['USE_SNDIO'] = True
-+
-+if CONFIG['OS_ARCH'] == 'OpenBSD':
- DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
-
- if CONFIG['OS_TARGET'] == 'Darwin':
---- build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200
-+++ - 2020-06-30 12:18:26.027756310 +0200
-@@ -210,6 +210,7 @@
- @old_configure_options(
- '--cache-file',
- '--datadir',
-+ '--enable-sndio',
- '--enable-crashreporter',
- '--enable-dbus',
- '--enable-debug-js-modules',
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
deleted file mode 100644
index 450250fe7fd..00000000000
--- a/srcpkgs/icecat/template
+++ /dev/null
@@ -1,951 +0,0 @@
-# Template file for 'icecat'
-pkgname=icecat
-version=78.6.1
-revision=1
-build_helper="rust qemu"
-hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang nodejs-lts-10 cbindgen python nasm which tar"
-makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
- pixman-devel libevent-devel libnotify-devel libvpx-devel
- libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
- libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel)
- $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if xscreensaver libXScrnSaver-devel)
- $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
-depends="nss>=3.53 desktop-file-utils hicolor-icon-theme"
-short_desc="GNU version of the Firefox browser"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://www.gnu.org/software/${pkgname}/"
-distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}-gnu1.tar.xz"
-checksum=2e4857523a465b39206aa3438e8c799610852ca95c93ae4cb4eb128cd4a28235
-lib32disabled=yes
-
-build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
-build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
-
-case $XBPS_TARGET_MACHINE in
- armv[56]*) broken="required NEON extensions are not supported on armv[56]" ;;
- ppc64*) ;;
- ppc*) broken="xptcall bitrot" ;;
-esac
-
-CXXFLAGS="-Wno-class-memaccess -Wno-unused-function"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_WORDSIZE" -eq 32 ]; then
- nodebug=yes
-fi
-
-# We need this because cargo verifies checksums of all files
-# in vendor crates when it builds and gives us no way to
-# override or update the file sanely... so just clear out the file list
-_clear_vendor_checksums() {
- sed -i 's/\("files":{\)[^}]*/\1/' third_party/rust/$1/.cargo-checksum.json
-}
-
-# Function to install a language pack
-# FIXME: The *.xpi files have to be signed to be accepted as plugins
-# yet how do you sign a package if you don't have a signing key?
-_install_langpack() {
- local lang=$1
- local tempdir="$(ls -d ${wrksrc}/obj-*/dist/linux-*/xpi|head -n1)"
- vinstall "${tempdir}"/${sourcepkg}-${version}.${lang}.langpack.xpi \
- 644 usr/lib/icecat/browser/extensions
-}
-
-post_extract() {
- if [ "$XBPS_TARGET_LIBC" = musl ]; then
- cp "${FILESDIR}/stab.h" toolkit/crashreporter/google-breakpad/src/
- fi
-}
-
-post_patch() {
- _clear_vendor_checksums num-traits
- _clear_vendor_checksums glslopt
-}
-
-do_build() {
- local lang languages="en-US $(cat browser/locales/all-locales)"
- local triplet
-
- cp ${FILESDIR}/mozconfig .mozconfig
-
- if [ "$XBPS_TARGET_LIBC" = musl ]; then
- echo "ac_add_options --disable-jemalloc" >>.mozconfig
- echo "ac_add_options --disable-gold" >>.mozconfig
- echo "ac_add_options --enable-release" >>.mozconfig
- fi
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*|arm*)
- echo "ac_add_options --disable-elf-hack" >>.mozconfig
- ;;
- esac
-
- # webrtc currently fails to build on 32-bit ppc...
- case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) echo "ac_add_options --disable-webrtc" >>.mozconfig ;;
- esac
-
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- export LDFLAGS+=" -latomic"
- fi
-
- if [ "$CROSS_BUILD" ]; then
- BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \
- sed -n '/#include <...> search starts here:/,/End of search list./p' | \
- sed '1,1d;$d' | sed 's/^ /-I/' | paste -s )
-
- export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
- --sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
- export HOST_CC="${CC_host}"
- export TARGET_CC="${CC}"
- export HOST_CFLAGS="${XBPS_CFLAGS}"
- export HOST_CXXFLAGS="${XBPS_CXXFLAGS}"
- echo "ac_cv_sqlite_secure_delete=yes" >> .mozconfig
- echo "ac_cv_sqlite_threadsafe=yes" >> .mozconfig
- echo "ac_cv_sqlite_enable_fts3=yes" >> .mozconfig
- echo "ac_cv_sqlite_dbstat_vtab=yes" >> .mozconfig
- echo "ac_cv_sqlite_enable_unlock_notify=yes" >> .mozconfig
- echo "ac_cv_prog_hostcxx_works=1" >> .mozconfig
- echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig
- echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
- else
- echo "ac_add_options --target=$XBPS_TRIPLET" >>.mozconfig
- echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
- fi
-
- mkdir -p third_party/rust/libloading/.deps
-
- case "$XBPS_TARGET_MACHINE" in
- armv7*)
- export CFLAGS+=" -mfpu=neon -Wno-psabi"
- export CXXFLAGS+=" -mfpu=neon -Wno-psabi"
- ;;
- esac
-
- # work around large debug symbols on 32-bit hosts
- if [ "$XBPS_WORDSIZE" = "32" ]; then
- export CFLAGS="${CFLAGS/-g/-g1}"
- export CXXFLAGS="${CXXFLAGS/-g/-g1}"
- export LDFLAGS+=" -Wl,--no-keep-memory"
- # patch the rust debug level, this is hardcoded
- sed -i "s/debug_info = '2'/debug_info = '1'/" \
- build/moz.configure/toolchain.configure
- fi
-
- # FIXME: incompatible with rust 1.48 in this release
- #case "$XBPS_TARGET_MACHINE" in
- #aarch64*|i686*|x86_64*)
- # echo "ac_add_options --enable-rust-simd" >>.mozconfig ;;
- #esac
-
- export LDFLAGS+=" -Wl,-rpath=/usr/lib/icecat"
-
- if [ "$SOURCE_DATE_EPOCH" ]; then
- export MOZ_BUILD_DATE=$(date --date "@$SOURCE_DATE_EPOCH" "+%Y%m%d%H%M%S")
- fi
-
- export MOZ_MAKE_FLAGS="${makejobs}"
- export MOZ_NOSPAM=1
- export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
- export MACH_USE_SYSTEM_PYTHON=1
-
- export AS=$CC
-
- cat >>.mozconfig <<EOF
-ac_add_options $(vopt_enable alsa)
-ac_add_options $(vopt_enable jack)
-ac_add_options $(vopt_enable sndio)
-ac_add_options $(vopt_enable dbus)
-ac_add_options $(vopt_enable dbus necko-wifi)
-ac_add_options $(vopt_enable pulseaudio)
-ac_add_options --with-l10n-base=${wrksrc}/l10n
-ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3')
-EOF
- rm -f old-configure
- ./mach build
-
- # Make langpacks for all languages
- dir=$(ls -d obj-*/browser/locales)
- cd ${wrksrc}/${dir}
- for lang in ${languages[*]}; do
- msg_normal "Making langpack for ${lang} ...\n"
- make ${makejobs} langpack-${lang} LOCALE_MERGEDIR=.
- done
-}
-
-do_install() {
- export MACH_USE_SYSTEM_PYTHON=1
- DESTDIR="$DESTDIR" ./mach install
-
- vbin ${FILESDIR}/icecat-wayland
- vinstall ${FILESDIR}/vendor.js 644 usr/lib/icecat/browser/defaults/preferences
- vinstall ${FILESDIR}/icecat.desktop 644 usr/share/applications
-
- for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
- vinstall ${wrksrc}/browser/branding/official/default${i%x*}.png 644 \
- usr/share/icons/hicolor/${i}/apps icecat.png
- done
- vinstall ${wrksrc}/browser/branding/official/default256.png 644 \
- usr/share/pixmaps icecat.png
-
- # Use system-provided dictionaries
- rm -rf ${DESTDIR}/usr/lib/icecat/{dictionaries,hyphenation}
- ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/icecat/dictionaries
- ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/icecat/hyphenation
-
- # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
- ln -sf icecat ${DESTDIR}/usr/lib/icecat/icecat-bin
-
- # Remove the development files - noone uses them
- rm -rf ${DESTDIR}/usr/{include,lib/icecat-devel,share/idl}
-}
-
-icecat-i18n-ach_package() {
- short_desc+=" - Acholi language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-af_package() {
- short_desc+=" - Afrikaans language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-an_package() {
- short_desc+=" - Aragonese language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ar_package() {
- short_desc+=" - Arabic language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ast_package() {
- short_desc+=" - Asturian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-az_package() {
- short_desc+=" - Azerbaijani language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-be_package() {
- short_desc+=" - Belarusian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-bg_package() {
- short_desc+=" - Bulgarian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-bn_package() {
- short_desc+=" - Bengali language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-br_package() {
- short_desc+=" - Breton language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-bs_package() {
- short_desc+=" - Bosnian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ca_package() {
- short_desc+=" - Catalan language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-cak_package() {
- short_desc+=" - Kaqchikel language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-cs_package() {
- short_desc+=" - Czech language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-cy_package() {
- short_desc+=" - Welsh language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-da_package() {
- short_desc+=" - Danish language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-de_package() {
- short_desc+=" - German language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-dsb_package() {
- short_desc+=" - Lower Sorbian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-el_package() {
- short_desc+=" - Greek language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-en-CA_package() {
- short_desc+=" - English (Canada) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-en-GB_package() {
- short_desc+=" - English (British) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-en-US_package() {
- short_desc+=" - English (US) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-eo_package() {
- short_desc+=" - Esperanto language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-es-AR_package() {
- short_desc+=" - Spanish (Argentina) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-es-CL_package() {
- short_desc+=" - Spanish (Chile) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-es-ES_package() {
- short_desc+=" - Spanish (Spain) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-es-MX_package() {
- short_desc+=" - Spanish (Mexico) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-et_package() {
- short_desc+=" - Estonian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-eu_package() {
- short_desc+=" - Basque language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-fa_package() {
- short_desc+=" - Persian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ff_package() {
- short_desc+=" - Fulah language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-fi_package() {
- short_desc+=" - Finnish language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-fr_package() {
- short_desc+=" - French language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-fy-NL_package() {
- short_desc+=" - Frisian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ga-IE_package() {
- short_desc+=" - Irish language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-gd_package() {
- short_desc+=" - Gaelic (Scotland) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-gl_package() {
- short_desc+=" - Galician language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-gn_package() {
- short_desc+=" - Guarani language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-gu-IN_package() {
- short_desc+=" - Gujarati (India) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-he_package() {
- short_desc+=" - Hebrew language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-hi-IN_package() {
- short_desc+=" - Hindi (India) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-hr_package() {
- short_desc+=" - Croatian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-hsb_package() {
- short_desc+=" - Upper Sorbian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-hu_package() {
- short_desc+=" - Hungarian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-hy-AM_package() {
- short_desc+=" - Armenian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ia_package() {
- short_desc+=" - Interlingua language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-id_package() {
- short_desc+=" - Indonesian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-is_package() {
- short_desc+=" - Icelandic language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-it_package() {
- short_desc+=" - Italian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ja_package() {
- short_desc+=" - Japanese language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ka_package() {
- short_desc+=" - Georgian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-kab_package() {
- short_desc+=" - Kabyle language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-kk_package() {
- short_desc+=" - Kazakh language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-km_package() {
- short_desc+=" - Khmer language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-kn_package() {
- short_desc+=" - Kannada language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ko_package() {
- short_desc+=" - Korean language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-lij_package() {
- short_desc+=" - Ligurian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-lt_package() {
- short_desc+=" - Lithuanian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-lv_package() {
- short_desc+=" - Latvian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-mk_package() {
- short_desc+=" - Macedonian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-mr_package() {
- short_desc+=" - Marathi language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ms_package() {
- short_desc+=" - Malay language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-my_package() {
- short_desc+=" - Burmese language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-nb-NO_package() {
- short_desc+=" - Norwegian (Bokmål) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ne-NP_package() {
- short_desc+=" - Nepali language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-nl_package() {
- short_desc+=" - Dutch language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-nn-NO_package() {
- short_desc+=" - Norwegian (Nynorsk) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-oc_package() {
- short_desc+=" - Occitan language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-pa-IN_package() {
- short_desc+=" - Punjabi language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-pl_package() {
- short_desc+=" - Polish language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-pt-BR_package() {
- short_desc+=" - Portuguese (Brazilian) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-pt-PT_package() {
- short_desc+=" - Portuguese (Portugal) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-rm_package() {
- short_desc+=" - Romansh language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ro_package() {
- short_desc+=" - Romanian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ru_package() {
- short_desc+=" - Russian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-si_package() {
- short_desc+=" - Sinhala language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-sk_package() {
- short_desc+=" - Slovak language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-sl_package() {
- short_desc+=" - Slovenian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-son_package() {
- short_desc+=" - Songhai language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-sq_package() {
- short_desc+=" - Albanian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-sr_package() {
- short_desc+=" - Serbian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-sv-SE_package() {
- short_desc+=" - Swedish language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ta_package() {
- short_desc+=" - Tamil language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-te_package() {
- short_desc+=" - Telugu language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-th_package() {
- short_desc+=" - Thai language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-tr_package() {
- short_desc+=" - Turkish language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-uk_package() {
- short_desc+=" - Ukrainian language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-ur_package() {
- short_desc+=" - Urdu language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-uz_package() {
- short_desc+=" - Uzbek language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-vi_package() {
- short_desc+=" - Vietnamese language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-xh_package() {
- short_desc+=" - Xhosa language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-zh-CN_package() {
- short_desc+=" - Chinese (simplified) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
-
-icecat-i18n-zh-TW_package() {
- short_desc+=" - Chinese (traditional) language files"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- _install_langpack ${pkgname#icecat-i18n-}
- }
-}
diff --git a/srcpkgs/icecat/update b/srcpkgs/icecat/update
deleted file mode 100644
index 9bed5c29c8d..00000000000
--- a/srcpkgs/icecat/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://ftp.gnu.org/gnu/gnuzilla/
-pattern="\K[\d]+\.[\d]+\.[\d]+"
From 03017e11f998ba81e536fa098152ae2a8c9dfbd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 27 Jan 2021 18:49:36 +0100
Subject: [PATCH 225/634] removed-packages: add icecat
---
srcpkgs/removed-packages/template | 94 +++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9286101886a..dd48bbd92d2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -37,6 +37,100 @@ replaces="
gtkhtml-devel<=4.10.0_1
libgtkhtml<=4.10.0_1
httperf<=0.9.0_9
+ icecat<=78.6.1_1
+ icecat-i18n-ach<=78.6.1_1
+ icecat-i18n-af<=78.6.1_1
+ icecat-i18n-an<=78.6.1_1
+ icecat-i18n-ar<=78.6.1_1
+ icecat-i18n-ast<=78.6.1_1
+ icecat-i18n-az<=78.6.1_1
+ icecat-i18n-be<=78.6.1_1
+ icecat-i18n-bg<=78.6.1_1
+ icecat-i18n-bn<=78.6.1_1
+ icecat-i18n-br<=78.6.1_1
+ icecat-i18n-bs<=78.6.1_1
+ icecat-i18n-ca<=78.6.1_1
+ icecat-i18n-cak<=78.6.1_1
+ icecat-i18n-cs<=78.6.1_1
+ icecat-i18n-cy<=78.6.1_1
+ icecat-i18n-da<=78.6.1_1
+ icecat-i18n-de<=78.6.1_1
+ icecat-i18n-dsb<=78.6.1_1
+ icecat-i18n-el<=78.6.1_1
+ icecat-i18n-en-CA<=78.6.1_1
+ icecat-i18n-en-GB<=78.6.1_1
+ icecat-i18n-en-US<=78.6.1_1
+ icecat-i18n-eo<=78.6.1_1
+ icecat-i18n-es-AR<=78.6.1_1
+ icecat-i18n-es-CL<=78.6.1_1
+ icecat-i18n-es-ES<=78.6.1_1
+ icecat-i18n-es-MX<=78.6.1_1
+ icecat-i18n-et<=78.6.1_1
+ icecat-i18n-eu<=78.6.1_1
+ icecat-i18n-fa<=78.6.1_1
+ icecat-i18n-ff<=78.6.1_1
+ icecat-i18n-fi<=78.6.1_1
+ icecat-i18n-fr<=78.6.1_1
+ icecat-i18n-fy-NL<=78.6.1_1
+ icecat-i18n-ga-IE<=78.6.1_1
+ icecat-i18n-gd<=78.6.1_1
+ icecat-i18n-gl<=78.6.1_1
+ icecat-i18n-gn<=78.6.1_1
+ icecat-i18n-gu<=IN-78.6.1_1
+ icecat-i18n-he<=78.6.1_1
+ icecat-i18n-hi<=IN-78.6.1_1
+ icecat-i18n-hr<=78.6.1_1
+ icecat-i18n-hsb<=78.6.1_1
+ icecat-i18n-hu<=78.6.1_1
+ icecat-i18n-hy-AM<=78.6.1_1
+ icecat-i18n-ia<=78.6.1_1
+ icecat-i18n-id<=78.6.1_1
+ icecat-i18n-is<=78.6.1_1
+ icecat-i18n-it<=78.6.1_1
+ icecat-i18n-ja<=78.6.1_1
+ icecat-i18n-ka<=78.6.1_1
+ icecat-i18n-kab<=78.6.1_1
+ icecat-i18n-kk<=78.6.1_1
+ icecat-i18n-km<=78.6.1_1
+ icecat-i18n-kn<=78.6.1_1
+ icecat-i18n-ko<=78.6.1_1
+ icecat-i18n-lij<=78.6.1_1
+ icecat-i18n-lt<=78.6.1_1
+ icecat-i18n-lv<=78.6.1_1
+ icecat-i18n-mk<=78.6.1_1
+ icecat-i18n-mr<=78.6.1_1
+ icecat-i18n-ms<=78.6.1_1
+ icecat-i18n-my<=78.6.1_1
+ icecat-i18n-nb-NO<=78.6.1_1
+ icecat-i18n-ne-NP<=78.6.1_1
+ icecat-i18n-nl<=78.6.1_1
+ icecat-i18n-nn-NO<=78.6.1_1
+ icecat-i18n-oc<=78.6.1_1
+ icecat-i18n-pa-IN<=78.6.1_1
+ icecat-i18n-pl<=78.6.1_1
+ icecat-i18n-pt-BR<=78.6.1_1
+ icecat-i18n-pt-PT<=78.6.1_1
+ icecat-i18n-rm<=78.6.1_1
+ icecat-i18n-ro<=78.6.1_1
+ icecat-i18n-ru<=78.6.1_1
+ icecat-i18n-si<=78.6.1_1
+ icecat-i18n-sk<=78.6.1_1
+ icecat-i18n-sl<=78.6.1_1
+ icecat-i18n-son<=78.6.1_1
+ icecat-i18n-sq<=78.6.1_1
+ icecat-i18n-sr<=78.6.1_1
+ icecat-i18n-sv<=SE-78.6.1_1
+ icecat-i18n-ta<=78.6.1_1
+ icecat-i18n-te<=78.6.1_1
+ icecat-i18n-th<=78.6.1_1
+ icecat-i18n-tr<=78.6.1_1
+ icecat-i18n-uk<=78.6.1_1
+ icecat-i18n-ur<=78.6.1_1
+ icecat-i18n-uz<=78.6.1_1
+ icecat-i18n-vi<=78.6.1_1
+ icecat-i18n-xh<=78.6.1_1
+ icecat-i18n-zh-CN<=78.6.1_1
+ icecat-i18n-zh-TW<=78.6.1_1
isl16<=0.16_2
kadu<=4.3_6
keepassx<=0.4.4_2
From 13be17aa7a13fefcf922c27f40891d07eea43b7d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Jan 2021 19:06:21 +0100
Subject: [PATCH 226/634] removed-packages: bump
---
srcpkgs/removed-packages/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dd48bbd92d2..9451ae48a63 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=13
+revision=14
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
From 44dabd8bd559b42741f3b01a512e4c08a41782d3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 12:08:42 -0600
Subject: [PATCH 227/634] python3-simber: update to 0.2.1.
---
srcpkgs/python3-simber/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-simber/template b/srcpkgs/python3-simber/template
index ab694024116..e39741af035 100644
--- a/srcpkgs/python3-simber/template
+++ b/srcpkgs/python3-simber/template
@@ -1,6 +1,6 @@
# Template file for 'python3-simber'
pkgname=python3-simber
-version=0.1.2
+version=0.2.1
revision=1
wrksrc="simber-${version}"
build_style=python3-module
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://simber.deepjyoti30.dev/"
distfiles="https://github.com/deepjyoti30/simber/archive/${version}.tar.gz"
-checksum=42ee86e9f5afb32d5410284496370cca0af11ce9c9fafdc5a9e055b06a982945
+checksum=11b91250b67d74f8c1725079fee1cd6ea64e690f992a7dfc1523f70d3de78b09
post_install() {
vlicense LICENSE
From c967f9a9fe78eec02f3fbdfe36a73523ca69dff7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:07:54 -0600
Subject: [PATCH 228/634] opensurge: update to 0.5.2.
---
srcpkgs/opensurge/patches/fix-installdir.patch | 11 -----------
.../patches/{fix_ssize_t.patch => fix-ssize.patch} | 0
srcpkgs/opensurge/template | 10 +++++++---
3 files changed, 7 insertions(+), 14 deletions(-)
delete mode 100644 srcpkgs/opensurge/patches/fix-installdir.patch
rename srcpkgs/opensurge/patches/{fix_ssize_t.patch => fix-ssize.patch} (100%)
diff --git a/srcpkgs/opensurge/patches/fix-installdir.patch b/srcpkgs/opensurge/patches/fix-installdir.patch
deleted file mode 100644
index e1bdf99d0a5..00000000000
--- a/srcpkgs/opensurge/patches/fix-installdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -651,7 +651,7 @@
- # Installing on *nix
- IF(UNIX)
- INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure that you have the appropriate privileges.\")")
-- INSTALL(TARGETS "${GAME_UNIXNAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
-+ INSTALL(TARGETS "${GAME_UNIXNAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
- INSTALL(FILES LICENSE README.md CHANGES.md logo.png surge.png surge.rocks DESTINATION "${GAME_DATADIR}")
- INSTALL(DIRECTORY characters scripts sprites config images levels musics quests samples scripts themes languages fonts licenses DESTINATION "${GAME_DATADIR}" PATTERN ".git" EXCLUDE)
- IF(DESKTOP_INSTALL)
diff --git a/srcpkgs/opensurge/patches/fix_ssize_t.patch b/srcpkgs/opensurge/patches/fix-ssize.patch
similarity index 100%
rename from srcpkgs/opensurge/patches/fix_ssize_t.patch
rename to srcpkgs/opensurge/patches/fix-ssize.patch
diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index 5fb036d9253..1e8d42c4fa8 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -1,7 +1,7 @@
# Template file for 'opensurge'
pkgname=opensurge
-version=0.5.1.2
-revision=4
+version=0.5.2
+revision=1
build_style=cmake
hostmakedepends="surgescript pkg-config"
makedepends="allegro5-devel surgescript surgescript-devel"
@@ -10,5 +10,9 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://opensurge2d.org/"
distfiles="https://github.com/alemart/opensurge/archive/v${version}.tar.gz"
-checksum=d060e3215231741ce0b4e5b897af52f8755c57660c8a33856bf921c83af18ba2
+checksum=838b8ba506e45c800091d8ba7bb830d024907934fba35bf369d92fe13feaa3de
replaces="opensurge-data>=0"
+
+pre_configure() {
+ vsed -i CMakeLists.txt -e 's/GAME_BINDIR "games"/GAME_BINDIR "bin"/'
+}
From 4a0d7b3e075eb358d9276e8f05e7bd9451bf8758 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:40:47 -0600
Subject: [PATCH 229/634] spotifyd: update to 0.3.0.
---
srcpkgs/spotifyd/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index 00b16675698..cb77beb238b 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,7 +1,7 @@
# Template file for 'spotifyd'
pkgname=spotifyd
-version=0.2.24
-revision=4
+version=0.3.0
+revision=1
build_style=cargo
configure_args="--no-default-features"
hostmakedepends="pkg-config"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/Spotifyd/spotifyd"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d3763f4647217a8f98ee938b50e141d67a5f3d33e9378894fde2a92c9845ef80
+checksum=47b3d9a87a9bc8ff5a46b9ba3ccb5ea0b305964c6f334e601a0316697d8bcd4a
build_options="alsa pulseaudio portaudio dbus"
desc_option_portaudio="Enable PortAudio backend"
From 6f35c7bbfe2c6096076b5fd2bb30f63f133152fd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:42:37 -0600
Subject: [PATCH 230/634] yara: update to 4.0.3.
---
srcpkgs/yara/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 38b32a09bd3..f066214b73b 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,7 +1,7 @@
# Template file for 'yara'
pkgname=yara
-version=4.0.2
-revision=2
+version=4.0.3
+revision=1
build_style=gnu-configure
configure_args="--enable-magic --enable-cuckoo"
hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://virustotal.github.io/yara/"
distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=05ad88eac9a9f0232432fd14516bdaeda14349d6cf0cac802d76e369abcee001
+checksum=d95b7f5e2981328a10ea206e3384d661bd4d488e43e8d1785152bdea44d89880
pre_configure() {
autoreconf -fi
From 0ef0e7d0d9dc0c6cf6358f25b335bef26eb87b84 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 11:42:42 -0600
Subject: [PATCH 231/634] python3-yara: update to 4.0.3.
---
srcpkgs/python3-yara/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index cb8c10b5759..3543276a9dd 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,7 +1,7 @@
# Template file for 'python3-yara'
pkgname=python3-yara
-version=4.0.2
-revision=2
+version=4.0.3
+revision=1
wrksrc="yara-python-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="http://virustotal.github.io/yara/"
distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz"
-checksum=6e747caefa8d208bf40b078ef0a71f3866fa9075091239cc362bd23bf436d816
+checksum=92e8e29d1d74e4889bf7bb5fe5b0092a48cb207c558393ec4cbe5f8f2fcadaab
From f2d14cbaab552789347a83d6465b7c6154dd32a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:46:42 -0300
Subject: [PATCH 232/634] couchdb: remove package.
---
srcpkgs/couchdb/INSTALL | 6 -----
srcpkgs/couchdb/files/couchdb/run | 6 -----
srcpkgs/couchdb/template | 40 -------------------------------
srcpkgs/couchdb/update | 1 -
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 53 deletions(-)
delete mode 100644 srcpkgs/couchdb/INSTALL
delete mode 100755 srcpkgs/couchdb/files/couchdb/run
delete mode 100644 srcpkgs/couchdb/template
delete mode 100644 srcpkgs/couchdb/update
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
deleted file mode 100644
index 753e71b95d6..00000000000
--- a/srcpkgs/couchdb/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
- post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
- ;;
-esac
-
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
deleted file mode 100755
index 25d1abb8272..00000000000
--- a/srcpkgs/couchdb/files/couchdb/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-export HOME=/var/lib/couchdb
-mkdir -p /var/run/couchdb
-chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
deleted file mode 100644
index 5ca5eacbaab..00000000000
--- a/srcpkgs/couchdb/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'couchdb'
-pkgname=couchdb
-version=1.7.1
-revision=2
-wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
-conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
-depends="erlang"
-short_desc="A document-oriented database"
-maintainer="Gerardo Di Iorio <arete74@gmail.com>"
-license="Apache-2.0"
-homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
-
-system_accounts="couchdb"
-couchdb_homedir="/var/lib/couchdb"
-make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
-
-if [ "$CROSS_BUILD" ]; then
- makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
-fi
-
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
-}
-
-
-post_install() {
- vsv couchdb
-}
diff --git a/srcpkgs/couchdb/update b/srcpkgs/couchdb/update
deleted file mode 100644
index bad80599c94..00000000000
--- a/srcpkgs/couchdb/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=apache-$pkgname
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9451ae48a63..4e053cd1e5f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -16,6 +16,7 @@ replaces="
bokken<=1.8_3
caja-gksu<=1.20.2_2
california<=0.4.0_4
+ couchdb<=1.7.1_2
ctpp2<=2.8.3_7
ctpp2-devel<=2.8.3_7
djmount<=0.71_8
From c848101d5e00a248fca3f8287fd0c669423d553a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:43:23 -0300
Subject: [PATCH 233/634] js: remove package.
---
common/shlibs | 1 -
srcpkgs/js-devel | 1 -
srcpkgs/js/patches/js185-destdir.patch | 15 ---
srcpkgs/js/patches/js185-gcc6.patch | 135 -------------------------
srcpkgs/js/template | 57 -----------
srcpkgs/js/update | 1 -
srcpkgs/removed-packages/template | 1 +
7 files changed, 1 insertion(+), 210 deletions(-)
delete mode 120000 srcpkgs/js-devel
delete mode 100644 srcpkgs/js/patches/js185-destdir.patch
delete mode 100644 srcpkgs/js/patches/js185-gcc6.patch
delete mode 100644 srcpkgs/js/template
delete mode 100644 srcpkgs/js/update
diff --git a/common/shlibs b/common/shlibs
index 92979332fb1..80f722f7f4e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -863,7 +863,6 @@ libquadmath.so.0 libquadmath-4.4.0_1
libgfortran.so.5 libgfortran-8.2.0_1
libgnarl-10.so libada-10.2.0_1
libgnat-10.so libada-10.2.0_1
-libmozjs185.so.1.0 js-1.8.5_1
libwebp.so.7 libwebp-0.6.0_1
libwebpmux.so.3 libwebp-0.6.0_1
libwebpdemux.so.2 libwebp-0.5.0_1
diff --git a/srcpkgs/js-devel b/srcpkgs/js-devel
deleted file mode 120000
index bc42fd64f54..00000000000
--- a/srcpkgs/js-devel
+++ /dev/null
@@ -1 +0,0 @@
-js
\ No newline at end of file
diff --git a/srcpkgs/js/patches/js185-destdir.patch b/srcpkgs/js/patches/js185-destdir.patch
deleted file mode 100644
index 30854e12103..00000000000
--- a/srcpkgs/js/patches/js185-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-#https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-
---- js/src/Makefile.in.old 2011-04-10 04:21:19.918608008 -0700
-+++ js/src/Makefile.in 2011-04-10 04:21:58.088607992 -0700
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
diff --git a/srcpkgs/js/patches/js185-gcc6.patch b/srcpkgs/js/patches/js185-gcc6.patch
deleted file mode 100644
index 7495e7190bc..00000000000
--- a/srcpkgs/js/patches/js185-gcc6.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- js/src/jsapi.cpp
-+++ js/src/jsapi.cpp
-@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
- AutoIdVector props(cx);
- JSIdArray *ida;
- if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
-- return false;
-+ return NULL;
- for (size_t n = 0; n < size_t(ida->length); ++n)
- JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
- return ida;
---- js/src/jsfun.cpp
-+++ js/src/jsfun.cpp
-@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
-
- JSString *str = JS_DecompileFunction(cx, fun, indent);
- if (!str)
-- return false;
-+ return NULL;
-
- if (!indent)
- cx->compartment->toSourceCache.put(fun, str);
-@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
- const Shape *shape = funobj->nativeLookup(id);
- if (!shape) {
- if (!ResolveInterpretedFunctionPrototype(cx, funobj))
-- return false;
-+ return NULL;
- shape = funobj->nativeLookup(id);
- }
- JS_ASSERT(!shape->configurable());
---- js/src/jsiter.cpp
-+++ js/src/jsiter.cpp
-@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
- */
- JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
- if (!obj)
-- return false;
-+ return NULL;
- obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
- obj->setMap(cx->compartment->emptyEnumeratorShape);
- return obj;
---- js/src/jsparse.cpp
-+++ js/src/jsparse.cpp
-@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
- if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
- JS_ASSERT(pn->pn_cookie.isFree());
- if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
-- return false;
-+ return NULL;
- }
-
- pn->pn_blockid = outertc->blockid();
---- js/src/jsstr.cpp
-+++ js/src/jsstr.cpp
-@@ -1734,7 +1734,7 @@ class RegExpGuard
- if (flat) {
- patstr = flattenPattern(cx, fm.patstr);
- if (!patstr)
-- return false;
-+ return NULL;
- } else {
- patstr = fm.patstr;
- }
-@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje
- UndefinedValue(), NULL, NULL,
- JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
- NULL)) {
-- return JS_FALSE;
-+ return NULL;
- }
-
- return proto;
---- js/src/jstypedarray.cpp
-+++ js/src/jstypedarray.cpp
-@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
- if (size != 0 && count >= INT32_MAX / size) {
- JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
- JSMSG_NEED_DIET, "size and count");
-- return false;
-+ return NULL;
- }
-
- int32 bytelen = size * count;
-@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
-
- default:
- JS_NOT_REACHED("shouldn't have gotten here");
-- return false;
-+ return NULL;
- }
- }
-
---- js/src/jsxml.cpp
-+++ js/src/jsxml.cpp
-@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
-
- obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
- if (!obj)
-- return JS_FALSE;
-+ return NULL;
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
-@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
- size_t length = str->length();
- jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
- if (!chars)
-- return JS_FALSE;
-+ return NULL;
- *chars = '@';
- const jschar *strChars = str->getChars(cx);
- if (!strChars) {
---- js/src/methodjit/InvokeHelpers.cpp
-+++ js/src/methodjit/InvokeHelpers.cpp
-@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
- {
- JSStackFrame *fp = cx->fp();
- if (fp->hasImacropc())
-- return false;
-+ return NULL;
-
- JSScript *script = fp->script();
- return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
---- js/src/nanojit/NativeX64.cpp
-+++ js/src/nanojit/NativeX64.cpp
-@@ -1899,7 +1899,7 @@ namespace nanojit
- }
- }
-
-- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-+ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {int64_t(0x8000000000000000LL),0};
-
- void Assembler::asm_fneg(LIns *ins) {
- Register rr, ra;
diff --git a/srcpkgs/js/template b/srcpkgs/js/template
deleted file mode 100644
index a7230dc0122..00000000000
--- a/srcpkgs/js/template
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template file for 'js'
-pkgname=js
-version=1.8.5
-revision=11
-archs="x86_64* i686* aarch64* arm*"
-build_wrksrc="js/src"
-build_style=gnu-configure
-hostmakedepends="zip python perl nspr-devel"
-makedepends="nspr-devel"
-short_desc="Spidermonkey JavaScript interpreter and library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-1.1, GPL-2.0-only, LGPL-2.1-only"
-homepage="https://developer.mozilla.org/en/docs/SpiderMonkey"
-distfiles="${MOZILLA_SITE}/js/js185-1.0.0.tar.gz"
-checksum=5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
-
-case "$XBPS_TARGET_MACHINE" in
- aarch64*)
- # ./assembler/jit/ExecutableAllocator.h:395:6: error: #error "The cacheFlush support is missing on this platform."
- broken="https://build.voidlinux.org/builders/aarch64_builder/builds/2509/steps/shell_3/logs/stdio"
- ;;
-esac
-
-do_configure() {
- local _args
-
- if [ "$CROSS_BUILD" ]; then
- export HOST_CC=cc
- export HOST_CXX=g++
- export HOST_CFLAGS="-Os -DFORCE_LITTLE_ENDIAN -fPIE"
- export HOST_CXXFLAGS="-Os -DFORCE_LITTLE_ENDIAN -fPIE"
-
- case "$XBPS_MACHINE" in
- armv6l*) _args+=" --with-cpu-arch=armv6";;
- armv7l*) _args+=" --with-cpu-arch=armv7";;
- esac
- _args+=" --target=$XBPS_CROSS_TRIPLET"
- fi
-
- sed -e "s,-mfpu=neon -mfloat-abi=softfp,,g" -i configure
- sed -e "s,-march=armv7-a -marm -mfloat-abi=softfp,${CFLAGS},g" -i configure
- sed -e "s,-march=armv7 -marm -msoftfp,${CFLAGS},g" -i configure
-
- ./configure --prefix=/usr --with-system-nspr --enable-threadsafe ${_args}
-}
-
-js-devel_package() {
- depends="nspr-devel js>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
- }
-}
diff --git a/srcpkgs/js/update b/srcpkgs/js/update
deleted file mode 100644
index c54d0609c55..00000000000
--- a/srcpkgs/js/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="1.60"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4e053cd1e5f..3eb0307347d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -133,6 +133,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
isl16<=0.16_2
+ js<=1.8.5_11
kadu<=4.3_6
keepassx<=0.4.4_2
libapp<=20140527_2
From cb6b2e83adf0a9f0f1756f949f72453b72a8c7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 18:48:05 -0300
Subject: [PATCH 234/634] mozjs68: remove package.
---
common/shlibs | 1 -
srcpkgs/mozjs68-devel | 1 -
.../001-silence-sandbox-violations.patch | 27 -------
srcpkgs/mozjs68/patches/002-fix-soname.patch | 22 ------
.../mozjs68/patches/003-fix-wasm-arm.patch | 16 ----
.../mozjs68/patches/004-fix-musl-build.patch | 17 -----
.../005-spidermonkey-checks-disable.patch | 12 ---
.../006-mozjs68.pc-honor-sysroot.patch | 10 ---
...sed-LLVM-and-Rust-build-dependencies.patch | 74 -------------------
.../mozjs68/patches/008-fix-mips32-inl.patch | 53 -------------
.../patches/009-fix-mips-sgidefs_h.patch | 11 ---
srcpkgs/mozjs68/template | 71 ------------------
srcpkgs/mozjs68/update | 1 -
srcpkgs/removed-packages/template | 1 +
14 files changed, 1 insertion(+), 316 deletions(-)
delete mode 120000 srcpkgs/mozjs68-devel
delete mode 100644 srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch
delete mode 100644 srcpkgs/mozjs68/patches/002-fix-soname.patch
delete mode 100644 srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch
delete mode 100644 srcpkgs/mozjs68/patches/004-fix-musl-build.patch
delete mode 100644 srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch
delete mode 100644 srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch
delete mode 100644 srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch
delete mode 100644 srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch
delete mode 100644 srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch
delete mode 100644 srcpkgs/mozjs68/template
delete mode 100644 srcpkgs/mozjs68/update
diff --git a/common/shlibs b/common/shlibs
index 80f722f7f4e..f73bd5d4ed4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3520,7 +3520,6 @@ libmysqlpp.so.3 mysql++-3.2.5_1
libKF5Syndication.so.5 syndication-5.50.0_1
liblqr-1.so.0 liblqr-0.4.2_1
libmozjs-60.so.0 mozjs60-60.0.2_1
-libmozjs-68.so.0 mozjs68-68.8.0_1
libmozjs-78.so.0 mozjs78-78.1.0_1
libebur128.so.1 libebur128-1.2.4_1
libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
diff --git a/srcpkgs/mozjs68-devel b/srcpkgs/mozjs68-devel
deleted file mode 120000
index 0843c595e78..00000000000
--- a/srcpkgs/mozjs68-devel
+++ /dev/null
@@ -1 +0,0 @@
-mozjs68
\ No newline at end of file
diff --git a/srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch b/srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch
deleted file mode 100644
index 51208e9438b..00000000000
--- a/srcpkgs/mozjs68/patches/001-silence-sandbox-violations.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-"Carried over from mozjs60"
-Upstream: no
-From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Wed, 5 Sep 2018 15:05:24 +0200
-Subject: [PATCH] silence sandbox violations
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
----
- python/mozbuild/mozbuild/frontend/emitter.py | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1195,11 +1195,6 @@
- raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
- 'is a filename, but a directory is required: %s '
- '(resolved to %s)' % (local_include, full_path), context)
-- if (full_path == context.config.topsrcdir or
-- full_path == context.config.topobjdir):
-- raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
-- '(%s) resolves to the topsrcdir or topobjdir (%s), which is '
-- 'not allowed' % (local_include, full_path), context)
- include_obj = LocalInclude(context, local_include)
- local_includes.append(include_obj.path.full_path)
- yield include_obj
-
diff --git a/srcpkgs/mozjs68/patches/002-fix-soname.patch b/srcpkgs/mozjs68/patches/002-fix-soname.patch
deleted file mode 100644
index 26cd1847929..00000000000
--- a/srcpkgs/mozjs68/patches/002-fix-soname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-"Carried over from mozjs60"
---- a/js/src/build/Makefile.in
-+++ b/js/src/build/Makefile.in
-@@ -78,6 +78,8 @@
- endif
- ifneq (,$(SHARED_LIBRARY))
- $(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
-+ mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
-+ ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- ifeq ($(OS_ARCH),Darwin)
- install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- endif
---- a/js/src/build/moz.build
-+++ b/js/src/build/moz.build
-@@ -25,6 +25,7 @@
- if CONFIG['JS_SHARED_LIBRARY']:
- GeckoSharedLibrary('js', linkage=None)
- SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
-+ LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
-
- # Ensure symbol versions of shared library on Linux do not conflict
- # with those in libxul.
diff --git a/srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch b/srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch
deleted file mode 100644
index 891a7652056..00000000000
--- a/srcpkgs/mozjs68/patches/003-fix-wasm-arm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-"Taken from firefox-esr"
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -243,9 +243,9 @@
- // If you run into compile problems on a tier-3 platform, you can disable the
- // emulation here.
-
--#if defined(__linux__) && defined(__arm__)
--# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#endif
-+// #if defined(__linux__) && defined(__arm__)
-+// # define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
-+// #endif
-
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
- # include <sys/user.h>
diff --git a/srcpkgs/mozjs68/patches/004-fix-musl-build.patch b/srcpkgs/mozjs68/patches/004-fix-musl-build.patch
deleted file mode 100644
index f629fa2ac35..00000000000
--- a/srcpkgs/mozjs68/patches/004-fix-musl-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-"Carried over from mozjs60"
-Upstream: No
-Reason: mozjs68 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
-https://github.com/void-linux/void-packages/issues/2598
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1272,6 +1272,9 @@
- *-android*|*-linuxandroid*)
- :
- ;;
-+ *-musl*)
-+ :
-+ ;;
- *)
- AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
- ;;
diff --git a/srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch b/srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch
deleted file mode 100644
index f6eababd1f2..00000000000
--- a/srcpkgs/mozjs68/patches/005-spidermonkey-checks-disable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Source:Fedora
-Reason: Checks failed(Todo: Figure out why)
-+++ a/config/run_spidermonkey_checks.py
-+++ b/config/run_spidermonkey_checks.py
-@@ -11,5 +11,5 @@
- for script in scripts:
- retcode = subprocess.call(
- [sys.executable, script], cwd=buildconfig.topsrcdir)
-- if retcode != 0:
-- raise Exception(script + " failed")
-+ #if retcode != 0:
-+ # raise Exception(script + " failed")
diff --git a/srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch b/srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch
deleted file mode 100644
index 71214b8eccf..00000000000
--- a/srcpkgs/mozjs68/patches/006-mozjs68.pc-honor-sysroot.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-"Carried over from mozjs60"
-Reason: Fix the '-include' directive, otherwise it tries to use the host's header
---- a/js/src/build/js.pc.in
-+++ b/js/src/build/js.pc.in
-@@ -11,4 +11,4 @@
- # Use -isystem for includes rather than -I, to mark them as "system headers"
- # that don't generate warning diagnostics. For justification, see
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1539036
--Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@
-+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -isystem ${includedir}/@JS_LIBRARY_NAME@
diff --git a/srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch b/srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch
deleted file mode 100644
index b1c7782adbf..00000000000
--- a/srcpkgs/mozjs68/patches/007-Remove-unused-LLVM-and-Rust-build-dependencies.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Source: openSUSE
-Upstream: No
-Description: Remove unused LLVM and Rust build dependencies
- Since the Javascript engine is normally part of Firefox, its build
- system has dependencies on the LLVM and Rust toolchains. This limits
- the number of architectures which mozjs68 can be built on.
- .
- It turns out, however, that neither LLVM nor Rust are used when mozjs68
- is being built and these build dependencies are therefore not necessary.
- .
- This patch removes them and allows mozjs68 to be built on any architecture.
- .
-Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959144
-Forwarded: no
-Last-Update: 2020-04-30
-
-Index: js/moz.configure
-===================================================================
---- a/js/moz.configure
-+++ a/js/moz.configure
-@@ -18,11 +18,6 @@ def building_js(build_project):
- option(env='JS_STANDALONE', default=building_js,
- help='Reserved for internal use')
-
--include('../build/moz.configure/rust.configure',
-- when='--enable-compile-environment')
--include('../build/moz.configure/bindgen.configure',
-- when='--enable-compile-environment')
--
- @depends('JS_STANDALONE')
- def js_standalone(value):
- if value:
-Index: moz.configure
-===================================================================
---- a/moz.configure
-+++ b/moz.configure
-@@ -598,36 +598,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags
-
- check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)
-
--
--@depends(host_c_compiler, c_compiler, bindgen_config_paths)
--def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):
-- clang = None
-- for compiler in (host_c_compiler, c_compiler):
-- if compiler and compiler.type == 'clang':
-- clang = compiler.compiler
-- break
-- elif compiler and compiler.type == 'clang-cl':
-- clang = os.path.join(os.path.dirname(compiler.compiler), 'clang')
-- break
--
-- if not clang and bindgen_config_paths:
-- clang = bindgen_config_paths.clang_path
-- llvm_objdump = 'llvm-objdump'
-- if clang:
-- out = check_cmd_output(clang, '--print-prog-name=llvm-objdump',
-- onerror=lambda: None)
-- if out:
-- llvm_objdump = out.rstrip()
-- return (llvm_objdump,)
--
--
--llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',
-- when='--enable-compile-environment',
-- paths=toolchain_search_path)
--
--add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)
--
--
- # Please do not add configure checks from here on.
-
- # Fallthrough to autoconf-based configure
diff --git a/srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch b/srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch
deleted file mode 100644
index 9c964e35299..00000000000
--- a/srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: qiaopengcheng <qiaopengcheng-hf@loongson.cn>
-Date: Sun, 2 Jun 2019 07:28:24 +0900
-Subject: Bug 1556197 - amend Bug-1544631 for fixing mips32.
-
----
- js/src/jit/mips32/MacroAssembler-mips32-inl.h | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/js/src/jit/mips32/MacroAssembler-mips32-inl.h b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
-index 1f7f4d1cf31..06d8773e92a 100644
---- a/js/src/jit/mips32/MacroAssembler-mips32-inl.h
-+++ b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
-@@ -69,6 +69,15 @@
- }
-
- // ===============================================================
-+// Load instructions
-+
-+void MacroAssembler::load32SignExtendToPtr(const Address& src, Register dest) {
-+ loadPtr(src, dest);
-+}
-+
-+// ===============================================================
-+
-+// ===============================================================
- // Logical instructions
-
- void MacroAssembler::andPtr(Register src, Register dest) { ma_and(dest, src); }
-@@ -820,19 +820,21 @@ void MacroAssembler::branchTestSymbol(Condition cond, const ValueOperand& value,
-
- void MacroAssembler::branchTestBigInt(Condition cond, Register tag,
- Label* label) {
-- branchTestBigIntImpl(cond, tag, label);
-+ MOZ_ASSERT(cond == Equal || cond == NotEqual);
-+ ma_b(tag, ImmTag(JSVAL_TAG_BIGINT), label, cond);
- }
-
- void MacroAssembler::branchTestBigInt(Condition cond, const BaseIndex& address,
- Label* label) {
- SecondScratchRegisterScope scratch2(*this);
-- splitTag(value, scratch2);
-+ computeEffectiveAddress(address, scratch2);
- branchTestBigInt(cond, scratch2, label);
- }
-
- void MacroAssembler::branchTestBigInt(Condition cond, const ValueOperand& value,
- Label* label) {
-- branchTestBigInt(cond, value.typeReg(), label);
-+ SecondScratchRegisterScope scratch2(*this);
-+ branchTestBigInt(cond, scratch2, label);
- }
-
- void MacroAssembler::branchTestBigIntTruthy(bool b, const ValueOperand& value,
diff --git a/srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch b/srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch
deleted file mode 100644
index abb140233a0..00000000000
--- a/srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mfbt/RandomNum.cpp 2020-04-29 23:49:40.000000000 +0200
-+++ b/mfbt/RandomNum.cpp 2020-08-04 19:29:36.127471301 +0200
-@@ -52,7 +52,7 @@
- # elif defined(__s390__)
- # define GETRANDOM_NR 349
- # elif defined(__mips__)
--# include <sgidefs.h>
-+# include <asm/sgidefs.h>
- # if _MIPS_SIM == _MIPS_SIM_ABI32
- # define GETRANDOM_NR 4353
- # elif _MIPS_SIM == _MIPS_SIM_ABI64
diff --git a/srcpkgs/mozjs68/template b/srcpkgs/mozjs68/template
deleted file mode 100644
index 80345a9ea9e..00000000000
--- a/srcpkgs/mozjs68/template
+++ /dev/null
@@ -1,71 +0,0 @@
-# Template file for 'mozjs68'
-pkgname=mozjs68
-version=68.11.0
-revision=1
-wrksrc="firefox-${version}"
-build_wrksrc=js/src
-build_style=gnu-configure
-hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive
- which python3"
-makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel
- python3-devel"
-depends="nspr>=4.19"
-short_desc="Mozilla JavaScript interpreter and library (68.x series)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://www.mozilla.org/js/"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160
-patch_args="-Np1"
-CXXFLAGS="-Wno-class-memaccess"
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- LDFLAGS+=" -latomic"
-fi
-
-do_configure() {
- local _args
-
- if [ "$CROSS_BUILD" ]; then
- export HOST_CC=cc
- export TARGET_CC="${CC}"
- export HOST_CFLAGS="-Os"
- export HOST_CXXFLAGS="-Os"
- _args+=" --target=$XBPS_CROSS_TRIPLET --enable-linker=bfd"
- fi
-
- autoconf-2.13 old-configure.in > old-configure
-
- touch ${wrksrc}/js/src/configure
- touch ${wrksrc}/js/src/old-configure
- SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --disable-jemalloc --disable-optimize --enable-ctypes \
- --enable-readline --enable-shared-js --enable-system-ffi \
- --enable-tests --with-intl-api --with-system-icu --with-system-nspr \
- --enable-unaligned-private-values --enable-hardening \
- --enable-release --with-system-zlib --target=${XBPS_TRIPLET} \
- --host=${XBPS_TRIPLET} \
- ${_args}
-}
-
-do_check() {
- dist/bin/jsapi-tests --format=none --exclude-random basic
-}
-
-post_install() {
- # Remove unneeded static library
- rm -f "${DESTDIR}"/usr/lib/*.ajs
-}
-
-mozjs68-devel_package() {
- depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/js68-config
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
- }
-}
diff --git a/srcpkgs/mozjs68/update b/srcpkgs/mozjs68/update
deleted file mode 100644
index 1947e19217f..00000000000
--- a/srcpkgs/mozjs68/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname='mozjs'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3eb0307347d..f156d66493c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -149,6 +149,7 @@ replaces="
mirrorbits<=0.5.1_1
mongroup<=0.4.1_2
mozjs52<=52.9.0_7
+ mozjs68<=68.11.0_1
phonon-backend-gstreamer<=4.9.0_2
phonon-backend-vlc<=0.9.1_3
polkit-qt<=0.112.0_5
From 3510c4a8dcfaa0dec5535157c66edf9ae6c7c804 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 27 Jan 2021 01:11:52 +0100
Subject: [PATCH 235/634] sfeed: update to 0.9.21.
---
srcpkgs/sfeed/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index bc9b448eedb..2ee3dd1dad0 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
# Template file for 'sfeed'
pkgname=sfeed
-version=0.9.20
+version=0.9.21
revision=1
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
license="ISC"
homepage="https://git.codemadness.org/sfeed"
distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=2451457a7745ea8519316315a8597331302e00778a9ff7bec58dfb241674d991
+checksum=bafe85bf38726a82bd30d56067de162708cdfc4cecd184069e2b94b20d55f14f
post_install() {
vlicense LICENSE
From 6677fcc8798d46f7e4f62fb26d4a3625a7166264 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Jan 2021 19:42:53 +0100
Subject: [PATCH 236/634] removed-packages: add gccgo/popcorn for ppc32 and
bump
---
srcpkgs/removed-packages/template | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f156d66493c..d8b7edf40b2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=14
+revision=15
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -197,3 +197,16 @@ replaces="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
replaces+=" timidity<=2.15.0_1"
fi
+
+case "$XBPS_TARGET_MACHINE" in
+ ppc64*) ;;
+ ppc*)
+ replaces+="
+ PopCorn<=0.4_5
+ libgo<=10.2.1pre1_1
+ libgo-devel<=10.2.1pre1_1
+ gcc-go<=10.2.1pre1_1
+ gcc-go-tools<=10.2.1pre1_1
+ "
+ ;;
+esac
From 8818eaa117978cd36d15c03b33f040e615fcf707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 237/634] fuse-zip: remove CXXFLAGS workaround.
No longer necessary.
Also fix distfile location, for some reason the 0.7.1 tarball had been
removed from downloads.
---
srcpkgs/fuse-zip/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..80f9de31cbd 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -2,6 +2,7 @@
pkgname=fuse-zip
version=0.7.1
revision=1
+wrksrc=agalanin-fuse-zip-0865d60054d9
build_style=gnu-makefile
make_build_args="all doc"
make_install_args="prefix=/usr"
@@ -11,9 +12,9 @@ short_desc="FUSE file system for ZIP archives"
maintainer="Matthias von Faber <mvf@gmx.eu>"
license="GPL-3.0-or-later"
homepage="https://bitbucket.org/agalanin/fuse-zip"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
+distfiles="${homepage}/get/${version}.tar.gz"
+checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195
-pre_build() {
- vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
+do_check() {
+ : requires some tcl modules
}
From 346412b9903d5226e7299aafa377f0b877828a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 238/634] splix: remove unnecessary build_style.
Also xlint.
---
srcpkgs/splix/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..366aab114bc 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -1,20 +1,19 @@
-# Template file for 'splix-svn'
+# Template file for 'splix'
pkgname=splix
version=2.0.0+svn315
revision=3
wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
makedepends="cups-devel mit-krb5-devel jbigkit-devel"
short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="http://splix.ap2c.org"
distfiles="${DEBIAN_SITE}/main/s/$pkgname/${pkgname}_$version.orig.tar.gz"
checksum="578a81bd5b1b97756a539c3bb6339fd109d54419887a73e705941da8aa7fac52"
-CXXFLAGS=" -fno-strict-aliasing"
+CXXFLAGS="-fno-strict-aliasing"
do_build() {
- sed -i rules.mk \
+ vsed -i rules.mk \
-e's;$(CXX) -o;$(CXX) $(LDFLAGS) -o;'
make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="true" drv
From cf2ebdc6d10244d81510c913a426cf83b08ba0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 Jan 2021 16:04:35 -0300
Subject: [PATCH 239/634] mozjs78: fix homepage and don't append to *FLAGS in
top level.
---
srcpkgs/mozjs78/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 38e6aded7c7..ebfb5180191 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -14,13 +14,13 @@ depends="nspr>=4.19"
short_desc="Mozilla JavaScript interpreter and library (78.x series)"
maintainer="q66 <daniel@octaforge.org>"
license="MPL-2.0"
-homepage="https://www.mozilla.org/js/"
+homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
checksum=965ccfcbb8c0aa97639911997c54be0fcf896fd388b03138952089af675ea918
patch_args="-Np1"
-CXXFLAGS+=" -Wno-class-memaccess"
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
+CXXFLAGS="-Wno-class-memaccess"
+LDFLAGS="-Wl,-z,stack-size=1048576"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 04c222711d3c1cef324f45ed174fcc7472c27201 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 26 Jan 2021 16:19:39 +0100
Subject: [PATCH 240/634] feh: update to 3.6.3.
---
srcpkgs/feh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 7ed1d95af54..7b891fa8f9c 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -1,6 +1,6 @@
# Template file for 'feh'
pkgname=feh
-version=3.6.2
+version=3.6.3
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -15,7 +15,7 @@ license="MIT-feh"
homepage="https://feh.finalrewind.org"
changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog"
distfiles="${homepage}/feh-${version}.tar.bz2"
-checksum=1649fb79d1a1242938cd64a468fd2666c8b1174421b1050244f39e01d3c7c634
+checksum=437420f37f11614e008d066e2a3bdefcfc78144c8212998b2bacdd5d21ea23b4
pre_build() {
vsed -i 's|doc/feh/examples|examples/feh|' config.mk
From a38d1b8a5a13db4e7a51bc88584c626fab732540 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 13:49:59 -0500
Subject: [PATCH 241/634] xbps-src: Improve the showing of variables
---
xbps-src | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/xbps-src b/xbps-src
index fa677084ce0..77969af84a1 100755
--- a/xbps-src
+++ b/xbps-src
@@ -836,6 +836,7 @@ case "$XBPS_TARGET" in
read_pkg ignore-problems
for sub_name in $subpackages; do
if [ $sub_name = $XBPS_TARGET_PKG ]; then
+ . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
${sub_name}_package
fi
done
@@ -859,6 +860,7 @@ case "$XBPS_TARGET" in
read_pkg ignore-problems
for sub_name in $subpackages; do
if [ $sub_name = $XBPS_TARGET_PKG ]; then
+ . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
${sub_name}_package
fi
done
@@ -886,6 +888,34 @@ case "$XBPS_TARGET" in
fi # The trailing space gets stripped before printing anyway
done
;;
+ dbulk-dump)
+ read_pkg
+ for x in pkgname version revision; do
+ printf '%s: %s\n' "$x" "${!x}"
+ done
+ for x in hostmakedepends makedepends depends; do
+ arr=(${!x})
+ if [[ ${#arr} -gt 0 ]]; then
+ printf '%s:\n' "$x"
+ printf ' %s\n' "${arr[@]}"
+ fi
+ done
+ if [[ $subpackages ]]; then
+ printf 'subpackages:\n'
+ for x in ${subpackages}; do
+ . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
+ ${x}_package
+ printf ' %s\n' "$x"
+ for x in depends; do
+ arr=(${!x})
+ if [[ ${#arr} -gt 0 ]]; then
+ printf ' %s:\n' "$x"
+ printf ' %s\n' "${arr[@]}"
+ fi
+ done
+ done
+ fi
+ ;;
show-options)
read_pkg ignore-problems
show_pkg_build_options
From c9cc1a38e528fc21d3890528325c9341d3af1f83 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 15:46:27 -0500
Subject: [PATCH 242/634] rust: rust-std never depended on itself
---
srcpkgs/rust/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 4d25635d409..6bb928e1478 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -354,7 +354,6 @@ rust-doc_package() {
rust-std_package() {
short_desc+=" - standard library"
- depends=""
pkg_install() {
vmove usr/lib/rustlib
}
From 7f7b62b3f24ccd331e2a327cd393540c74642ce8 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 28 Jan 2021 00:31:40 +0100
Subject: [PATCH 243/634] tmux: depend on ncurses-base
https://github.com/tmux/tmux/issues/743
---
srcpkgs/tmux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index 869beb5a4b2..df8e84bb4ab 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -1,10 +1,11 @@
# Template file for 'tmux'
pkgname=tmux
version=3.1c
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="byacc"
makedepends="libevent-devel ncurses-devel"
+depends="ncurses-base"
short_desc="Terminal Multiplexer"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="ISC"
From b0af8c78b0d1d513cc9055f57962d83402864b9e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Jan 2021 16:55:23 +0100
Subject: [PATCH 244/634] nsd: update to 4.3.5.
---
srcpkgs/nsd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 9b331fbaf93..98fe1d14f6c 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
# Template file for 'nsd'
pkgname=nsd
-version=4.3.4
+version=4.3.5
revision=1
build_style=gnu-configure
configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://www.nlnetlabs.nl/projects/nsd/"
changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3be834a97151a7ba8185e46bc37ff12c2f25f399755ae8a2d0e3711801528b50
+checksum=7da2b43e30b3d7f307722c608f719bfb169f0d985c764a34fa0669dc33484472
system_accounts="nsd"
nsd_homedir=/var/db/nsd
make_dirs="/var/db/nsd 0755 nsd nsd"
From 0cc734382a4a331390482348a6c69f66a6538eef Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 28 Jan 2021 00:59:14 +0100
Subject: [PATCH 245/634] gloobus-preview: conditionally depend on unoconv
---
srcpkgs/gloobus-preview/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gloobus-preview/template b/srcpkgs/gloobus-preview/template
index 05385fea396..96b57be7522 100644
--- a/srcpkgs/gloobus-preview/template
+++ b/srcpkgs/gloobus-preview/template
@@ -1,7 +1,7 @@
# Template file for 'gloobus-preview'
pkgname=gloobus-preview
version=2015.12.21
-revision=6
+revision=7
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3 gettext-devel xz"
makedepends="gettext-devel boost-devel gtk+3-devel gtksourceview-devel
@@ -9,7 +9,7 @@ makedepends="gettext-devel boost-devel gtk+3-devel gtksourceview-devel
poppler-glib-devel libspectre-devel djvulibre-devel libgxps-devel
freetype-devel glib-devel libX11-devel libarchive-devel"
depends="python3-dbus python3-gobject gst-libav gst-plugins-good1
- gst-plugins-bad1 gst-plugins-ugly1 ImageMagick unoconv"
+ gst-plugins-bad1 gst-plugins-ugly1 ImageMagick"
short_desc="GNOME's extension to preview all kinds of file"
maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
license="GPL-3.0-only"
@@ -17,6 +17,11 @@ homepage="https://github.com/antonio-malcolm/gloobus-preview"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=c43f1ed00ccc3603042abb78b871665ff6c6a89987d7f854b9b4254b7cf9d86c
+if [ -z "$CROSS_BUILD" ]; then
+ # unoconv depends in libreoffice, which is nocross
+ depends+=" unoconv"
+fi
+
pre_configure() {
autoreconf -fi
}
From 18f3ed70100b2684f33b4772550304883d030680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Jan 2021 07:12:47 +0700
Subject: [PATCH 246/634] update_check: update GNOME pattern for GNOME 40
---
common/xbps-src/shutils/update_check.sh | 9 +++++++--
srcpkgs/NetworkManager/update | 1 -
srcpkgs/adwaita-icon-theme/update | 1 -
srcpkgs/clutter/update | 2 --
srcpkgs/glib-networking/update | 1 -
srcpkgs/gnome-control-center/update | 1 -
srcpkgs/gnome-desktop/update | 1 -
srcpkgs/gnome-online-accounts/update | 2 --
srcpkgs/gobject-introspection/update | 2 --
srcpkgs/gsettings-desktop-schemas/update | 1 -
srcpkgs/gsound/update | 2 --
srcpkgs/libgweather/update | 2 --
srcpkgs/mutter/update | 2 --
srcpkgs/simple-scan/update | 1 -
14 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/NetworkManager/update
delete mode 100644 srcpkgs/adwaita-icon-theme/update
delete mode 100644 srcpkgs/clutter/update
delete mode 100644 srcpkgs/glib-networking/update
delete mode 100644 srcpkgs/gnome-control-center/update
delete mode 100644 srcpkgs/gnome-desktop/update
delete mode 100644 srcpkgs/gnome-online-accounts/update
delete mode 100644 srcpkgs/gobject-introspection/update
delete mode 100644 srcpkgs/gsettings-desktop-schemas/update
delete mode 100644 srcpkgs/gsound/update
delete mode 100644 srcpkgs/mutter/update
delete mode 100644 srcpkgs/simple-scan/update
diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index d88fb12e253..4ce6129a511 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -22,7 +22,12 @@ update_check() {
export LC_ALL=C
if [ -z "$site" ]; then
- printf '%s\n' "$homepage"
+ case "$distfiles" in
+ # only consider versions those exist in ftp.gnome.org
+ *ftp.gnome.org*) ;;
+ *)
+ printf '%s\n' "$homepage" ;;
+ esac
for i in $distfiles; do
printf '%s\n' "${i%/*}/"
done
@@ -126,7 +131,7 @@ update_check() {
url="https://bitbucket.org/$pkgurlname/downloads"
rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
*ftp.gnome.org*)
- : ${pattern="\Q$pkgname\E-\K[0-9]+\.[0-9]*[02468]\.[0-9.]*[0-9](?=)"}
+ : ${pattern="\Q$pkgname\E-\K([13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
*kernel.org/pub/linux/kernel/*)
rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
diff --git a/srcpkgs/NetworkManager/update b/srcpkgs/NetworkManager/update
deleted file mode 100644
index a73db8805ed..00000000000
--- a/srcpkgs/NetworkManager/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/adwaita-icon-theme/update b/srcpkgs/adwaita-icon-theme/update
deleted file mode 100644
index a73db8805ed..00000000000
--- a/srcpkgs/adwaita-icon-theme/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/clutter/update b/srcpkgs/clutter/update
deleted file mode 100644
index 0980963f6df..00000000000
--- a/srcpkgs/clutter/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="1.*[13579].*"
diff --git a/srcpkgs/glib-networking/update b/srcpkgs/glib-networking/update
deleted file mode 100644
index a73db8805ed..00000000000
--- a/srcpkgs/glib-networking/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/gnome-control-center/update b/srcpkgs/gnome-control-center/update
deleted file mode 100644
index a73db8805ed..00000000000
--- a/srcpkgs/gnome-control-center/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/gnome-desktop/update b/srcpkgs/gnome-desktop/update
deleted file mode 100644
index a73db8805ed..00000000000
--- a/srcpkgs/gnome-desktop/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/gnome-online-accounts/update b/srcpkgs/gnome-online-accounts/update
deleted file mode 100644
index a84fbbad8b1..00000000000
--- a/srcpkgs/gnome-online-accounts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="3.*[13579].*"
diff --git a/srcpkgs/gobject-introspection/update b/srcpkgs/gobject-introspection/update
deleted file mode 100644
index 0980963f6df..00000000000
--- a/srcpkgs/gobject-introspection/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="1.*[13579].*"
diff --git a/srcpkgs/gsettings-desktop-schemas/update b/srcpkgs/gsettings-desktop-schemas/update
deleted file mode 100644
index a73db8805ed..00000000000
--- a/srcpkgs/gsettings-desktop-schemas/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.[0-9]*[13579].*"
diff --git a/srcpkgs/gsound/update b/srcpkgs/gsound/update
deleted file mode 100644
index a84fbbad8b1..00000000000
--- a/srcpkgs/gsound/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="3.*[13579].*"
diff --git a/srcpkgs/libgweather/update b/srcpkgs/libgweather/update
index a84fbbad8b1..e69de29bb2d 100644
--- a/srcpkgs/libgweather/update
+++ b/srcpkgs/libgweather/update
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="3.*[13579].*"
diff --git a/srcpkgs/mutter/update b/srcpkgs/mutter/update
deleted file mode 100644
index a84fbbad8b1..00000000000
--- a/srcpkgs/mutter/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="${GNOME_SITE}/$pkgname/cache.json"
-ignore="3.*[13579].*"
diff --git a/srcpkgs/simple-scan/update b/srcpkgs/simple-scan/update
deleted file mode 100644
index 92dea937506..00000000000
--- a/srcpkgs/simple-scan/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[0-9].[0-9][13579]*"
From a1d866ae211a2268265f869e223580629239ef06 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:28 +0100
Subject: [PATCH 247/634] shiboken2: update to 5.15.2, testing support, remove
dummy packages
add SHIBOKEN_CLANG_OPTIONS env variable support to manage crossbuild
---
common/shlibs | 2 -
srcpkgs/libshiboken-python3 | 1 -
srcpkgs/python3-shiboken | 1 -
...ng-options-via-environment-variables.patch | 21 +++++
.../patches/tests-need-python-modules.patch | 13 +++
.../patches/tests-python-syntax.patch | 91 +++++++++++++++++++
srcpkgs/shiboken2/template | 19 +---
7 files changed, 128 insertions(+), 20 deletions(-)
delete mode 120000 srcpkgs/libshiboken-python3
delete mode 120000 srcpkgs/python3-shiboken
create mode 100644 srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
create mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch
create mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch
diff --git a/common/shlibs b/common/shlibs
index f73bd5d4ed4..c6f930b953a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1677,8 +1677,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
libXaw3d.so.8 libXaw3d-1.6.2_1
-libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
-libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
libshiboken2.so.5.15 libshiboken2-5.15.0_1
libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/libshiboken-python3
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
deleted file mode 120000
index b1fbca61c21..00000000000
--- a/srcpkgs/python3-shiboken
+++ /dev/null
@@ -1 +0,0 @@
-shiboken2
\ No newline at end of file
diff --git a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
new file mode 100644
index 00000000000..f8724b96bfb
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
@@ -0,0 +1,21 @@
+Add ability to pass additional options to clang via environnement variable.
+With help from https://github.com/void-linux/void-packages/pull/26962
+
+--- sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
++++ sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+@@ -305,6 +305,15 @@
+ QByteArrayList emulatedCompilerOptions()
+ {
+ QByteArrayList result;
++
++ QByteArray shiboken_clang_options = qgetenv("SHIBOKEN_CLANG_OPTIONS");
++ // split to avoid double quoting drived by space inside it
++ if (!shiboken_clang_options.isEmpty()) {
++ for (const QByteArray &item: shiboken_clang_options.split(' ')) {
++ result.append(item);
++ }
++ }
++
+ #if defined(Q_CC_MSVC)
+ HeaderPaths headerPaths;
+ result.append(QByteArrayLiteral("-fms-compatibility-version=19"));
diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
new file mode 100644
index 00000000000..24054690b09
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch
@@ -0,0 +1,13 @@
+tests need python modules that are not installed yet: so point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
+
+--- sources/shiboken2/tests/CMakeLists.txt.ORIG 2020-09-09 14:45:42.000000000 +0200
++++ sources/shiboken2/tests/CMakeLists.txt 2020-11-12 14:16:46.577206385 +0100
+@@ -53,6 +53,6 @@
+ list(FIND test_blacklist ${test_name} expect_fail)
+ add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})
+- set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}")
++ set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}")
+ set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT})
+ if (${expect_fail} GREATER -1)
+ set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE)
diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..5151c3cc71a
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch
@@ -0,0 +1,91 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+ "# Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt | 3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp | 2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+ darwin py3
+ [QtCore::qfileread_test]
+ darwin
+-# Nested exception in Python 3
+-[QtCore::qflags_test]
+- py3
+ [QtCore::qobject_connect_notify_test]
+ linux
+ darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+
+ '''Test cases for QFlags'''
+
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+ def testWrongType(self):
+ '''Wrong type passed to QFlags binary operators'''
++ for op in operator.or_, operator.and_, operator.xor:
++ for x in '43', 'jabba', QObject, object:
++ self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++ self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++ # making sure this actually does not fail all the time
++ self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+
+- self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+- self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+- self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+- self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+- self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+
+ if __name__ == '__main__':
+ unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+ s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+ << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+ s << "#endif\n\n";
++ s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++ << INDENT << "return nullptr;\n" << outdent(INDENT);
+ s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+ s << INDENT << "return ";
+ writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+--
+2.29.2
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index d0072254842..6a7298d51d3 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,11 @@
# Template file for 'shiboken2'
pkgname=shiboken2
-version=5.15.0
-revision=3
+version=5.15.2
+revision=1
_pkgname="pyside-setup-opensource-src-${version}"
wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
build_wrksrc="sources/shiboken2"
build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
hostmakedepends="cmake python3-devel"
makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
libxslt-devel python3-numpy"
@@ -16,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
python_version=3
export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
@@ -50,15 +49,3 @@ python3-shiboken2_package() {
vmove ${py3_sitelib}
}
}
-
-python3-shiboken_package() {
- short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
- depends="python3-shiboken2-${version}_${revision}"
- build_style=meta
-}
-
-libshiboken-python3_package() {
- short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
- depends="python3-shiboken2-${version}_${revision}"
- build_style=meta
-}
From 9cee677acaaba092fb667974790bbd895fdee458 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:31 +0100
Subject: [PATCH 248/634] python3-pyside2: update to 5.15.2, testing support,
remove dummy packages
---
common/shlibs | 2 -
srcpkgs/libpyside-python3 | 1 -
srcpkgs/python3-pyenet | 1 -
srcpkgs/python3-pyside | 1 -
srcpkgs/python3-pyside-phonon | 1 -
.../patches/crossbuild-for-shiboken2.patch | 18 +--
.../patches/tests-correct-build_dir.patch | 14 +++
.../patches/tests-disable-invalid-ones.patch | 74 ++++++++++++
...tests-find-python-modules-from-build.patch | 21 ++++
.../patches/tests-python-syntax.patch | 106 ++++++++++++++++++
srcpkgs/python3-pyside2/template | 71 ++++++------
11 files changed, 263 insertions(+), 47 deletions(-)
delete mode 120000 srcpkgs/libpyside-python3
delete mode 120000 srcpkgs/python3-pyenet
delete mode 120000 srcpkgs/python3-pyside
delete mode 120000 srcpkgs/python3-pyside-phonon
create mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
create mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
create mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
create mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
diff --git a/common/shlibs b/common/shlibs
index c6f930b953a..48d6076467a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,8 +1678,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
libXaw3d.so.8 libXaw3d-1.6.2_1
libshiboken2.so.5.15 libshiboken2-5.15.0_1
-libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
-libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
libpyside2.so.5.15 libpyside2-python3-5.15.0_1
libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libpyside-python3 b/srcpkgs/libpyside-python3
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/libpyside-python3
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyenet b/srcpkgs/python3-pyenet
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyenet
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside b/srcpkgs/python3-pyside
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside-phonon b/srcpkgs/python3-pyside-phonon
deleted file mode 120000
index bb1745350a8..00000000000
--- a/srcpkgs/python3-pyside-phonon
+++ /dev/null
@@ -1 +0,0 @@
-python3-pyside2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
index 5a071a33d20..daad1fea702 100644
--- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
+++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch
@@ -1,11 +1,11 @@
--- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG
+++ sources/pyside2/cmake/Macros/PySideModules.cmake
-@@ -123,7 +123,7 @@
- BYPRODUCTS ${${module_SOURCES}}
- COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
- "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
-- --include-paths=${shiboken_include_dirs}
-+ --include-paths=${shiboken_include_dirs}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include
- ${shiboken_framework_include_dirs_option}
- --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}
- --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+@@ -94,7 +94,7 @@
+ # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+ # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+ string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+- set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++ set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include)
+ set(shiboken_framework_include_dirs_option "")
+ if(CMAKE_HOST_APPLE)
+ set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")
diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
new file mode 100644
index 00000000000..540e4304958
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch
@@ -0,0 +1,14 @@
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/CMakeLists.txt.ORIG 2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/CMakeLists.txt 2020-11-24 11:42:34.629110123 +0100
+@@ -7,8 +7,7 @@
+
+ # BUILD_DIR and QT_DIR are used by init_paths.py for setting
+ # the path to the testbinding module
+- get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
+- get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY)
++ set(BUILD_DIR "${CMAKE_BINARY_DIR}")
+ set(QT_DIR "${_qt5Core_install_prefix}")
+
+ macro(TEST_QT_MODULE var name)
diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
new file mode 100644
index 00000000000..ca4894b6fa9
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch
@@ -0,0 +1,74 @@
+Disable failing tests. Almost of these are related to OpenGL that is
+unsupported by vnc virtual backend.
+
+Raw testing Status: 98% tests passed, 9 tests failed out of 471
+
+--- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(datavisualization_test.py)
+--- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtGui/CMakeLists.txt
+@@ -20,14 +20,12 @@
+ PYSIDE_TEST(qcolor_test.py)
+ PYSIDE_TEST(qcolor_reduce_test.py)
+ PYSIDE_TEST(qcursor_test.py)
+-PYSIDE_TEST(qdatastream_gui_operators_test.py)
+ PYSIDE_TEST(qdesktopservices_test.py)
+ PYSIDE_TEST(qfontmetrics_test.py)
+ PYSIDE_TEST(qguiapplication_test.py)
+ PYSIDE_TEST(qicon_test.py)
+ PYSIDE_TEST(qitemselection_test.py)
+ PYSIDE_TEST(qmatrix_test.py)
+-PYSIDE_TEST(qopenglbuffer_test.py)
+ PYSIDE_TEST(qpainter_test.py)
+ PYSIDE_TEST(qpdfwriter_test.py)
+ PYSIDE_TEST(qpixelformat_test.py)
+--- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+@@ -1,2 +1 @@
+-PYSIDE_TEST(qglbuffer_test.py)
+ PYSIDE_TEST(qglwidget_test.py)
+--- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt
+@@ -1 +0,0 @@
+-PYSIDE_TEST(debugger_test.py)
+--- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+
+-PYSIDE_TEST(web_engine_custom_scheme.py)
+--- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt
+@@ -26,4 +26,3 @@
+ ##
+ #############################################################################
+
+-PYSIDE_TEST(pyside-474-qtwebengineview.py)
+--- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/QtWidgets/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ PYSIDE_TEST(application_test.py)
+ PYSIDE_TEST(bug_172.py)
+ PYSIDE_TEST(bug_243.py)
+-PYSIDE_TEST(bug_307.py)
+ PYSIDE_TEST(bug_324.py)
+ PYSIDE_TEST(bug_338.py)
+ PYSIDE_TEST(bug_363.py)
+@@ -131,7 +131,6 @@
+ PYSIDE_TEST(qtoolbox_test.py)
+ PYSIDE_TEST(qvariant_test.py)
+ PYSIDE_TEST(qwidget_setlayout_test.py)
+-PYSIDE_TEST(qwidget_test.py)
+ PYSIDE_TEST(qcolormap_test.py)
+ PYSIDE_TEST(reference_count_test.py)
+ PYSIDE_TEST(signature_test.py)
+--- sources/pyside2/tests/registry/CMakeLists.txt.ORIG
++++ sources/pyside2/tests/registry/CMakeLists.txt
+@@ -37,4 +37,3 @@
+ ##
+ #############################################################################
+
+-PYSIDE_TEST(existence_test.py)
diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
new file mode 100644
index 00000000000..673998bc049
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch
@@ -0,0 +1,21 @@
+tests need python modules that are not installed yet: point the built ones.
+Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430
+
+--- sources/pyside2/tests/init_paths.py.ORIG 2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/init_paths.py 2020-11-21 23:36:33.131282473 +0100
+@@ -75,12 +75,12 @@
+
+ python_dirs = [os.path.join(src_dir, 'util')] # Helper module
+
+- pyside_build_dir = os.path.join(get_build_dir(), 'pyside2')
+- python_dirs.append(pyside_build_dir) # for PySide2
++ pyside_build_dir = os.path.join(get_build_dir(), 'PySide2')
++ python_dirs.append(get_build_dir()) # for PySide2
+ lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')]
+
+ if testbindings_module:
+- python_dirs.append(os.path.join(pyside_build_dir,
++ python_dirs.append(os.path.join(get_build_dir(),
+ 'tests', 'pysidetest'))
+ lib_dirs.append(_get_qt_lib_dir())
+
diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
new file mode 100644
index 00000000000..2c2e1367907
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch
@@ -0,0 +1,106 @@
+This changeset is about both shiboken2 and python3-pyside2
+(that are separated packages)
+upstream: yes
+
+From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001
+From: Christian Tismer <tismer@stackless.com>
+Date: Thu, 3 Dec 2020 13:38:58 +0100
+Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code
+
+There was a years-old qflags test failing on Python 3.
+It was blacklisted with the comment
+
+ "# Nested exception in Python 3"
+
+This was nonsense: The test was wrong also for Python 2.
+It just happened to work, because Python 2 had some weird
+errors leaking. The real bug was in missing error handling
+in cppgenerator.cpp .
+
+See the main description in the issue.
+
+Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f
+Task-number: PYSIDE-1442
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75)
+---
+ build_history/blacklist.txt | 3 ---
+ sources/pyside2/tests/QtCore/qflags_test.py | 12 +++++++-----
+ .../shiboken2/generator/shiboken2/cppgenerator.cpp | 2 ++
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git build_history/blacklist.txt build_history/blacklist.txt
+index 9b63f9784..2a2a5d4c4 100644
+--- build_history/blacklist.txt
++++ build_history/blacklist.txt
+@@ -18,9 +18,6 @@
+ darwin py3
+ [QtCore::qfileread_test]
+ darwin
+-# Nested exception in Python 3
+-[QtCore::qflags_test]
+- py3
+ [QtCore::qobject_connect_notify_test]
+ linux
+ darwin
+diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
+index 08a7c55b1..e1e989c1e 100644
+--- sources/pyside2/tests/QtCore/qflags_test.py
++++ sources/pyside2/tests/QtCore/qflags_test.py
+@@ -30,6 +30,7 @@
+
+ '''Test cases for QFlags'''
+
++import operator
+ import os
+ import sys
+ import unittest
+@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase):
+ class QFlagsWrongType(unittest.TestCase):
+ def testWrongType(self):
+ '''Wrong type passed to QFlags binary operators'''
++ for op in operator.or_, operator.and_, operator.xor:
++ for x in '43', 'jabba', QObject, object:
++ self.assertRaises(TypeError, op, Qt.NoItemFlags, x)
++ self.assertRaises(TypeError, op, x, Qt.NoItemFlags)
++ # making sure this actually does not fail all the time
++ self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43)
+
+- self.assertRaises(TypeError, Qt.NoItemFlags | '43')
+- self.assertRaises(TypeError, Qt.NoItemFlags & '43')
+- self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags)
+- self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags)
+- self.assertRaises(TypeError, Qt.NoItemFlags & QObject())
+
+ if __name__ == '__main__':
+ unittest.main()
+diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+index ff44db955..87ddd73a5 100644
+--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp
++++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
+ s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
+ << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";
+ s << "#endif\n\n";
++ s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT)
++ << INDENT << "return nullptr;\n" << outdent(INDENT);
+ s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n";
+ s << INDENT << "return ";
+ writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult"));
+--
+2.29.2
+
+Fix python warning about 'is not' usage.
+This diff is DISTINCT from the previous patch
+
+--- sources/pyside2/tests/QtWidgets/qwidget_test.py 2020-11-11 13:51:30.000000000 +0100
++++ sources/pyside2/tests/QtWidgets/qwidget_test.py 2020-11-24 14:28:06.103093649 +0100
+@@ -73,7 +73,7 @@
+ self.assertTrue(not widget.isVisible())
+ widget.setVisible(True)
+ self.assertTrue(widget.isVisible())
+- self.assertTrue(widget.winId() is not 0)
++ self.assertTrue(widget.winId() != 0)
+ # skip this test on macOS since no native events are received
+ if sys.platform == 'darwin':
+ return
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index fe69087e4d0..6040ef39243 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,12 +1,12 @@
# Template file for 'python3-pyside2'
pkgname=python3-pyside2
-version=5.15.0
-revision=2
+version=5.15.2
+revision=1
_pkgname="pyside-setup-opensource-src-${version}"
wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
build_wrksrc="sources/pyside2"
build_style=cmake
-configure_args="-DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python"
hostmakedepends="cmake python3 shiboken2"
makedepends="python3-devel libshiboken2-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc
@@ -18,34 +18,61 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
qt5-serialport-devel
$(vopt_if webengine 'qt5-webengine-devel')"
depends="python3-shiboken2"
+checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
short_desc="Python3 bindings for the Qt5 toolkit"
maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
+
+build_options="webengine"
+desc_option_webengine="Build Qt5 WebEngine bindings"
+
+subpackages="libpyside2-python3-devel libpyside2-python3"
# needed by shiboken2 runtime
-export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
+export CLANG_INSTALL_DIR=/usr
if [ ${CROSS_BUILD} ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools qt5-remoteobjects qt5-scxml"
fi
-build_options="webengine"
-desc_option_webengine="Build Qt5 WebEngine bindings"
-
if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
- build_options_default="webengine"
+ if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
+ build_options_default="webengine"
+ fi
fi
-subpackages="libpyside2-python3-devel libpyside2-python3 libpyside-python3
- python3-pyside python3-pyside-phonon python3-pyenet"
-
if [ "$build_option_webengine" ]; then
subpackages+=" python3-pyside2-webengine"
fi
+pre_build() {
+ if [ ${CROSS_BUILD} ]; then
+
+ # make clang of shiboken aware of crossbuild
+ SHIBOKEN_CLANG_OPTIONS="--target=${XBPS_CROSS_TRIPLET}"
+ SHIBOKEN_CLANG_OPTIONS+=" --sysroot=/usr/${XBPS_CROSS_TRIPLET}"
+
+ # qt5 is built with gcc, so shiboken's clang needs gcc corresponding headers
+ local gcc_ver="$(${XBPS_CROSS_TRIPLET}-gcc -dumpversion)"
+ local inc_root="/usr/${XBPS_CROSS_TRIPLET}/usr/include/c++/${gcc_ver}"
+
+ SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}"
+ SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/${XBPS_CROSS_TRIPLET}"
+ # uneeded so far
+ SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/backward"
+
+ export SHIBOKEN_CLANG_OPTIONS
+ fi
+}
+
+pre_check() {
+ # no virtual backend is fine for OpenGL, vnc is fine for Qml tests
+ export QT_QPA_PLATFORM=vnc
+}
+
python3-pyside2-webengine_package() {
depends="python3-pyside2-${version}_${revision}"
short_desc+=" - WebEngine component"
@@ -73,23 +100,3 @@ libpyside2-python3_package() {
vmove "usr/lib/*.so.*"
}
}
-
-libpyside-python3_package() {
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
-
-python3-pyside_package() {
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
-
-python3-pyside-phonon_package() {
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
-
-python3-pyenet_package() {
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
From 2d4ffba2ffb7115be1e91d2bddbc8b9ca35457b2 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:33 +0100
Subject: [PATCH 249/634] pyside2-tools: update to 5.15.2, testing support
Closes: #26962 [via git-merge-pr]
---
.../patches/tests-use-qt5-rcc-and-uic.patch | 34 +++++++++++++++++++
srcpkgs/pyside2-tools/template | 10 ++++--
2 files changed, 41 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
new file mode 100644
index 00000000000..0dc0f0bfb11
--- /dev/null
+++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch
@@ -0,0 +1,34 @@
+--- sources/pyside2-tools/tests/CMakeLists.txt
++++ sources/pyside2-tools/tests/CMakeLists.txt
+@@ -1,4 +1,11 @@
++
++# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc,
++# with '-g python' option
++
++FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
++FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
++
+ add_subdirectory(rcc)
+-add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
++add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui")
+ set_tests_properties(QWizard PROPERTIES
+ ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}")
+--- sources/pyside2-tools/tests/rcc/CMakeLists.txt
++++ sources/pyside2-tools/tests/rcc/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ macro(ADD_RCC_TEST name pyfile qrcfile)
+ add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
+- ${PYSIDERCC_EXECUTABLE}
++ ${PYSIDE2RCCBINARY}
+ ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile}
+ ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile}
+ ${CMAKE_CURRENT_SOURCE_DIR})
+--- sources/pyside2-tools/tests/rcc/run_test.sh
++++ sources/pyside2-tools/tests/rcc/run_test.sh
+@@ -8,5 +8,5 @@
+ # $3: qrc file
+
+ export PYTHONPATH=$PYTHONPATH:`pwd`
+-$1 -o `basename $3 .qrc`_rc.py $3
++$1 --generator=python -o `basename $3 .qrc`_rc.py $3
+ `pkg-config shiboken2 --variable=python_interpreter` $2
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 4e9fa743c30..7b49a46ec81 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,23 +1,27 @@
# Template file for 'pyside2-tools'
pkgname=pyside2-tools
-version=5.15.0
+version=5.15.2
revision=1
_pkgname="pyside-setup-opensource-src-${version}"
wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
build_wrksrc="sources/pyside2-tools"
build_style=cmake
-configure_args="-DBUILD_TESTS=OFF"
hostmakedepends="cmake python3-devel shiboken2"
makedepends="python3-devel libshiboken2-devel qt5-devel
libpyside2-python3-devel"
+checkdepends="pkg-config"
short_desc="Python3 bindings for the Qt5 toolkit"
maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
+checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
python_version=3
if [ ${CROSS_BUILD} ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
fi
+
+pre_check() {
+ export QT_QPA_PLATFORM=offscreen
+}
From 29cce1b84edd432718ae134036ff7b0c780b1ed9 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 27 Jan 2021 19:52:21 +0100
Subject: [PATCH 250/634] New package: libopenaptx-0.2.0.
---
common/shlibs | 1 +
srcpkgs/libopenaptx-devel | 1 +
srcpkgs/libopenaptx/template | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
create mode 120000 srcpkgs/libopenaptx-devel
create mode 100644 srcpkgs/libopenaptx/template
diff --git a/common/shlibs b/common/shlibs
index 48d6076467a..1019bbbe54f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4036,3 +4036,4 @@ libutil-cmdline-samba4.so samba-libs-4.13.2_1
libwinbind-client-samba4.so samba-libs-4.13.2_1
libsixel.so.1 libsixel-1.8.6_1
libpamtest.so.0 pam_wrapper-1.1.3_1
+libopenaptx.so.0 libopenaptx-0.2.0_1
diff --git a/srcpkgs/libopenaptx-devel b/srcpkgs/libopenaptx-devel
new file mode 120000
index 00000000000..2791f43ede1
--- /dev/null
+++ b/srcpkgs/libopenaptx-devel
@@ -0,0 +1 @@
+libopenaptx
\ No newline at end of file
diff --git a/srcpkgs/libopenaptx/template b/srcpkgs/libopenaptx/template
new file mode 100644
index 00000000000..0f07b0b1a25
--- /dev/null
+++ b/srcpkgs/libopenaptx/template
@@ -0,0 +1,21 @@
+# Template file for 'libopenaptx'
+pkgname=libopenaptx
+version=0.2.0
+revision=1
+build_style=gnu-makefile
+short_desc="Open Source implementation of Audio Processing Technology codec (aptX)"
+maintainer="Paper <paper@tilde.institute>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/pali/libopenaptx/"
+distfiles="https://github.com/pali/libopenaptx/releases/download/${version}/libopenaptx-${version}.tar.gz"
+checksum=51a13a34bb188a87ab1deb64a090ab42a4755d7b02c2bdaf3b8136f749b71b84
+
+libopenaptx-devel_package() {
+ depends="libopenaptx>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From a0b883aef89ee6e1679c319f20b4febb3ac72923 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 27 Jan 2021 19:52:42 +0100
Subject: [PATCH 251/634] pipewire: support aac, aptx, add translations
---
srcpkgs/pipewire/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 79a4d0e28b5..e39d7ab0511 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,14 +1,16 @@
# Template file for 'pipewire'
pkgname=pipewire
version=0.3.20
-revision=1
+revision=2
build_style=meson
configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
-Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true
-Dudevrulesdir=/usr/lib/udev/rules.d"
-hostmakedepends="doxygen graphviz pkg-config xmltoman"
+hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
+# LDAC support can be enabled when ldacbt is packaged
makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
- sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel"
+ sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
+ libopenaptx-devel fdk-aac-devel"
depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
short_desc="Server and user space API to deal with multimedia pipelines"
maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
From 5ec6b16aaa1f99a6bdf24b1f591dcd1ce207437c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 00:55:08 -0300
Subject: [PATCH 252/634] wxWidgets: fix some cross builds.
Same fix as applied to wxWidgets-gtk3 in aecd085a.
---
srcpkgs/wxWidgets/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template
index bd43970594d..d02563fa6bd 100644
--- a/srcpkgs/wxWidgets/template
+++ b/srcpkgs/wxWidgets/template
@@ -1,7 +1,7 @@
# Template file for 'wxWidgets'
pkgname=wxWidgets
version=3.0.5.1
-revision=3
+revision=4
configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack
--with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview"
build_style=gnu-configure
@@ -44,10 +44,11 @@ post_install() {
${DESTDIR}/usr/lib/wx/config/${_config}
fi
- sed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
+ vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \
-e '/^bindir="\/usr/s,/usr,${exec_prefix},' \
-e 's/is_cross() { .* }/is_cross() { false; }/g' \
-e '/--\*=\*)/i --host=\*) continue;;' \
+ -e "s/lib${XBPS_WORDSIZE}/lib/g" \
${DESTDIR}/usr/lib/wx/config/${_config}
ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0
ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config
From 5fcabf1068a8eaad5dd4028d5c0e93fa2a702c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 15:30:06 -0300
Subject: [PATCH 253/634] musl: remove repository config file and clean up.
- musl doesn't need kernel-libc-headers in order to be built
- no need to conflict with glibc, since it can't be built for *-musl
targets
- the repository config file will be created in xbps instead, but it
isn't even truly needed, since XBPS "knows" when it was built for musl
---
srcpkgs/musl/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a6a49ff3d05..5ba5425709b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,19 +2,17 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=5
+revision=6
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
configure_args="--prefix=/usr --disable-gcc-wrapper"
-makedepends="kernel-libc-headers"
short_desc="Musl C library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
-conflicts="glibc>=0"
nostrip_files="libc.so"
shlib_provides="libc.so"
@@ -27,7 +25,7 @@ post_build() {
do_install() {
# Move everything to /usr.
vmkdir usr/lib
- ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/lib
+ ln -s usr/lib ${DESTDIR}/lib
make DESTDIR=${DESTDIR} install
rm ${DESTDIR}/lib
# provide ldd
@@ -41,9 +39,7 @@ do_install() {
vman ${FILESDIR}/getconf.1
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
- # Create xbps.d(5) arch override file
- vmkdir usr/share/xbps.d
- echo "architecture=${XBPS_TARGET_MACHINE}" > ${DESTDIR}/usr/share/xbps.d/musl-arch.conf
+
vlicense COPYRIGHT
}
@@ -52,7 +48,7 @@ musl-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
- vmove usr/lib/*.o
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.o"
}
}
From c663699b27c2f03e030d5a1be50ff43096881db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 31 Dec 2020 15:33:52 -0300
Subject: [PATCH 254/634] xbps: add architecture file for all archs.
This adds an equivalent for the musl-arch.conf file that was previously
contained in the musl package. No need to special case musl, so add it
for all archs.
---
srcpkgs/xbps/template | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 66deab88d1b..e43050da90e 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=2
+revision=3
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
@@ -33,21 +33,23 @@ fi
do_configure() {
./configure --prefix=/usr --sysconfdir=/etc ${CHROOT_READY:+--enable-tests}
}
+
post_install() {
+ local _repo="repository=https://alpha.de.repo.voidlinux.org" _suffix=
case "$XBPS_TARGET_MACHINE" in
aarch64*) # XXX different repo location
- echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64" > \
- ${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+ _suffix="/aarch64"
;;
*-musl) # XXX different repo location
- echo "repository=https://alpha.de.repo.voidlinux.org/current/musl" > \
- ${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
- ;;
- *)
- echo "repository=https://alpha.de.repo.voidlinux.org/current" > \
- ${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+ _suffix="/musl"
;;
esac
+
+ echo "${_repo}/current${_suffix}" > \
+ ${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+ echo "architecture=${XBPS_TARGET_MACHINE}" > \
+ ${DESTDIR}/usr/share/xbps.d/xbps-arch.conf
+
vlicense LICENSE
vlicense LICENSE.3RDPARTY
}
@@ -58,6 +60,7 @@ libxbps_package() {
vmove "usr/lib/*.so.*"
}
}
+
libxbps-devel_package() {
short_desc+=" - runtime library (development files)"
depends="${makedepends} libxbps>=${version}_${revision}"
From 2921064295eb8e86f0d3bf9fcc674f34152aa266 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:27:23 +0100
Subject: [PATCH 255/634] mc: update to 4.8.26.
Also fix homepage.
Closes: #28175 [via git-merge-pr]
---
srcpkgs/mc/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 46ddd9d74e7..ebf5141eb48 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -1,6 +1,6 @@
# Template file for 'mc'
pkgname=mc
-version=4.8.25
+version=4.8.26
revision=1
build_style=gnu-configure
configure_args="--with-screen=slang --without-x"
@@ -9,10 +9,10 @@ makedepends="e2fsprogs-devel gpm-devel libglib-devel libssh2-devel slang-devel"
short_desc="User-friendly file manager and visual shell"
maintainer="Lugubris <lugubris@disroot.org>"
license="GPL-3.0-or-later"
-homepage="http://www.ibiblio.org/mc/"
-distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
+homepage="https://midnight-commander.org/"
+distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
-checksum=ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a
+checksum=c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27
python_version=2
conf_files="
From 3a389bed05aa6739d201d812dc53acd9f85bc6f1 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 19:51:36 +0000
Subject: [PATCH 256/634] backupninja: update to 1.2.0.
---
srcpkgs/backupninja/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/backupninja/template b/srcpkgs/backupninja/template
index a74415a1eb3..02a69d1dca9 100644
--- a/srcpkgs/backupninja/template
+++ b/srcpkgs/backupninja/template
@@ -1,6 +1,6 @@
# Template file for 'backupninja'
pkgname=backupninja
-version=1.1.0
+version=1.2.1
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
@@ -9,9 +9,9 @@ depends="dialog"
short_desc="Lightweight, extensible meta-backup system"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://0xacab.org/riseuplabs/backupninja"
-distfiles="https://0xacab.org/riseuplabs/${pkgname}/-/archive/${pkgname}-${version}/${pkgname}-${pkgname}-${version}.tar.gz"
-checksum=43737a4c1dc0e109087de82ee9817f5d4883fdbcfb86743265c83ff0c7243ad0
+homepage="https://0xacab.org/liberate/backupninja"
+distfiles="https://0xacab.org/liberate/backupninja/-/archive/${pkgname}-${version}/${pkgname}-${pkgname}-${version}.tar.gz"
+checksum=cfd94891c27d1b861bf8fbd9990673f9bc2bce78872976ee1cb4d068f1c4cd6c
conf_files="/etc/backupninja.conf"
make_dirs="/etc/backup.d 0750 root root"
@@ -19,4 +19,3 @@ make_dirs="/etc/backup.d 0750 root root"
pre_configure() {
./autogen.sh
}
-
From 394753184b41fbf2e92c00a95b82c323f31172c6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 25 Jan 2021 23:51:26 +0200
Subject: [PATCH 257/634] os-prober: update to 1.78.
---
srcpkgs/os-prober/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template
index 6d904215700..f22ca4e63e9 100644
--- a/srcpkgs/os-prober/template
+++ b/srcpkgs/os-prober/template
@@ -1,7 +1,7 @@
# Template file for 'os-prober'
pkgname=os-prober
-version=1.77
-revision=2
+version=1.78
+revision=1
build_style=gnu-makefile
make_dirs="/var/lib/os-prober 0755 root root"
short_desc="Utility to detect other OSes on a set of drives"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://packages.debian.org/sid/os-prober"
distfiles="${DEBIAN_SITE}/main/o/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=8d8ea4afbe1aeef3c8b73f74a0fb37b06185e21a6abc78f80fc2160009cf705f
+checksum=6e909f511035698145ba01ad63fd53fce6ee24529c76e2698e346bbac49950e9
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) _ARCH="x86";;
From b6af1103e002d390a9eb9a004816832e0ab5123f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 17:34:18 +0300
Subject: [PATCH 258/634] grub-btrfs: update to 4.8
---
srcpkgs/grub-btrfs/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index acc3597a815..fd8efe3b657 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,6 +1,6 @@
# Template file for 'grub-btrfs'
pkgname=grub-btrfs
-version=4.6
+version=4.8
revision=1
build_style=gnu-makefile
depends="grub bash"
@@ -9,4 +9,8 @@ maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-3.0-or-later"
homepage="https://github.com/Antynea/grub-btrfs"
distfiles="https://github.com/Antynea/grub-btrfs/archive/v${version}.tar.gz"
-checksum=6c32be223344a77807e70dfd47846f1986da618b0050c494725222b287240f71
+checksum=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+
+post_install() {
+ rm -rf -- "${DESTDIR}"/usr/lib/systemd
+}
From 879a1516897af15c504aadddb2440b1e2a21c91e Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 26 Jan 2021 16:24:33 +0100
Subject: [PATCH 259/634] yq-go: update to 4.4.1.
---
srcpkgs/yq-go/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index d0ce82119de..e48daf02eae 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
# Template file for 'yq-go'
pkgname=yq-go
-version=4.4.0
+version=4.4.1
revision=1
wrksrc="yq-${version}"
build_style=go
@@ -10,7 +10,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
license="MIT"
homepage="https://github.com/mikefarah/yq"
distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=bd87dad46efbe333d0ed2da0b142e429833259d02d6310d97c95704ea0430a83
+checksum=bdd078847a74245e4c09af3dc31cdb482588398f342a8db4c019115a8495ebad
do_check() {
go test -v
From 53c8b92e1ae65f2ff33282da6deccc637e7ff9e5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 26 Jan 2021 19:40:24 +0100
Subject: [PATCH 260/634] smenu: update to 0.9.16.
---
srcpkgs/smenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/smenu/template b/srcpkgs/smenu/template
index 1d295cb5e85..4a8316bc957 100644
--- a/srcpkgs/smenu/template
+++ b/srcpkgs/smenu/template
@@ -1,6 +1,6 @@
# Template file for 'smenu'
pkgname=smenu
-version=0.9.15
+version=0.9.16
revision=1
build_style=gnu-configure
makedepends="ncurses-devel"
@@ -9,6 +9,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://github.com/p-gen/smenu"
distfiles="https://github.com/p-gen/smenu/archive/v${version}.tar.gz"
-checksum=f42b24e06b0688176e485fe9873d720b8f0d01880ca7de869fca83163033a337
+checksum=8db8026a8d95f01b9a4b775834432b15cfd248868ef2a2ec1232bd534d26dc09
LDFLAGS="-lncurses"
From 3506c61155807ea49cb590fcdc724ea056683125 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 26 Jan 2021 18:06:36 -0600
Subject: [PATCH 261/634] kubernetes-kind: update to 0.10.0.
---
srcpkgs/kubernetes-kind/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 4b4844a4001..4bc298a4668 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,6 +1,6 @@
# Template file for 'kubernetes-kind'
pkgname=kubernetes-kind
-version=0.9.0
+version=0.10.0
revision=1
wrksrc="kind-${version}"
build_style=go
@@ -10,4 +10,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="Apache-2.0"
homepage="https://kind.sigs.k8s.io/"
distfiles="https://github.com/kubernetes-sigs/kind/archive/v${version}.tar.gz"
-checksum=@83a2712ca614629596810a59ff62c8a504a962e7528f97fb5d2842466045d6cd
+checksum=@e5511659e3e1735531d4845405782d869d4fb425b545ea89151fd76208a12a49
From 0f956267ea0f4ead7a0d6cb8736f6df75085f569 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Wed, 27 Jan 2021 16:24:01 +0100
Subject: [PATCH 262/634] pgn-extract: update to 21.02
---
srcpkgs/pgn-extract/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pgn-extract/template b/srcpkgs/pgn-extract/template
index 5e89f985a3c..425a5b33654 100644
--- a/srcpkgs/pgn-extract/template
+++ b/srcpkgs/pgn-extract/template
@@ -1,6 +1,6 @@
# Template file for 'pgn-extract'
pkgname=pgn-extract
-version=20.06
+version=21.02
revision=1
wrksrc="pgn-extract"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
homepage="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/"
changelog="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/changes.html"
distfiles="https://www.cs.kent.ac.uk/~djb/pgn-extract/pgn-extract-${version/./-}.tgz"
-checksum=24013516be7da92dd329f8bf1755ab022e564236411c0e47718de5957a5c383b
+checksum=311942009042a2b21dfb015caa777bf85f425a3ffe7f43ced50acd6aab99543b
post_extract() {
sed -i '/^CC=/d' Makefile
From 58db44bb216835eb3f4380a4b28614fed786be48 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 18:21:09 +0100
Subject: [PATCH 263/634] chafa: update to 1.6.0.
---
srcpkgs/chafa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index bc8011c0514..6153df30ecb 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,7 +1,7 @@
# Template file for 'chafa'
pkgname=chafa
-version=1.4.1
-revision=2
+version=1.6.0
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libglib-devel libmagick-devel libXext-devel libxml2-devel"
@@ -10,7 +10,7 @@ maintainer="Christian Buschau <christian.buschau@mailbox.org>"
license="LGPL-3.0-or-later"
homepage="https://hpjansson.org/chafa/"
distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz"
-checksum=46d34034f4c96d120e0639f87a26590427cc29e95fe5489e903a48ec96402ba3
+checksum=0706e101a6e0e806335aeb57445e2f6beffe0be29a761f561979e81691c2c681
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*) ;;
From c288ee66827b61edef6373acef47939a3485ace6 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:28:09 +0100
Subject: [PATCH 264/634] libgpg-error: update to 1.41.
---
srcpkgs/libgpg-error/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 0b1607940a6..dbccf9aecf6 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -1,6 +1,6 @@
# Template file for 'libgpg-error'
pkgname=libgpg-error
-version=1.39
+version=1.41
revision=1
build_style=gnu-configure
short_desc="Library for error values used by GnuPG component"
@@ -9,7 +9,7 @@ license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://www.gnupg.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;h=13858cfbf6c5f69f5f5fd64cd6fcc6a6c80eca3b>gen-lock-obj.sh"
-checksum="4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f
+checksum="64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742
83892a9ebe3e19e8fd754a7ad02b6c81240e64554aab6490a4ea5aa36ea49a81"
skip_extraction="gen-lock-obj.sh"
From 2453321aabec230a7bba10d340ffa3cd63efd161 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 19:54:05 +0100
Subject: [PATCH 265/634] dex: update to 0.9.0.
---
srcpkgs/dex/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dex/template b/srcpkgs/dex/template
index 1279d5df366..dcd799f7ed0 100644
--- a/srcpkgs/dex/template
+++ b/srcpkgs/dex/template
@@ -1,7 +1,7 @@
# Template file for 'dex'
pkgname=dex
-version=0.8.0
-revision=3
+version=0.9.0
+revision=1
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
hostmakedepends="python3-Sphinx"
@@ -11,7 +11,7 @@ maintainer="Alain Kalker <a.c.kalker@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/jceb/dex"
distfiles="https://github.com/jceb/dex/archive/v${version}.tar.gz"
-checksum=cca8ade3dcc949d00f358410a9a5c2685b5dbe6501af630826a7049167503d23
+checksum=e49e9891089f2db1959c93c4c7b5fbeb3ffae23aaa3093caafd3dac5a4f03c3e
post_install() {
rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE
From 2db8e9924bae8ee3eab5199ae1a5120e8f92fb87 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 26 Jan 2021 00:08:20 +0200
Subject: [PATCH 266/634] pigz: update to 2.5, xlint fixes.
---
srcpkgs/pigz/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pigz/template b/srcpkgs/pigz/template
index 3286a4524c1..ada5263a6e6 100644
--- a/srcpkgs/pigz/template
+++ b/srcpkgs/pigz/template
@@ -1,14 +1,14 @@
# Template file for 'pigz'
pkgname=pigz
-version=2.4
+version=2.5
revision=1
makedepends="zlib-devel"
-short_desc="A parallel implementation of gzip"
+short_desc="Parallel implementation of gzip"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="Zlib"
homepage="http://zlib.net/pigz/"
-license="zlib"
distfiles="http://zlib.net/pigz/pigz-${version}.tar.gz"
-checksum=a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73
+checksum=a006645702caaecace633a89eb5c371482b44a48d04f34e0058e2b85d75d4c36
post_extract() {
sed -i '/CC.*-o/{s/$(LDFLAGS)//; s/$/ $(LDFLAGS)/}' Makefile
From 598981e1da3e94a52ff126cd5b513a508ddb915f Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 14:55:42 +0000
Subject: [PATCH 267/634] pianobar: update to 2020.11.28.
---
srcpkgs/pianobar/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index 7fa56729fbc..652db15ba46 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -1,18 +1,18 @@
# Template file for 'pianobar'
pkgname=pianobar
-version=2020.04.05
-revision=2
+version=2020.11.28
+revision=1
build_style=gnu-makefile
make_build_args="V=1"
hostmakedepends="pkg-config"
makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel
libcurl-devel"
short_desc="Free/open-source, console-based client for Pandora radio"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
license="MIT"
homepage="https://6xq.net/pianobar/"
distfiles="https://github.com/PromyLOPh/pianobar/archive/${version}.tar.gz"
-checksum=cb319b56ee4163ac040be1844e04de37f94d8e8b058f3bf9500ed380fe385883
+checksum=f8cdd564e2a12ee0740c54e8bc4028b328e9afb041d9ea40bcb762e08034b9e9
post_install() {
vlicense COPYING
From 66159618077b43b5366bde55362fe377c47311ad Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 21 Jan 2021 21:08:13 +0000
Subject: [PATCH 268/634] protonvpn-cli: update to 2.2.6.
---
srcpkgs/protonvpn-cli/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 5935d7b4860..04425cc3621 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,7 +1,7 @@
# Template file for 'protonvpn-cli'
pkgname=protonvpn-cli
-version=2.2.4
-revision=2
+version=2.2.6
+revision=1
wrksrc="linux-cli-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="svenper <svenper@tuta.io>"
license="GPL-3.0-or-later"
homepage="https://github.com/ProtonVPN/linux-cli"
distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=d7deff214118ba0b38a6eac697f8148f99b1e50e1404021b45f9f4749ea81fe8
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
From f3e123abed711334adbf023253070ea288b2378c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 21 Jan 2021 09:46:56 +0100
Subject: [PATCH 269/634] dash: update to 0.5.11.3.
---
srcpkgs/dash/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index c0da5791f56..427bcb4fe6c 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -1,6 +1,6 @@
# Template file for 'dash'
pkgname=dash
-version=0.5.11.2
+version=0.5.11.3
revision=1
build_style=gnu-configure
hostmakedepends="bison"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://gondor.apana.org.au/~herbert/dash/"
distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
-checksum=00fb7d68b7599cc41ab151051c06c01e9500540183d8aa72116cb9c742bd6d5f
+checksum=62b9f1676ba6a7e8eaec541a39ea037b325253240d1f378c72360baa1cbcbc2a
register_shell="/usr/bin/sh /usr/bin/dash /bin/sh /bin/dash"
alternatives="
From ffec2485ecce96d69c609123a1edfebb05cfd3fe Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur <hervyqa@pm.me>
Date: Fri, 22 Jan 2021 09:39:34 +0700
Subject: [PATCH 270/634] dispcalGUI: fix crash, add python-dbus to depedencies
Closes #28095
---
srcpkgs/dispcalGUI/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template
index 60dda09a12d..1bb51316a5d 100644
--- a/srcpkgs/dispcalGUI/template
+++ b/srcpkgs/dispcalGUI/template
@@ -1,13 +1,13 @@
# Template file for 'dispcalGUI'
pkgname=dispcalGUI
version=3.8.9.3
-revision=3
+revision=4
_name="DisplayCAL"
wrksrc="${_name}-${version}"
build_style=python2-module
hostmakedepends="python"
makedepends="python-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
-depends="python-numpy wxPython argyllcms"
+depends="python-dbus python-numpy wxPython argyllcms"
short_desc="Display Calibration and Characterization"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-3.0-or-later"
From 9bb5a2d2a2ca9a9a1453aaa99d06a8b17a5be8b3 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:50:57 +0100
Subject: [PATCH 271/634] haproxy: update to 2.3.4.
---
srcpkgs/haproxy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b977a92ab52..6bd82107a25 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
# Template file for 'haproxy'
pkgname=haproxy
-version=2.3.2
+version=2.3.4
revision=1
build_style=gnu-makefile
make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.haproxy.org"
distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=99cb73bb791a2cd18898d0595e14fdc820a6cbd622c762f4ed83f2884d038fd5
+checksum=60148cdfedd6b19c401dbcd75ccd76a53c20bc76c49032ba32af98a0a5c495ed
haproxy_homedir="/var/lib/${pkgname}"
make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
From f0e03ad372ad6405c006586d00ccda4e975f2d7c Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 17:05:56 +0000
Subject: [PATCH 272/634] OTPClient: update to 2.4.1.
---
srcpkgs/OTPClient/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index a881dbe502b..67c6e9cb88c 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,14 +1,14 @@
# Template file for 'OTPClient'
pkgname=OTPClient
-version=2.3.2
+version=2.4.1
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
libzip-devel libcotp-devel libzbar-devel jansson-devel"
short_desc="Highly secure and easy to use GTK+ OTP client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/paolostivanin/OTPClient"
distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
-checksum=329161b2c266624f23b56d32254e2205d8916772c5632141be1d81db4136231f
+checksum=e505f4ebba92342f4029c1d49167bc346cbb2295e2379cb6b7b232f837011520
From 27b17da097bfa95197a79ec5ac5c7b7ea26993e2 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 23 Jan 2021 13:54:00 -0800
Subject: [PATCH 273/634] allegro5: update to 5.2.6.0.
Bump version, and add opus/opusfile as makedepends to activate the opus allegro code.
---
srcpkgs/allegro5/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/allegro5/template b/srcpkgs/allegro5/template
index 467514aef26..f55a7eb6c14 100644
--- a/srcpkgs/allegro5/template
+++ b/srcpkgs/allegro5/template
@@ -1,7 +1,7 @@
# Template file for 'allegro5'
pkgname=allegro5
-version=5.2.5.0
-revision=2
+version=5.2.6.0
+revision=1
wrksrc="allegro-${version}"
build_style=cmake
configure_args="-DWANT_DOCS=1 -DWANT_PHYSFS=1"
@@ -9,14 +9,14 @@ hostmakedepends="pkg-config"
makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel
libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel
libjpeg-turbo-devel libtheora-devel freetype-devel libflac-devel physfs-devel
- libopenal-devel gtk+-devel"
+ libopenal-devel gtk+-devel opus-devel opusfile-devel"
depends="virtual?libGL"
short_desc="Portable library mainly aimed at video game and multimedia programming"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="Allegro License (MIT alike)"
homepage="https://liballeg.org/"
distfiles="https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz"
-checksum=59968da34a0353913868b8299aaff9520d19a3b0960c6406be8323a6ac9bb719
+checksum=5de8189ec051e1865f359654f86ec68e2a12a94edd00ad06d1106caa5ff27763
post_install() {
vlicense LICENSE.txt
From 125de820e59ede62ff0173eee8641750d57ba914 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 20:37:21 +0000
Subject: [PATCH 274/634] hidapi: update to 0.10.1.
---
srcpkgs/hidapi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template
index 932975d7772..b86222c77de 100644
--- a/srcpkgs/hidapi/template
+++ b/srcpkgs/hidapi/template
@@ -1,17 +1,17 @@
# Template file for 'hidapi'
pkgname=hidapi
-version=0.9.0
+version=0.10.1
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
makedepends="eudev-libudev-devel libusb-devel"
short_desc="Simple library for communicating with USB and Bluetooth HID devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
license="BSD-3-Clause"
homepage="https://github.com/libusb/hidapi"
distfiles="https://github.com/libusb/hidapi/archive/hidapi-${version}.tar.gz"
-checksum=630ee1834bdd5c5761ab079fd04f463a89585df8fcae51a7bfe4229b1e02a652
+checksum=f71dd8a1f46979c17ee521bc2117573872bbf040f8a4750e492271fc141f2644
pre_configure() {
./bootstrap
From 35bdcd46c1aeec94a673fabee126cc35c47eb038 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 27 Jan 2021 17:11:07 +0200
Subject: [PATCH 275/634] xreader: update to 2.8.3.
---
srcpkgs/xreader/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 025cdcb852e..4f5118e5304 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,6 +1,6 @@
# Template file for 'xreader'
pkgname=xreader
-version=2.6.4
+version=2.8.3
revision=1
build_style=meson
build_helper="gir"
@@ -15,11 +15,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/xreader"
distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz"
-checksum=7e2f833669345a396448f475213637f31dff6c45a57b25badb1c13e28a289b10
+checksum=48d624e3844d614ea5c6a4c97220e31411800dee8a55f394add0871b0573b3cb
build_options="gir"
build_options_default="gir"
+do_check() {
+ # XX dogtail is needed for testing (not in repo)
+ # XX tests need xorg running
+ :
+}
+
libxreader_package() {
short_desc+=" - shared library"
pkg_install() {
From e06a144bbf3b4293dec3010782de628ff986d062 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 18:50:34 +1100
Subject: [PATCH 276/634] lxd-lts: update to 4.0.4.
---
srcpkgs/lxd-lts/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..42e8a958093 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -1,6 +1,6 @@
# Template file for 'lxd-lts'
pkgname=lxd-lts
-version=4.0.2
+version=4.0.4
revision=1
wrksrc="lxd-$version"
build_style=go
@@ -16,14 +16,11 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="Apache-2.0"
homepage="https://linuxcontainers.org/lxd"
distfiles="https://linuxcontainers.org/downloads/lxd/${wrksrc}.tar.gz"
-checksum=8b712588e383c4326c27cfec5dd2c9fd4c9a4597f82549f55b1909e799f55e13
+checksum=372a666b84c7cbcb7ccbffbf4aa04a05b2fe22e5e0aafa022b700bbf211557f6
conflicts="lxd"
provides="lxd-${version}_${revision}"
system_groups="lxd"
-_libdir="/usr/lib/sqlite-replication"
-LDFLAGS="-L${XBPS_CROSS_BASE}${_libdir} -Wl,-R${_libdir}"
-
do_configure() {
# the LXD tarball packages up the required dependencies
ln -s "$wrksrc/_dist" "$GOPATH"
From 2cffe787c7c622ec7863256d1f99add0faa9fe63 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 18:59:08 +1100
Subject: [PATCH 277/634] sqlite-replication: remove.
No longer required now that dqlite uses mainline sqlite.
---
srcpkgs/sqlite-replication-bin | 1 -
srcpkgs/sqlite-replication-devel | 1 -
srcpkgs/sqlite-replication/template | 67 -----------------------------
3 files changed, 69 deletions(-)
delete mode 120000 srcpkgs/sqlite-replication-bin
delete mode 120000 srcpkgs/sqlite-replication-devel
delete mode 100644 srcpkgs/sqlite-replication/template
diff --git a/srcpkgs/sqlite-replication-bin b/srcpkgs/sqlite-replication-bin
deleted file mode 120000
index 33558ee2d69..00000000000
--- a/srcpkgs/sqlite-replication-bin
+++ /dev/null
@@ -1 +0,0 @@
-sqlite-replication
\ No newline at end of file
diff --git a/srcpkgs/sqlite-replication-devel b/srcpkgs/sqlite-replication-devel
deleted file mode 120000
index 33558ee2d69..00000000000
--- a/srcpkgs/sqlite-replication-devel
+++ /dev/null
@@ -1 +0,0 @@
-sqlite-replication
\ No newline at end of file
diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template
deleted file mode 100644
index c0b40e5909a..00000000000
--- a/srcpkgs/sqlite-replication/template
+++ /dev/null
@@ -1,67 +0,0 @@
-# Template file for 'sqlite-replication'
-pkgname=sqlite-replication
-version=3.32.3
-revision=2
-wrksrc="sqlite-version-${version}-replication4"
-build_style=gnu-configure
-configure_args="--enable-replication --enable-threadsafe --enable-fts5
- --enable-dynamic-extensions"
-hostmakedepends="tcl"
-makedepends="libedit-devel"
-short_desc="Replication Enabled SQL Database Engine in a C Library"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
-license="Public Domain"
-homepage="https://github.com/canonical/sqlite"
-distfiles="${homepage}/archive/version-${version}+replication4.tar.gz"
-checksum=8caab8703e8b7314e93dfcd6aa09ff306e416fb398bf421f194368ced821d4e6
-shlib_provides="libsqlite3.so.0"
-
-CFLAGS+="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
- -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \
- -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1"
-# explicitly enable fdatasync
-CFLAGS+=" -DHAVE_FDATASYNC"
-disable_parallel_build=yes
-
-# explicitly set byte order to avoid bad autodetection macros
-case "$XBPS_TARGET_ENDIAN" in
- le) CFLAGS+=" -DSHA3_BYTEORDER=1234 -DSQLITE_BYTEORDER=1234";;
- be) CFLAGS+=" -DSHA3_BYTEORDER=4321 -DSQLITE_BYTEORDER=4321";;
-esac
-
-pre_configure() {
- sed -i -e 's/ -ltinfo//g' configure
-}
-
-do_configure() {
- ./configure ${configure_args} \
- --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}/sqlite-replication
-}
-
-post_install() {
- local libdir="usr/lib${XBPS_TARGET_WORDSIZE}"
- vmkdir "${libdir}/pkgconfig"
- mv "${DESTDIR}/${libdir}"{/sqlite-replication,}/pkgconfig/sqlite3.pc
- # Alpine just deletes the binary, but someone may want it for debugging
- mv "$DESTDIR"/usr/bin/sqlite3{,.sqlite-replication}
-}
-
-sqlite-replication-devel_package() {
- depends="sqlite-replication>=${version}_${revision}"
- conflicts="sqlite-devel>=0"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/sqlite-replication/*.a"
- vmove "usr/lib/sqlite-replication/*.so"
- }
-}
-
-sqlite-replication-bin_package() {
- short_desc+=" - cli tool"
- pkg_install() {
- vmove usr/bin
- }
-}
From f891fd4485dc83a5eaac2e4ae281ee64f53b06df Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 23 Jan 2021 08:40:57 +1100
Subject: [PATCH 278/634] removed-packages: add sqlite-replication.
---
srcpkgs/removed-packages/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d8b7edf40b2..30b4ac8b2bd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=15
+revision=16
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -175,6 +175,7 @@ replaces="
skypetab-ng<=20150201_3
soulseekqt<=20160117_2
spacefm-ng<=1.0.6_3
+ sqlite-replication<=3.32.3_2
ttyload-git<=20141117_4
tuxc<=1.1_3
urlmatch-git<=20141116_2
From bf0f100d41885b03ef52e9b8cb5ae7e0b593277a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 12:10:26 +0100
Subject: [PATCH 279/634] ghdl: add llvm backend and enable for all archs
---
srcpkgs/ghdl-llvm | 1 +
srcpkgs/ghdl-mcode | 1 +
srcpkgs/ghdl/files/ghdl | 21 +++
srcpkgs/ghdl/patches/curdir.patch | 11 ++
srcpkgs/ghdl/patches/install-paths.patch | 164 +++++++++++++++++++++
srcpkgs/ghdl/patches/llvm11.patch | 10 ++
srcpkgs/ghdl/patches/musl.patch | 4 +-
srcpkgs/ghdl/patches/respect-ldflags.patch | 34 +++++
srcpkgs/ghdl/template | 128 +++++++++++++++-
9 files changed, 369 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/ghdl-llvm
create mode 120000 srcpkgs/ghdl-mcode
create mode 100755 srcpkgs/ghdl/files/ghdl
create mode 100644 srcpkgs/ghdl/patches/curdir.patch
create mode 100644 srcpkgs/ghdl/patches/install-paths.patch
create mode 100644 srcpkgs/ghdl/patches/llvm11.patch
create mode 100644 srcpkgs/ghdl/patches/respect-ldflags.patch
diff --git a/srcpkgs/ghdl-llvm b/srcpkgs/ghdl-llvm
new file mode 120000
index 00000000000..397362bd8e2
--- /dev/null
+++ b/srcpkgs/ghdl-llvm
@@ -0,0 +1 @@
+ghdl
\ No newline at end of file
diff --git a/srcpkgs/ghdl-mcode b/srcpkgs/ghdl-mcode
new file mode 120000
index 00000000000..397362bd8e2
--- /dev/null
+++ b/srcpkgs/ghdl-mcode
@@ -0,0 +1 @@
+ghdl
\ No newline at end of file
diff --git a/srcpkgs/ghdl/files/ghdl b/srcpkgs/ghdl/files/ghdl
new file mode 100755
index 00000000000..4a48ef91251
--- /dev/null
+++ b/srcpkgs/ghdl/files/ghdl
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Source: Debian
+set -e
+
+backend="$GHDL_BACKEND"
+bindir=$(dirname $0)
+
+if [ ! -x "${bindir}/ghdl-$backend" ]; then
+ if [ -x ${bindir}/ghdl-mcode ]; then
+ backend=mcode
+ elif [ -x ${bindir}/ghdl-gcc ]; then
+ backend=gcc
+ elif [ -x ${bindir}/ghdl-llvm ]; then
+ backend=llvm
+ else
+ echo >&2 "Error: No installed ghdl backend found. Terminating!"
+ exit 2
+ fi
+fi
+
+exec "${bindir}/ghdl-$backend" "$@"
diff --git a/srcpkgs/ghdl/patches/curdir.patch b/srcpkgs/ghdl/patches/curdir.patch
new file mode 100644
index 00000000000..12e7648e7d4
--- /dev/null
+++ b/srcpkgs/ghdl/patches/curdir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -44,7 +44,7 @@
+
+ INSTALL_PROGRAM=install -m 755
+ INSTALL_DATA=install -m 644
+-PWD?=$(shell pwd)
++PWD=$(CURDIR)
+ DESTDIR=
+ bindir=$(prefix)/bin
+ libdir=$(prefix)/lib
diff --git a/srcpkgs/ghdl/patches/install-paths.patch b/srcpkgs/ghdl/patches/install-paths.patch
new file mode 100644
index 00000000000..f23b2f15102
--- /dev/null
+++ b/srcpkgs/ghdl/patches/install-paths.patch
@@ -0,0 +1,164 @@
+This is needed so that llvm and mcode backends can coexist.
+Taken and adapted from Debian (simplified).
+
+Description: Patch installation paths for Debian packaging
+Author: Andreas Bombe <aeb@debian.org>
+Last-Update: 2020-03-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/Makefile.in b/Makefile.in
+index 9a6b1731..3aba6532 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -26,6 +26,7 @@ prefix=@prefix@
+ backend=@backend@
+ libdirsuffix=@libdirsuffix@
+ libdirreverse=@libdirreverse@
++incdirsuffix=@incdirsuffix@
+ EXEEXT=@EXEEXT@
+ SOEXT=@SOEXT@
+ PIC_FLAGS=@PIC_FLAGS@
+@@ -48,8 +49,8 @@ INSTALL_DATA=install -m 644
+ PWD=$(CURDIR)
+ DESTDIR=
+ bindir=$(prefix)/bin
+-libdir=$(prefix)/lib
+-incdir=$(prefix)/include
++libdir=$(prefix)/$(libdirsuffix)
++incdir=$(prefix)/$(incdirsuffix)
+ MKDIR=mkdir
+ LN=ln -s
+ CP=cp
+@@ -192,7 +193,7 @@ libs.vhdl.mcode: ghdl_mcode$(EXEEXT)
+ $(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_mcode$(EXEEXT) GHDL_FLAGS="" VHDL_COPY_OBJS=no vhdl.libs.all
+
+ install.mcode.program: install.dirs ghdl_mcode$(EXEEXT)
+- $(INSTALL_PROGRAM) ghdl_mcode$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
++ $(INSTALL_PROGRAM) ghdl_mcode$(EXEEXT) $(DESTDIR)$(bindir)/ghdl-mcode$(EXEEXT)
+
+ uninstall.mcode.program:
+ $(RM) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
+@@ -355,8 +356,8 @@ oread-llvm$(EXEEXT): force
+ LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)"
+
+ install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT)
+- $(INSTALL_PROGRAM) ghdl_llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
+- $(INSTALL_PROGRAM) ghdl1-llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl1-llvm$(EXEEXT)
++ $(INSTALL_PROGRAM) ghdl_llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl-llvm$(EXEEXT)
++ $(INSTALL_PROGRAM) ghdl1-llvm$(EXEEXT) $(DESTDIR)$(libdir)/ghdl1-llvm$(EXEEXT)
+
+ uninstall.llvm.program:
+ $(RM) $(DESTDIR)$(bindir)/ghdl1-llvm$(EXEEXT)
+diff --git a/configure b/configure
+index ce052534..22e1335a 100755
+--- a/configure
++++ b/configure
+@@ -34,6 +34,7 @@ MAKE=${MAKE:-make}
+ LDFLAGS=
+ prefix=/usr/local
+ libdirsuffix=lib/ghdl
++incdirsuffix=include
+ libdirreverse=../..
+ gcc_src_dir=
+ llvm_config=
+@@ -54,7 +55,7 @@ PIC_FLAGS=-fPIC
+ show_help=no
+ progname=$0
+
+-subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_openieee enable_libghdl libghdl_version ghdl_version"
++subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse incdirsuffix gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_openieee enable_libghdl libghdl_version ghdl_version"
+
+ # Find srcdir
+ srcdir=`dirname $progname`
+@@ -93,6 +94,8 @@ for opt do
+ ;;
+ --prefix=*) prefix="$optarg";;
+ --srcdir=*) srcdir="$optarg";;
++ --libdir=*) libdirsuffix="$optarg";;
++ --incdir=*) incdirsuffix="$optarg";;
+ --with-gcc=*) gcc_src_dir="$optarg"; backend=gcc;;
+ --with-llvm=*)
+ echo "--with-llvm is deprecated, use --with-llvm-config"
+@@ -128,6 +131,8 @@ Usage: configure [options]
+ Options [defaults in brackets]:
+ --prefix=PREFIX install in PREFIX [$prefix]
+ --srcdir=SRCDIR source code path [$srcdir]
++ --libdir=LIBDIR lib dir path relative to PREFIX [$libdirsuffix]
++ --incdir=INCDIR C include dir path relative to PREFIX [$incdirsuffix]
+ --with-gcc=DIR use gcc backend from DIR
+ --with-llvm-config[=LLVM-CONFIG] use llvm backend [llvm-config]
+ --with-backtrace-lib=LIB.a link with libbacktrace LIB.a to display a
+@@ -405,10 +410,11 @@ echo "Generate default_paths.ads"
+ sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \
+ -e "s%@COMPILER_DEBUG@%ghdl1-debug$EXEEXT%" \
+ -e "s%@COMPILER_MCODE@%ghdl1-mcode$EXEEXT%" \
+- -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
++ -e "s%@COMPILER_LLVM@%lib/ghdl/llvm/ghdl1-llvm$EXEEXT%" \
+ -e "s%@POST_PROCESSOR@%oread-$backend%" \
+ -e "s%@INSTALL_PREFIX@%$prefix%" \
+ -e "s%@LIB_PREFIX@%$libdirsuffix%" \
++ -e "s%@INC_PREFIX@%$incdirsuffix%" \
+ -e "s%@SOEXT@%$SOEXT%" \
+ -e "s%@default_pic@%$default_pic%" \
+ < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
+diff --git a/dist/gcc/Make-lang.in b/dist/gcc/Make-lang.in
+index cca1e4df..37d95d20 100644
+--- a/dist/gcc/Make-lang.in
++++ b/dist/gcc/Make-lang.in
+@@ -104,7 +104,9 @@ vhdl/default_paths.ads: Makefile
+ echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads
+ echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
+ echo " Lib_Prefix : constant String :=">> tmp-dpaths.ads
+- echo " \"lib/ghdl\";" >> tmp-dpaths.ads
++ echo " \"lib/ghdl/gcc\";" >> tmp-dpaths.ads
++ echo " Inc_Prefix : constant String :=" >> tmp-dpaths.ads
++ echo " \"lib/ghdl/include\";" >> tmp-dpaths.ads
+ echo " Shared_Library_Extension : constant String :=">> tmp-dpaths.ads
+ echo " \"$(VHDL_SOEXT)\";" >> tmp-dpaths.ads
+ echo " Default_Pie : constant Boolean := False;" >> tmp-dpaths.ads
+@@ -159,8 +161,8 @@ vhdl.install-plugin:
+ # Install the driver program as ghdl.
+ vhdl.install-common: ghdl$(exeext) ghdl1$(exeext)
+ -mkdir $(DESTDIR)$(bindir)
+- -$(RM) $(DESTDIR)$(bindir)/ghdl$(exeext)
+- $(INSTALL_PROGRAM) ghdl$(exeext) $(DESTDIR)$(bindir)/ghdl$(exeext)
++ -$(RM) $(DESTDIR)$(bindir)/ghdl-gcc$(exeext)
++ $(INSTALL_PROGRAM) ghdl$(exeext) $(DESTDIR)$(bindir)/ghdl-gcc$(exeext)
+ -mkdir $(DESTDIR)$(libdir)
+ -mkdir $(DESTDIR)$(libdir)/ghdl
+ $(INSTALL_DATA) ../libbacktrace/.libs/libbacktrace.a $(DESTDIR)$(libdir)/ghdl
+diff --git a/src/ghdldrv/default_paths.ads.in b/src/ghdldrv/default_paths.ads.in
+index ae321011..228c0696 100644
+--- a/src/ghdldrv/default_paths.ads.in
++++ b/src/ghdldrv/default_paths.ads.in
+@@ -25,6 +25,8 @@ package Default_Paths is
+ "@INSTALL_PREFIX@";
+ Lib_Prefix : constant String :=
+ "@LIB_PREFIX@";
++ Inc_Prefix : constant String :=
++ "@INC_PREFIX@";
+
+ Compiler_Gcc : constant String :=
+ "@COMPILER_GCC@";
+diff --git a/src/ghdldrv/ghdlvpi.adb b/src/ghdldrv/ghdlvpi.adb
+index 295b7300..487eb0e6 100644
+--- a/src/ghdldrv/ghdlvpi.adb
++++ b/src/ghdldrv/ghdlvpi.adb
+@@ -39,7 +39,7 @@ package body Ghdlvpi is
+ -- Compute install path
+ Ghdllocal.Set_Exec_Prefix_From_Program_Name;
+
+- return Ghdllocal.Exec_Prefix.all & Directory_Separator & "include";
++ return Ghdllocal.Exec_Prefix.all & Directory_Separator & Inc_Prefix;
+ end Get_Vpi_Include_Dir;
+
+ -- Return the lib directory.
+@@ -50,7 +50,7 @@ package body Ghdlvpi is
+ Ghdllocal.Set_Exec_Prefix_From_Program_Name;
+ end if;
+
+- return Ghdllocal.Exec_Prefix.all & Directory_Separator & "lib";
++ return Ghdllocal.Exec_Prefix.all & Directory_Separator & Lib_Prefix;
+ end Get_Vpi_Lib_Dir;
+
+ -- Return the lib directory, but unixify the path (for a unix shell in
diff --git a/srcpkgs/ghdl/patches/llvm11.patch b/srcpkgs/ghdl/patches/llvm11.patch
new file mode 100644
index 00000000000..b2637d01bff
--- /dev/null
+++ b/srcpkgs/ghdl/patches/llvm11.patch
@@ -0,0 +1,10 @@
+--- a/configure
++++ b/configure
+@@ -279,6 +279,7 @@ if test $backend = llvm; then
+ check_version 7.0 $llvm_version ||
+ check_version 8.0 $llvm_version ||
+ check_version 9.0 $llvm_version ||
++ check_version 11.0 $llvm_version ||
+ false; then
+ echo "Debugging is not enabled with llvm $llvm_version"
+ llvm_be=llvm4-nodebug
diff --git a/srcpkgs/ghdl/patches/musl.patch b/srcpkgs/ghdl/patches/musl.patch
index f9c721fff97..298fba36ecd 100644
--- a/srcpkgs/ghdl/patches/musl.patch
+++ b/srcpkgs/ghdl/patches/musl.patch
@@ -1,5 +1,5 @@
---- src/grt/config/jumps.c 2019-03-03 09:38:19.000000000 +0100
-+++ - 2019-04-29 12:58:54.717203690 +0200
+--- a/src/grt/config/jumps.c
++++ b/src/grt/config/jumps.c
@@ -29,7 +29,7 @@
#include <signal.h>
#include <fcntl.h>
diff --git a/srcpkgs/ghdl/patches/respect-ldflags.patch b/srcpkgs/ghdl/patches/respect-ldflags.patch
new file mode 100644
index 00000000000..61b27c4558a
--- /dev/null
+++ b/srcpkgs/ghdl/patches/respect-ldflags.patch
@@ -0,0 +1,34 @@
+Partially adapted from Debian. Do not ignore LDFLAGS we set.
+We do not want the -g part, as that is handled by xbps-src.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -99,13 +99,14 @@
+ #target=x86_64-apple-darwin
+ #target=i386-pc-mingw32
+
++SHLIB_FLAGS=$(LDFLAGS)
+ ifeq ($(SOEXT),.so)
+-SHLIB_FLAGS=-Wl,-soname,$@
++SHLIB_FLAGS+=-Wl,-soname,$@
+ else ifeq ($(SOEXT),.dll)
+-SHLIB_FLAGS=
++SHLIB_FLAGS+=
+ else ifeq ($(SOEXT),.dylib)
+ # Allow the use of -rpath in executable
+-SHLIB_FLAGS=-Wl,-install_name,@rpath/$@
++SHLIB_FLAGS+=-Wl,-install_name,@rpath/$@
+ endif
+
+ # Flags for libraries
+--- a/configure
++++ b/configure
+@@ -16,7 +16,7 @@
+ CFLAGS=${CFLAGS:--g}
+ GNATMAKE=${GNATMAKE:-gnatmake}
+ MAKE=${MAKE:-make}
+-LDFLAGS=
++LDFLAGS=${LDFLAGS}
+ prefix=/usr/local
+ libdirsuffix=lib/ghdl
+ incdirsuffix=include
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index 9e4baf3b68a..3f77c821fa9 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -1,15 +1,137 @@
# Template file for 'ghdl'
+#
+# We could also package the gcc backend, but that requires an entire gcc
+# source tree being available and looks rather complicated, so for now
+# only mcode (on x86) and llvm (everywhere) is done
+#
pkgname=ghdl
reverts="20181129_1"
version=0.37
revision=2
-archs="i686* x86_64*"
build_style=configure
-configure_args="--prefix=/usr"
+configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
makedepends="zlib-devel"
-short_desc="VHDL 2008/93/87 simulator - mcode backend"
+short_desc="VHDL 2008/93/87 simulator"
maintainer="m3tav3rse <mtvrs@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/ghdl/ghdl"
distfiles="https://github.com/ghdl/ghdl/archive/v${version}.tar.gz"
checksum=3008616201cc3b0b596872e4ad59d8bc36e6ee3ff798bdce066828fbdad041e4
+nocross=yes
+patch_args="-Np1"
+
+build_options="llvm mcode"
+build_options_default="llvm"
+
+desc_option_llvm="Build the portable LLVM backend"
+desc_option_mcode="Build the x86-only mcode backend"
+
+if [ "$build_option_mcode" ]; then
+ depends=" ghdl-mcode>=${version}_${revision}"
+elif [ "$build_option_llvm" ]; then
+ depends=" ghdl-llvm>=${version}_${revision}"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*)
+ build_options_default+=" mcode"
+ ;;
+ *)
+ if [ "$build_option_mcode" ]; then
+ broken="mcode backend only available on x86"
+ fi
+esac
+
+if [ "$build_option_mcode" ]; then
+ subpackages+=" ghdl-mcode"
+fi
+
+if [ "$build_option_llvm" ]; then
+ subpackages+=" ghdl-llvm"
+ makedepends+=" llvm11"
+fi
+
+do_configure() {
+ if [ "$build_option_mcode" ]; then
+ mkdir -p build_mcode
+ cd build_mcode
+ ../configure --libdir=lib/ghdl/mcode \
+ ${configure_args}
+ cd ..
+ fi
+ if [ "$build_option_llvm" ]; then
+ mkdir -p build_llvm
+ cd build_llvm
+ ../configure --libdir=lib/ghdl/llvm --with-llvm-config \
+ ${configure_args}
+ cd ..
+ fi
+}
+
+do_build() {
+ if [ "$build_option_mcode" ]; then
+ make -C build_mcode ${makejobs}
+ fi
+ if [ "$build_option_llvm" ]; then
+ make -C build_llvm ${makejobs}
+ fi
+}
+
+do_install() {
+ # must be first; make install uses it
+ vbin ${FILESDIR}/ghdl
+ # install whatever backends we have
+ if [ "$build_option_mcode" ]; then
+ make -C build_mcode DESTDIR=${DESTDIR} install
+ rm -rf ${DESTDIR}/usr/lib/ghdl/src
+ mv ${DESTDIR}/usr/lib/ghdl/mcode/src ${DESTDIR}/usr/lib/ghdl
+ ln -s ../src ${DESTDIR}/usr/lib/ghdl/mcode/src
+ fi
+ if [ "$build_option_llvm" ]; then
+ make -C build_llvm DESTDIR=${DESTDIR} install
+ rm -rf ${DESTDIR}/usr/lib/ghdl/src
+ mv ${DESTDIR}/usr/lib/ghdl/llvm/src ${DESTDIR}/usr/lib/ghdl
+ ln -s ../src ${DESTDIR}/usr/lib/ghdl/llvm/src
+ fi
+ # manpage is not installed by default
+ vman doc/ghdl.1
+}
+
+do_check() {
+ # the testsuite is broken
+ # after a while it fails with this:
+ # ghdl: unknown command '--synth', try --help
+ # this indicates a bug in the testsuite
+ : && return 0
+
+ # the testsuite is big and long even when it runs
+ [ "$XBPS_CHECK_PKGS" != full ] && return 0
+
+ # need a temporary installation for testsuite run so that ghdl1 is found
+ for variant in ${build_options_default}; do
+ cd ${wrksrc}/build_${variant}
+ mkdir -p tmp_inst/usr/bin
+ ln -sf ghdl-${variant} tmp_inst/usr/bin/ghdl
+ make DESTDIR=${wrksrc}/build_${variant}/tmp_inst install
+ cd ../testsuite
+ GHDL="${wrksrc}/build_${variant}/tmp_inst/usr/bin/ghdl" \
+ ./testsuite.sh
+ cd ${wrksrc}
+ done
+}
+
+ghdl-mcode_package() {
+ short_desc+=" - mcode backend"
+ pkg_install() {
+ vmove usr/bin/ghdl-mcode
+ vmove usr/lib/ghdl/mcode
+ }
+}
+
+ghdl-llvm_package() {
+ short_desc+=" - LLVM backend"
+ pkg_install() {
+ vmove usr/bin/ghdl-llvm
+ vmove usr/lib/ghdl/llvm
+ }
+}
From 73af632b6418ae5f1545e3d757b2b4ee36669093 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 13:19:09 +0100
Subject: [PATCH 280/634] ghdl: bump so it actually builds
---
srcpkgs/ghdl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index 3f77c821fa9..632ab2a1977 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -7,7 +7,7 @@
pkgname=ghdl
reverts="20181129_1"
version=0.37
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
makedepends="zlib-devel"
From 0b4d593bcfc93e55898d91b886aa5014776272b2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 13:31:13 +0100
Subject: [PATCH 281/634] xbps: clean up the repo/suffix stuff
---
srcpkgs/xbps/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index e43050da90e..cae1b8681e9 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -35,17 +35,13 @@ do_configure() {
}
post_install() {
- local _repo="repository=https://alpha.de.repo.voidlinux.org" _suffix=
+ local repo="repository=https://alpha.de.repo.voidlinux.org/current" suffix=
case "$XBPS_TARGET_MACHINE" in
- aarch64*) # XXX different repo location
- _suffix="/aarch64"
- ;;
- *-musl) # XXX different repo location
- _suffix="/musl"
- ;;
+ aarch64*) suffix="/aarch64";;
+ *-musl) suffix="/musl";;
esac
- echo "${_repo}/current${_suffix}" > \
+ echo "${repo}${suffix}" > \
${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
echo "architecture=${XBPS_TARGET_MACHINE}" > \
${DESTDIR}/usr/share/xbps.d/xbps-arch.conf
From 32fa5c7ddc96406ff8a7b0c64ab74245e8b71562 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 26 Jan 2021 09:46:25 +0000
Subject: [PATCH 282/634] rooster: update to 2.9.0.
---
srcpkgs/rooster/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index 76a1738601c..a44ab4f1b04 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,17 +1,17 @@
# Template file for 'rooster'
pkgname=rooster
-version=2.8.6
+version=2.9.0
revision=1
build_style=cargo
hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel libssl48"
short_desc="Simple password manager for geeks"
maintainer="Ulf <void@uw.anonaddy.com>"
license="Apache-2.0"
homepage="https://github.com/conradkdotcom/rooster"
distfiles="https://github.com/conradkdotcom/rooster/archive/v${version}.tar.gz"
-checksum=b05d2c368ac26d96edd058130bfc7cc7a1960a5bfbc63b6ddfad62d27b08d62f
+checksum=2cb08c90c9604951c810038dffd1dfca1de71bfe1d76b22f951dc3f14c0efab4
pre_build() {
- cargo update --package openssl-sys --precise 0.9.58
+ cargo update --package openssl-sys
}
From 5501987452a5e91b622e044f54c052fcc0274a1c Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 28 Jan 2021 08:10:28 +0000
Subject: [PATCH 283/634] rooster: update to 2.9.0.
---
srcpkgs/rooster/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a44ab4f1b04..a8a905fcb76 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
revision=1
build_style=cargo
hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel libssl48"
+makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
short_desc="Simple password manager for geeks"
maintainer="Ulf <void@uw.anonaddy.com>"
license="Apache-2.0"
@@ -13,5 +13,5 @@ distfiles="https://github.com/conradkdotcom/rooster/archive/v${version}.tar.gz"
checksum=2cb08c90c9604951c810038dffd1dfca1de71bfe1d76b22f951dc3f14c0efab4
pre_build() {
- cargo update --package openssl-sys
+ cargo update --package openssl-sys --precise 0.9.60
}
From 4459182375330bc8c7aae22c6ab3e059cebd51ec Mon Sep 17 00:00:00 2001
From: Alex <60660439+AlexDltg@users.noreply.github.com>
Date: Thu, 28 Jan 2021 11:06:46 +0100
Subject: [PATCH 284/634] pycharm-community: update to 2020.3.3.
---
srcpkgs/pycharm-community/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pycharm-community/template b/srcpkgs/pycharm-community/template
index 77f5a358d8a..a33d229a466 100644
--- a/srcpkgs/pycharm-community/template
+++ b/srcpkgs/pycharm-community/template
@@ -1,6 +1,6 @@
# Template file for 'pycharm-community'
pkgname=pycharm-community
-version=2020.3.2
+version=2020.3.3
revision=1
archs="x86_64"
depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="Apache-2.0"
homepage="https://www.jetbrains.org/pycharm/"
distfiles="https://download-cf.jetbrains.com/python/${pkgname}-${version}.tar.gz"
-checksum=33e19dfaa434f637506b6fa35dcf94c908f9b471aadc9f616eae0c0395327cfc
+checksum=915a8803db2d47dd0c739da61034eb787f7c9e9e512ebcb02ea1a45cddbb055c
repository=nonfree
nopie=yes
python_version=3
From 69044e6bb1d3fa9b92d1eb1375f448b7e5cad464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
<lucas.treffenstaedt@tngtech.com>
Date: Thu, 28 Jan 2021 11:43:55 +0100
Subject: [PATCH 285/634] intellij-idea-ultimate-edition: update to 2020.3.2.
---
srcpkgs/intellij-idea-ultimate-edition/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index c8a9ae55c55..826338dbd83 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2020.3.1
+version=2020.3.2
revision=1
archs="i686 x86_64"
-wrksrc="idea-IU-203.6682.168"
+wrksrc="idea-IU-203.7148.57"
depends="giflib libXtst jetbrains-jdk-bin"
short_desc="Most intelligent Java IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
homepage="https://www.jetbrains.com/idea"
distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=50352d1ed9690e750f7b96ecceadb7288879afd7444e752f57c49845b0029fcf
+checksum=982666e1554adb745de819bdd5c7418eadd504cb0324dac2245f949b5a104ced
repository=nonfree
restricted=yes
nopie=yes
From 046efa5b91c266f1607e8b74920240c267b86f07 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 28 Jan 2021 11:20:34 +0300
Subject: [PATCH 286/634] topgrade: update to 6.3.1.
---
srcpkgs/topgrade/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 4b7bc652506..41240b72fe2 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
# Template file for 'topgrade'
pkgname=topgrade
-version=6.2.0
+version=6.3.1
revision=1
build_style=cargo
short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,4 +8,4 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/r-darwish/topgrade"
distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz"
-checksum=ee23ba04962509ac188ec601dd67c0f8a7eae7d6532155c0eb848756264dbc21
+checksum=4527a6e0763e8a9f30bddb83c2ad696a5e13c8c5510e2696c54243c83bbc3f15
From 3977f436aa26ced352200eceb96480120e0ca42c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 15:56:41 +0100
Subject: [PATCH 287/634] ffmpeg: fix transparency for yuv->rgb32 with altivec
---
...070d9b092d3a354a6963c65197054ddf7a75.patch | 41 +++++++++++++++++++
srcpkgs/ffmpeg/template | 2 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
diff --git a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
new file mode 100644
index 00000000000..621aba392fb
--- /dev/null
+++ b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
@@ -0,0 +1,41 @@
+From 2687070d9b092d3a354a6963c65197054ddf7a75 Mon Sep 17 00:00:00 2001
+From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
+Date: Sat, 23 Jan 2021 19:33:13 +0100
+Subject: [PATCH] lsws/ppc/yuv2rgb: Fix transparency converting from
+ yuv->rgb32.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Based on 68363b69 by Reimar Döffinger.
+
+Fixes ticket #9077.
+---
+ libswscale/ppc/yuv2rgb_altivec.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
+index 58e480dd2c..4f5382e4c1 100644
+--- libswscale/ppc/yuv2rgb_altivec.c
++++ libswscale/ppc/yuv2rgb_altivec.c
+@@ -425,13 +425,13 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \
+ }
+
+ #define out_abgr(a, b, c, ptr) \
+- vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), c, b, a, ptr)
++ vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), c, b, a, ptr)
+ #define out_bgra(a, b, c, ptr) \
+- vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) { 255 }), ptr)
++ vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr)
+ #define out_rgba(a, b, c, ptr) \
+- vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) { 255 }), ptr)
++ vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), ptr)
+ #define out_argb(a, b, c, ptr) \
+- vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, b, c, ptr)
++ vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 255 }, 0)), a, b, c, ptr)
+ #define out_rgb24(a, b, c, ptr) vec_mstrgb24(a, b, c, ptr)
+ #define out_bgr24(a, b, c, ptr) vec_mstbgr24(a, b, c, ptr)
+
+--
+2.20.1
+
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 4a154e5d476..9879cb0e3aa 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.3.1
-revision=4
+revision=5
short_desc="Decoding, encoding and streaming software"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="GPL-3.0-or-later"
From 227dd79fd4fc0a4249a76efda170e06d11f8785c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 08:41:49 -0600
Subject: [PATCH 288/634] New package: python3-rich-9.9.0
---
srcpkgs/python3-rich/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-rich/template
diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
new file mode 100644
index 00000000000..347396c6edb
--- /dev/null
+++ b/srcpkgs/python3-rich/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-rich'
+pkgname=python3-rich
+version=9.9.0
+revision=1
+wrksrc="rich-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Library for rich text and beautiful formatting in the terminal"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/willmcgugan/rich"
+distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
+checksum=0bd8f42c3a03b7ef5e311d5e37f47bea9d268f541981c169072be5869c007957
+
+post_install() {
+ vlicense LICENSE
+}
From 0411e503af81bfb0527bf4e81af3a38ba422af23 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 14 Jan 2021 08:42:13 -0600
Subject: [PATCH 289/634] ytmdl: update to 2021.01.14.
---
srcpkgs/ytmdl/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 57d9724ab23..75602d5c3a9 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,6 +1,6 @@
# Template file for 'ytmdl'
pkgname=ytmdl
-version=2020.11.20.post1
+version=2021.01.14
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -8,13 +8,17 @@ depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama
python3-itunespy python3-BeautifulSoup4 python3-downloader-cli
python3-ffmpeg-python python3-xdg python3-lxml python3-pysocks
python3-Unidecode python3-urllib3 python3-youtube-search
- python3-pyDes python3-simber"
+ python3-pyDes python3-simber python3-rich python3-musicbrainzngs"
short_desc="Get songs from youtube in mp3 format with all tags from itunes"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/deepjyoti30/ytmdl"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dd8c4e65b5f67357179f586bb153cd02238cea2512e3fb563709c2cff9ee14b6
+checksum=0783af6edc20a5e5635774a62bff9c20a81ebe4f6a71b939566724b279f6c4a5
+
+do_check() {
+ :
+}
pre_configure() {
vsed -e '/install_requires/d' -e '/setup_requires/d' -i setup.py
From 67b234cccef1092c98d53fb2b45191cb39c5c000 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 27 Jan 2021 12:21:42 -0600
Subject: [PATCH 290/634] python3-musicbrainzngs: update to 0.7.1.
---
srcpkgs/python3-musicbrainzngs/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template
index 8de5f65f12d..cfa6fa5bec4 100644
--- a/srcpkgs/python3-musicbrainzngs/template
+++ b/srcpkgs/python3-musicbrainzngs/template
@@ -1,18 +1,17 @@
# Template file for 'python3-musicbrainzngs'
pkgname=python3-musicbrainzngs
-version=0.6
-revision=7
+version=0.7.1
+revision=1
wrksrc="musicbrainzngs-${version}"
build_style="python3-module"
-hostmakedepends="python3-devel"
-makedepends="${hostmakedepends}"
+hostmakedepends="python3-setuptools"
depends="python3"
short_desc="Python3 bindings for the Musicbrainz NGS webservice interface"
maintainer="Steven R <dev@styez.com>"
license="BSD-2-Clause"
homepage="https://github.com/alastair/python-musicbrainz-ngs/"
distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
-checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
+checksum=ab1c0100fd0b305852e65f2ed4113c6de12e68afd55186987b8ed97e0f98e627
post_install() {
vlicense COPYING
From 527d858b12529cdbadd18b43a0b77d801754cd60 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 18:49:27 +0100
Subject: [PATCH 291/634] ghdl: make sure subpackages do the right thing
---
srcpkgs/ghdl/template | 3 +++
1 file changed, 3 insertions(+)
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index 632ab2a1977..4229ca3d563 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -42,6 +42,9 @@ case "$XBPS_TARGET_MACHINE" in
fi
esac
+# get around xbps-src's broken 2-pass option eval
+unset subpackages
+
if [ "$build_option_mcode" ]; then
subpackages+=" ghdl-mcode"
fi
From 755e1e7c34e73df1540afb7bded075520f3669b9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 28 Jan 2021 19:13:36 +0100
Subject: [PATCH 292/634] dijo: update to 0.2.5.
---
srcpkgs/dijo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dijo/template b/srcpkgs/dijo/template
index 8352de8ebec..d3eac02d4a2 100644
--- a/srcpkgs/dijo/template
+++ b/srcpkgs/dijo/template
@@ -1,6 +1,6 @@
# Template file for 'dijo'
pkgname=dijo
-version=0.2.3
+version=0.2.5
revision=1
build_style=cargo
makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
license="MIT"
homepage="https://github.com/NerdyPepper/dijo"
distfiles="https://github.com/NerdyPepper/dijo/archive/v${version}.tar.gz"
-checksum=691178345abf9b07c751271b6b1a19e4182423294aaffa8b3a0973dc3e5805d3
+checksum=3e32e07e64af9b6c5c20a04c9c893accc8a95973df0ef519a096dd1c268eaef9
post_install() {
vlicense LICENSE
From 2c8f0388c03b24041efd5e33a2be7a47d58a8e4a Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:36:26 +0100
Subject: [PATCH 293/634] cbindgen: update to 0.16.0.
---
srcpkgs/cbindgen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index df6c84f43c4..80c82efce5e 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
# Template file for 'cbindgen'
pkgname=cbindgen
-version=0.15.0
+version=0.16.0
revision=1
build_style=cargo
short_desc="Tool to generate C bindings for Rust code"
@@ -8,4 +8,4 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="MPL-2.0"
homepage="https://github.com/eqrion/cbindgen"
distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
-checksum=9e2756a292a3b1182b8f741d6bb9e5a8b8a8dc2eacfb187c7db649966452798d
+checksum=c7b545f27f19da06983d38e149b76c446a13b9df744d22b2a1b3adb79dabf0ab
From 546d27bd71b45054fe890940ad5c6c2d91506ee6 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:36:32 +0100
Subject: [PATCH 294/634] firefox: update to 85.0.
---
srcpkgs/firefox/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 70cd3449935..f671bbee737 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=84.0.2
-revision=2
+version=85.0
+revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=92bfd518d4f9760c897388a8e06130b171c1c43524d8af181add9daac2be7b37
+checksum=5f03712642f5e77de4581d2ba3ee3e87cfa44c3d2fdd8fe0fb56ea05a57f7b50
lib32disabled=yes
From d4620b6117e072244b816e3e8faf02cf340eedd5 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:44:14 +0100
Subject: [PATCH 295/634] firefox-i18n: update to 85.0.
---
srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
1 file changed, 97 insertions(+), 97 deletions(-)
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 9cf33c4b1c4..6af9409ff63 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=84.0
+version=85.0
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
}
}
-checksum="94b0bd6f285775715a97145b6c4e8d6feef3b94682d124f161f98c2f2cbd4670
- c4db135e18be2c300f3f27453e83378d35b1c954e0e3d958ab61936aa977883a
- 5320df230a7d0a680b4daa6d6908548c2957562823a8229c3f19d5e1183343a7
- cc7a85e929c8f3a01516342ab608f9acbf2aaa03bc43fd5612300b430f5fea29
- 7ef0e96819501ce8dc8d3ebbeb8bb832314201f733710ffb81351318a3f22dfc
- 49579dc21ec917694df9509852b8bf919fe0cf38b2a60b0a32460de3c37e97a2
- 93f19f3313008308cd1d4e8eb1f3fbe05210775758a234367713ac3e71e71972
- 47ad3f8ce909feff19ccbcdcf2275dfe697e504b1ca164124a9eec9f1e816836
- 176a3cdfe39084e97b607198200a551cb23789b2cbc43eff460e1221c96e065a
- 1910145457eb8833b62d60ff54d735446b9420129f7a6239b993273fa7b94d79
- d070ce5ad03706d3c281bdae7af2ce680671a958113d244413bb862821187d9e
- 587301ecdb55992a224e54132e07db16b196b60cf3a75fc47052dfedd1582422
- a9413ab019266b0d3d8d27d08521c235b8ef0214d6ce01e147975d020a673f62
- c6cebc4ee4cce3bb4135f8272d11a42c84383f2be2f45246b4cf454bd0977622
- 13778ed0f750e3218b809f11ba8f7a1521ac0c691cda846822aa8f9198b22cca
- 23043540a526e9e36f1afac57840e35059ccfe838079ce0835a56a80a807920e
- e1c15d5e6a33df4752e70befc67cd188cef53947f77ab565a537e1424706495e
- b37e8cb11a39e65478a674ce73afba192b8f67a97cdf01dda07a52efb54e4956
- 37e8201fdb786753f097d36cd8f4b4724863878c6ae9bfa44bf87d8b5d6a63f8
- 09f3d0305d75e02aca6c9522a5dbb96f325e21bcc744e2b66ad75fc66ba9608d
- 53174122dff9e8dcc3469cc559776ff88a75f0f3938abc5913baeca43f2adbbc
- e35827598cea81434db5ad8a6d4ce266d911e4fe47367be6710a0a3576c8cfc4
- 0c994ae57e9442251fe1fe2a04705926fbfbc81dfaf858c75c19ae32ad9a1e07
- 7d5ccd03550887d1d79fa5903f2d08bcc18e858eb91170b3818fccd52fb4b97b
- a69dd7da11e30951459411e67b02b559b03ccb9d254ce436401f0797461ff630
- 08dcbb4f3175c05d20ce2492d22dbe48f4b367fcdc74ae8192babcb9555b4eb4
- f4656e4fe6aa3ce8662600929b799796cf3ebb09eec861e63a0dedd4cc025c5c
- d2b981338c7eb6ee64d6de420f5059787bd9fa2516896fa53d6540a7fd43b377
- addc3c02591e9ed0d75c8c99f79e4495b7ea680243cceed2b5f5c4a829d49e6f
- 2968830fe5788a152c9af519ecda0081bda1e303229b188c3e03b99cb89aa284
- c5979d3270b43f616bc3c78cd0afe085eaaa3f8e24b1557d199bc5cee83c1f69
- c6eead14ee828dde3c237157d6743d5d28ffff74d9c5994fe36dc9dd5489b44f
- ef5da110ff5db1fa41437587e0d4232ab5ba684615e5878196f6fb3db9fabff5
- 9181e08d987bfdd4e1e6a6090b7b21b1ec7c53e96be248050518c5eab34e5f34
- 96f09ef0e7a68873a2d95794e4ee8302654881df85c21c80bdac02bfd1bab335
- 0d582e6e1cf9cdc694a3e85c4f9cf36a0c59e3bf838953c31ca58ed2d66f5735
- e541c76d34270ef558573339cfd14f5c09a3189f884c2a7265c1c88375c79b58
- e0c1e7cb9f75bed76c388705a5679d1d41bff1107214dcfc9ca910a7c6f571a4
- e909d9dd839cc3890bdcec29e3496b299ae69388fac43674510cd9fae6a4e4b8
- 99258abe42d59457b1fba7638259568ccc218106e9d5827b4def893c29b470a8
- 168466645395d8498f3c13eb09cf13314c9b0b9018d0769f3e613c0e9514506e
- 857b392925188807ff5521adeaf0b6a0ff259f99ef09ac3cfec0cc7b1ee32180
- f040bc7b60564d70c25a9296fd4f11e484e9b74808822e85788c06c897bca5b5
- 06134e687b99d7e68bce477cf85c54317dba124dce486352dc5a6a1876e54f67
- a41850d4f690e1580bb7c37d8443c29494f33bc2b5a6d4ffeed22c58ec2ae776
- ef3301a5afdc0f217edcdffc0a959cd7b8a18861f2658d99daa2949a8745ae47
- cdc8e5b18987d6640f782f1dab728f14a80e97d27a680f186b7479c7ed0a76e6
- e1a672a052c72a94dc3ff8816235824aca20b4481bf1c48d60721b49937fe529
- 1a2b88bc6710f07f77f0579d1409d37cb3f7a2d4ec2bdde1f0d4c992d05d9fed
- d4e90b3abfd6ed2ddee7a2cf98bf1492e145a83b4be8711d93e094d56423a54d
- 120560d88a624c7ba0de23bc23fa996e42b0727c3e97cc0a4c9f667246b868b4
- 010ffa6887ef0c9cf03c81922b22ab04b55c2d0c08d93a3fe683f14d442e9b15
- 8d15fd2f21cbec41cca4151242ca2c15d681b96a1ea12f2fe06f4d17c8670e3c
- 6cc51922cee863b11524ed638e1d4a2ed9b2249a76b468791a471051e05e1451
- e0f894c991c0f59133f369b9ec1ad2b68e521705163580025410f09250c26e60
- 488f340d031de8ce7a4a9bb9393390200849f66fb050cbbe7aa6a9c237c1a94e
- 0255c4f216257a7bb6da94dabd8c9528ade8b87313c7ab81be9d6e76d02a230b
- 62486e6f43cd57dd531a03591b95040ee7d98ba1fc74b6c2dc3364090bb50ea0
- 2b1d994675d33c80cda210b2d3fd88bb3051d26b9c551672aad6cfbf56ac2f1e
- 3a7384888b4894f386bf450c39dee9ea423697e4c784d886d8b63fc1826f98e5
- 2dd784fcafb0208279996f0974ed3a89a6ec11faa9dc6865e7e6bb314a93f5b2
- 2beb59d3d2c853dfc77a11d8418b13d297af71b7a83a2daeb7acb0daf5c42d40
- 22f6fdd526430d359c48aa77a1b6e87db15e5cc6f1910f44a19f89e6c9d1f597
- 4fee301a969835ce145fa91dcbee8b0c902e5b3ed4b5890730285c48a577d2f0
- 6312462a704beb7cabfb1dd5e19b4da0221a088484fd39a73197edbb17c3eb6e
- 329cace533171098d65139bd9fc056db9fd1cd5bc74917067296b3d22d493bab
- 612b4e785458592dc5e53bafac4eacea2058d5a9a474b79318b664fd4ff2d2da
- 84e0574c5c0f104a8f18317b26e93b37417aebfb7ff9ef3d53fffa722a241a60
- e3da154704200101eaccefaf982ab663f70fa3c478ca2faa9e32df639309f79d
- 9e25eb5d25ade0dd06d5fc04dbe066783bb517df742bbab64aef845552e6c315
- 0c6b239034e21bf2032fe593a861d5ab1d5d65b1b9e15c165519791cf3d6287f
- 295ffe3f03bd32f0a7db473a4075fa517c435c15e31f1f4362391a898e15cead
- c51f29af4135e6a35c29fb8d253b71ffc512ffd3704bf76c9d9a17f5d40efbd2
- b5329b44f7ca76a6903ebc52e33538fb0c5dd935961c30f517a6d4f4fc97a09e
- 378133f57d3858dd76d8f744e62d2812dd4f9235b408ea8d7b718f289827ccb8
- ca9da8481ca8052142ff4b1cf2545f0cf0f51f26ba2ce3191606ce9c4d7b4396
- dada3b72a10ea9699d4c569d8cdb50c36b7077dd18f1c8d13817539848c2e0b9
- 4185f1351051f33a5728be8e177d359e29d933a01e9db99fe330d364e02df00d
- 304eccf0e97f56d4c92c3f71abca23c4fcdb9891f2501fb8659f0a634250b245
- 6f506d2af8c13b3319c0c5fb859a719350be94ccc3c93e654cad78234ddda072
- d28f7b9412fce3547865019cfe14349da2afe62224d4b99754c433b4eb58f415
- 9b27ee6728cd386510d9a9ec86e426477ec6595cb1440b04d00d61585abc2bce
- 6e3b75e0bc5a8688202eb51990cad69c66e817262c77b4e28b33c488057de1f9
- cd34159677b1870897fb03f1e8f058e95992145f2fb62560f1a93d0783dd6fd0
- 53b1de3ba82b65511cba4999b86d77490e40a332d1d5810627fbc0af8e395e40
- 10fe9582ffbd42de78e436ea0b297aef7459feb825c3d09dceb6d3dcfd8153eb
- dcd03f136f7a32002373ad2e0871003d1882bc34ac73ec6bd5625ae3b6c0f5b1
- a4c3e548edc1f3306c4cd07071c94f20a77074c08a2c6669d6930f197dae2b87
- e11f07bcd00e6a3b72f6af2280867783a92ba3dce1cb8cdf786f35bb8c40fae4
- 5316509e6a7360316d35283d3110298a8ea2aab8bc9b2509c8a0fd46354d0052
- 74beeffbd3db2f292b4e2f975e8ce4ea2d997042e4844d7bbb6d28beee9565c6
- fb383a17e945d55310a78a8f42bb1e28380c3686cd3e8ed6a8adff614f1c5ca4
- 3a9d9a4f25b179b31bfb4b33722df6bfda29b432a004446d293d0b15997c55e6
- 67a035724ca388ef134a5a66360b2bfe928869678028714cb778a7ee5a0cd4f2
- ccbf810ee25e84dea7b9f5181dcfc977c060bc985d900e2234c3e1e80a87e4c6
- 1462ec5fd7720af4bfb3faaa4aef3eec6c28c3d86bb90d4830b9d8dbcbfb27b3"
+checksum="1e3ebceef5e6157c1d79a7a420fad27611da0f4c7f78e2a3e63a9b6cee06bbc8
+ a1004ed9e3755ffdb5376664012d977373e7f46da7b1c268cd3756d5ced2bc57
+ e7cc6da27234dab24edfa6d1dc1d28c6bbf547e0da15253494b180d14b334081
+ b16a3898e25fa7ff559b6c58117ff4da45f342d5e1300cc07992369d2da0cc71
+ 614f975906e5ac26cb11d9679bd6d9ea0275294f33b6d2fc9f138114f1bcb2e6
+ d2610c15a353a92af5b23cf2e04e27e55eb9edb3a3a72d155dc6eea25825edd9
+ 21fd164f9ff33d0541d523f3502f04edcc12be6faf028dad2623ec78efef3811
+ 9950615c19258eddafa63765bc1632d7cad3a4a14a2f5d8e333e1666e5e35e9c
+ ccf4e4a36ad99134f122546a3eb5f6045380e7aca4164fdf1d09946a39d0ce4b
+ 86d6ef20ec182cb46dea1e993229aa3394599c708d218bb8dc96aa4577d3234a
+ 2611baa78b1a46e6d55ca5350527a2da4d8e4e71eee22a1c5b33adfb2e3544e3
+ f7a98ee9f2073133f5b9ec18504a49c512957e4705640893d0f61d39a03ed95a
+ f2e0718027aea24938f05c97061d2c8717bac28bc9d5396afb8d12384b75111e
+ 6f67c36378526a228e89e8638e1d57b7a6c0d81c6c2eca07cb0218151f93c42b
+ e38a55feab1f94ccb20e01dc81964a3c2c52770964d224c544c820b9642a387c
+ 3a753754399c7d5cafe88d546c8ee7c0fe5d05932c75e0322f18d55a047ca018
+ beecf7a11e167b2d7ecfddbd1708eb905518e93cbebb56dcd4fb87883bd6db3e
+ 417a112dcbee84076bb1462e9719a14a13846ad2b783779f44232e936e305187
+ 99ce36f9dd309d25aa45f168f6403edf4ae48a028864a38ce9010cb9b0f19dd1
+ 61d28874ec0d998982e087237a8d41288f30d8375c590c58da98611a67466e3b
+ e2d8748a8f6488bbb39c7f47ba91926c5ae74be20198792a87a43749efd8d7c5
+ 859f942ba799d238efb190ef27d64230c67b6052bc180a0ce3eb1f82c266197f
+ a58a015c60b3481b9456c091c54361c4dca6405d7fd901306e54c66184ce977f
+ 43262ac8204ebcec69eff003307627306e05fb202f1ffaf2ecd3dd66590f8d1b
+ 1919e4e0ae8ff4556df7226405985fdc3a951a9bcdb4cb25fb34ba67b240c83b
+ 04b18d8c7e99e56fac9ebe3512c14816d7b0ed0c5dca364d6321593b32756002
+ 122df58cb44a1d0aeebea86f7ba52432bd838ebf15efb81246d6666c52d4fe11
+ d5e2c2d61cb24eda50f67793cf40f302b41853803e06b6e7e8eeb09b33fb5079
+ bc8d7b16044f6f1a96abe369886575f6a7f60de32a675fcc51e577f070af2065
+ 19f6ad8dbcc607e04865b194a24c2dcc626d9c254f85e1f86f268cb438f28252
+ cdb1a1f475a0a341f3ed5e27fa53c48133c92f8a9d1fa550c4184ffafb9d51cd
+ eaa53a8f97216fe96e4d92fbb937c387481b2017ec3ca508c00066e6b3836803
+ 17d9944779de63759cec174c047cf0046b83f2c3b0cae9d066fe1f552f3de583
+ ff4411a9fab2bbb6a7bd3364d3dc1fe1748ae947cb1248d8cce7ab73c94977fe
+ 31143a33a3c1b4dc5a58d2acb50bfe8bb826fa384bcc7ff26ec5452a7e318c22
+ 4e66e4b7ce1739888cf54e9327f5c77ced6efa67b2dd03db5f5a1962a1cdf375
+ 1965af4bbef784dc22e5721850762e8eacce0939c471a63270cccd9f8903a659
+ cc40f44b0e509cde3c26b2b4e016be9b4e48e995ade40754841e67df69251ceb
+ c706426b8861fa03c406b2e1ce76853c12e5db473d2bb28634a54b7eb733c5af
+ 32dafce8ee2c792e53fffbdfe3153077a33af80ab11e0d2ddd94087969d096a7
+ cab75dc867ce4fff7fe55153bfeb9da2846b5815b54eab6073f54591fbc92ead
+ 41433526cc62d21b6c2c64d6f19fcbf071b04b7dc85a301458082680a508274c
+ 51a0a243354013c2026e13da0141c081ded12e373229948d95a3e32d60ac7988
+ d023425a39c5aa243e63db3ecc44795d83c58176e62da75992e719547a5a4a5d
+ 00d3f2385ad3d7b419f88d28b3ae74d24f67730da8e4df567431291d77e35a27
+ 25bb21d49a4bc83ce73bcc181101e8d9accba10a828c09025aadb0f6266d34b9
+ 2b74deea42c22f8176bd3d4968c2d8727980f2b4d94bba25c0fcc6e2931737e2
+ 948dd6979c874aedd956f764f0a8dd11df51f8c299fd15b91edb1388d3dc2ff4
+ b912d9bccd7770a1df13ccca727bc56534787f9698dafed21ab9a0cc587d6200
+ e167af1d333d88228bc66b9f875dc618d1d41c967ca56ab6aa1a973d27ad26dc
+ 67993e40150a07aa1e74b74b24bdc3900bf42f57e0d6cc9426fb8346d76a4912
+ 3f2c8cba88f756f673ef310040b81723ad6dd184e338d7fc4957fbaaeaa77e8d
+ d3cc0c70843e17ea1e74530099581a8cdcc9255a27bda9a027c062547b5ebb01
+ 34f1a289bdb2ffde7734dd44b0c0574af070beebfe7d8f32bfdd4f49ccaba509
+ a549248502f78559af5891a43011cee4673b10f24cafa3cf0fb3cafbdc7d58c7
+ 931e44906a15a19bf157e0dc7f8917e70dccad6c32d17468c72b50753e251b2f
+ 5d3786da797df6c2e0cfc89370beeba05318f9a1244e9cf2a97d240972da4cee
+ 5759dd18c45d3a2e5678a9d89ea577192eaa7d2eebeacc8d86fd01d01619051b
+ d118ea187615e19d3851249ed04a2df0fcd46b0997a825615aeeaf6aa66985b2
+ b9e649a26e8f6cc2ad8f4ac61e5043c9becc08e383c1005327f2b9e064355859
+ 1c4023f435db4831a07b01b3fb934db4a00e7033d49ff5611285d925ca6f88e7
+ c2ad46026bbb2dd505abdd27c706e5490bf56789a0dc21688b78963f2f6867b3
+ 307b8aa877e07f573213eeb61bda5114ba73606bba70ebc237fb91c7c5749795
+ 40ea4bab889523f1d5e31b11df77a8f15f28e86544ed5ed3ab84eb83da988e95
+ f0483acc0420799927c46c85c2f619ee6a618eb475c7122bd8ef13e88140a744
+ 35b6a0fc2fdf6668864aaa96ef67f451171ed4127a5996086d6ffad452dbf216
+ b8441e6cf11cfd88eb71a17532140641771e4f16b9ac9e652a69c85d32f69d00
+ b5e01938b9759cf35a5a59b6536ce605d8f678e3e2bd50fecb506d474876169a
+ 33129282982bc729920bf7a69901cda39d48a7f7eea9872522eebb9635a2a283
+ caa28beda74a3f02e49740f5623196768e943304cb0ead1ef5f227822f5a9db0
+ 8ed5ec0ed82b648e3a3368c570e02c1107b91c0981fbf30ba1073f7f0f0e7fd8
+ d857483bfa8c99914fa0ebb3e59c7e64a8af2d857915616665f996282db3088b
+ 57ea0c05fbb9d402a89f98df27114cd595715f6903af222eb0cf53cf42ad6b83
+ 7330582179035c4a8414292524459d1c03bac11d9f209215b1a22e10d3690b93
+ 1d376d6d7bab26ba9f96da126a609c9d0983e5f5d4f4cd00474ac920412b0cb6
+ 815cc6e1b25bbcc4fe8bacd0ba07d1cbe6e2232632cdc62b038e86cf95471ed0
+ 3df1938caf420cb804a4fb25c83c025792b0e5498011ed01930d2ed9d94a9dd1
+ 9234bf80ba9100f07a07741673866657c957529fb5d561c279af0b09ff181bd2
+ 3752e8efc2ed8b6cca7db2309e4b6463f0f60702f3735d17134fe0634a1bc283
+ 0f0f125dc6042d63ae0ab00787fdc9cf508335d28fba5bfb5e2f0eb71c875fab
+ 4bf3dca87023e36edb5921ceee8400bd86c0ca4e317a521b4d4bae319e8996e6
+ 2be7d9604b6f6097f8da00732047bdefc6b7c5ff3f3810e4f80e11b0c3f589cf
+ 104d34b529920526708290d119b752182a48abdcf6c8f1b9acde2a82d94001c9
+ 6fb032533842f8c35fbc6a1abdaaf5d4b86bc3c352424ff34988acbd54ff3cac
+ 3eac9e3d081d70661e6966b404db7b0da1e36b744a75ff123409ab431c161795
+ 09fe0e97d966e3ea22bbed30be8c4d23650cb54c5dd2cb1eebb2627ec436fbf0
+ 3bc75dfd85e49ed8a62169a7153e74efd9417d29720f9618d8029da5dda30db4
+ c573b5e8e388bfdbe67f5e5180b85063161b5bd0499f01fcf959d99f1f09b18e
+ 3fdc8d7d0af797bff359ebb3748c51cbfeb8cc0e90647856864e0a36156644c9
+ c90881fa1d30432e9ad20f779e48784721e18c764d03c5276a46b4f0139d186d
+ a5ef72d48637a0b0e1f9c28fa5308d3b7316a38e1841c73415f7f659b8f154c3
+ 8a232fd83b888a783f400fede59c6a3fcca356f94068d9af3c5b7f8a26ddd0b6
+ d301f87e512fb66ac2136d0a11eaae083c36c2a887c7e27fce74a1529854cb30
+ 5c6d4cef98afda2a14248452ba0e91a7b11b0abd220560609e05458d8ef1dbd5
+ f906c118a32e20043da297e745fd15adfc4c00a7603a86e7ddb5bcb642a4e5db
+ 68b5fd0418f3594805b2197f5b1b16449b8e3cbffe8a3b2d2726b56b146a25c1"
From 57b762549f3d34d28ec58c50ba4f0fa4db94765e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:22:41 +0200
Subject: [PATCH 296/634] xarchiver: update to 0.5.4.17.
---
srcpkgs/xarchiver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index 240779473e9..05208272017 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,6 +1,6 @@
# Template file for 'xarchiver'
pkgname=xarchiver
-version=0.5.4.16
+version=0.5.4.17
revision=1
build_style=gnu-configure
configure_args="--disable-doc --enable-gtk2=no"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/ib/xarchiver"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d31f301d66b77d47e0a40e13e2542d19b30649aff5e7254045baaf4b09cd38b6
+checksum=fec755ffbd50e3575bd2497c755e9fe93265c5735f20de03328485f57d1123e2
From ec6eefa6486b3924aff029e2eca83db35c82fc78 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:02:26 +0200
Subject: [PATCH 297/634] wavpack: update to 5.4.0.
---
srcpkgs/wavpack/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wavpack/template b/srcpkgs/wavpack/template
index 4c6ebca76bd..b82b264a506 100644
--- a/srcpkgs/wavpack/template
+++ b/srcpkgs/wavpack/template
@@ -1,6 +1,6 @@
# Template file for 'wavpack'
pkgname=wavpack
-version=5.3.0
+version=5.4.0
revision=1
build_style=gnu-configure
short_desc="Hybrid lossless audio compression"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://www.wavpack.com/"
distfiles="http://www.wavpack.com/${pkgname}-${version}.tar.bz2"
-checksum=b6f00b3a2185a1d2df6cf8d893ec60fd645d2eb90db7428a617fd27c9e8a6a01
+checksum=0716a6dcf9a72d61005e1b09bbbd61aaf49837cb4e4a351992a6daed16cac034
pre_configure() {
case "$XBPS_TARGET_MACHINE" in
From 36791b624193a49f0f7977ef0af27eea07cbd01f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:13:39 -0500
Subject: [PATCH 298/634] python3-setuptools: update to 52.0.0.
This release drops easy_install, which will cause hard failures when
building python-module or python3-module templates that do not specify
all of their setup_requires dependencies in `hostmakedepends`. This is a
good thing; before, setuptools would fetch setup dependencies on its
own, negatively impacting the reproducibility of package builds.
---
srcpkgs/python3-setuptools/template | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 60a379ef73f..a694659b68d 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools'
pkgname=python3-setuptools
-version=51.3.3
+version=52.0.0
revision=1
wrksrc="setuptools-${version}"
build_style=python3-module
@@ -14,8 +14,7 @@ license="MIT"
homepage="https://github.com/pypa/setuptools"
changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=127ec775c4772bfaf2050557b00c4be6e019e52dc2e171a3fb1cd474783a2497
-alternatives="setuptools:easy_install:/usr/bin/easy_install3"
+checksum=fb3a1ee622509550dbf1d419f241296169d7f09cb1eb5b1736f2f10965932b96
provides="python3-distribute-${version}_1"
replaces="python3-distribute>=0"
@@ -31,5 +30,4 @@ do_check() {
post_install() {
vlicense LICENSE
- mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install3
}
From a28903634bbb5daee0d8056f21d3d4866a40dd98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:02:46 -0500
Subject: [PATCH 299/634] python3-Flask-User: specify all python3
hostmakedepends
---
srcpkgs/python3-Flask-User/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-Flask-User/template b/srcpkgs/python3-Flask-User/template
index ad2fa8483c7..cdd74414e78 100644
--- a/srcpkgs/python3-Flask-User/template
+++ b/srcpkgs/python3-Flask-User/template
@@ -1,11 +1,12 @@
# Template file for 'python3-Flask-User'
pkgname=python3-Flask-User
version=1.0.2.2
-revision=2
+revision=3
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Flask python3-Flask-Login python3-Flask-WTF python3-Flask-SQLAlchemy python3-Flask-Mail python3-Flask-Babel"
+hostmakedepends="python3-setuptools python3-Flask-Login"
+depends="python3-Flask python3-Flask-Login python3-Flask-WTF
+ python3-Flask-SQLAlchemy python3-Flask-Mail python3-Flask-Babel"
short_desc="User session management for Flask (Python3)"
maintainer="pulux <pulux@pf4sh.de>"
license="MIT"
From 5d99ea8bdbeffe00b2fe856a21eebcc946b6e667 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:02:53 -0500
Subject: [PATCH 300/634] python3-PGPy: specify all python3 hostmakedepends
---
srcpkgs/python3-PGPy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-PGPy/template b/srcpkgs/python3-PGPy/template
index cb7069cb13e..6450ed62873 100644
--- a/srcpkgs/python3-PGPy/template
+++ b/srcpkgs/python3-PGPy/template
@@ -1,11 +1,11 @@
# Template file for 'python3-PGPy'
pkgname=python3-PGPy
version=0.5.3
-revision=1
+revision=2
wrksrc=PGPy-${version}
build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-cryptography python3-pyasn1 python3-six"
short_desc="Pretty Good Privacy for Python"
maintainer="Anjandev Momi <anjan@momi.ca>"
license="BSD-3-Clause"
From 8f14f02ae8b6f382be909165a8f66ba5a39173b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:08:52 -0500
Subject: [PATCH 301/634] python3-aiohttp-sse-client: specify all python3
hostmakedepends
---
srcpkgs/python3-aiohttp-sse-client/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-aiohttp-sse-client/template b/srcpkgs/python3-aiohttp-sse-client/template
index ce2167e0563..45ff6693e2a 100644
--- a/srcpkgs/python3-aiohttp-sse-client/template
+++ b/srcpkgs/python3-aiohttp-sse-client/template
@@ -1,7 +1,7 @@
# Template file for 'python3-aiohttp-sse-client'
pkgname=python3-aiohttp-sse-client
version=0.2.0
-revision=1
+revision=2
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,3 +13,8 @@ license="Apache-2.0"
homepage="https://github.com/rtfol/aiohttp-sse-client"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=7fe8f9af35cf9a97249562e81a35c2f86544ce388928223205021ab00c30edca
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requirements/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
From 85b63da3c4d8e84c3eebaebd259d156b532ffce0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:34:07 -0500
Subject: [PATCH 302/634] python3-audioread: specify all python3
hostmakedepends
---
srcpkgs/python3-audioread/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-audioread/template b/srcpkgs/python3-audioread/template
index 8db13a91ddb..0fad35d5c50 100644
--- a/srcpkgs/python3-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,7 +1,7 @@
# Template file for 'python3-audioread'
pkgname=python3-audioread
version=2.1.8
-revision=4
+revision=5
wrksrc="audioread-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,6 +13,11 @@ homepage="https://github.com/sampsyo/audioread/"
distfiles="${PYPI_SITE}/a/audioread/audioread-${version}.tar.gz"
checksum=073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168
+post_patch() {
+ # Build doesn't actually require pytest-runner and Void doesn't offer it
+ vsed -e '/pytest-runner/d' -i setup.py
+}
+
post_install() {
sed -n '2,13p' decode.py > LICENSE
vlicense LICENSE
From b972444e9f4afd44926288cf83eee27b338af90f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:47:47 -0500
Subject: [PATCH 303/634] python-dateutil: specify all python3 hostmakedepends
---
srcpkgs/python-dateutil/template | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
index bfeef65df2b..a2dd2430d4d 100644
--- a/srcpkgs/python-dateutil/template
+++ b/srcpkgs/python-dateutil/template
@@ -1,10 +1,9 @@
# Template file for 'python-dateutil'
pkgname=python-dateutil
version=2.8.1
-revision=1
+revision=2
build_style=python-module
-pycompile_module="dateutil"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools python3-setuptools_scm"
depends="python-six tzdata"
short_desc="Extensions to the standard Python2 datetime module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -23,7 +22,6 @@ post_install() {
python3-dateutil_package() {
depends="python3-six tzdata"
- pycompile_module="dateutil"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
vmove usr/lib/python3*
From c503e7e0b16fd669ca525a6853d7567a5e008393 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:52:21 -0500
Subject: [PATCH 304/634] python3-ffmpeg-python: specify all python3
hostmakedepends
---
srcpkgs/python3-ffmpeg-python/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ffmpeg-python/template b/srcpkgs/python3-ffmpeg-python/template
index a23624b27b9..171400f6f4d 100644
--- a/srcpkgs/python3-ffmpeg-python/template
+++ b/srcpkgs/python3-ffmpeg-python/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ffmpeg-python'
pkgname=python3-ffmpeg-python
version=0.2.0
-revision=2
+revision=3
wrksrc="ffmpeg-python-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,3 +13,8 @@ license="Apache-2.0"
homepage="https://github.com/kkroening/ffmpeg-python"
distfiles="https://github.com/kkroening/ffmpeg-python/archive/${version}.tar.gz"
checksum="01b6b7640f00585a404194a358358bdf7f4050cedcd99f41416ac8b27222c9f1"
+
+post_patch() {
+ # Build doesn't *need* pytest-runner and Void doesn't provide it
+ vsed -e '/pytest-runner/d' -i setup.py
+}
From 1d14148f5583846f9636a5bec0201e2d7852f26d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:37:38 -0500
Subject: [PATCH 305/634] python3-gitchangelog: specify all python3
hostmakedepends
---
.../patches/setup.cfg.patch | 25 +++++++++++++++++++
.../patches/setup.py.patch | 25 +++++++++++++++++++
srcpkgs/python3-gitchangelog/template | 5 ++--
3 files changed, 52 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
create mode 100644 srcpkgs/python3-gitchangelog/patches/setup.py.patch
diff --git a/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
new file mode 100644
index 00000000000..efc271d01e0
--- /dev/null
+++ b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
@@ -0,0 +1,25 @@
+Make sure that setuptools_scm actually installs the module and entrypoint.
+
+--- setup.cfg 2021-01-28 10:10:54.291152917 -0500
++++ setup.cfg 2021-01-28 10:13:12.191007896 -0500
+@@ -61,3 +61,20 @@
+ tag_date = 0
+ tag_svn_revision = 0
+
++[options]
++packages =
++ gitchangelog
++package_dir =
++ =src
++setup_requires =
++ setuptools
++ setuptools-scm
++
++[options.entry_points]
++console_scripts =
++ gitchangelog = gitchangelog.gitchangelog:main
++
++[options.package_data]
++gitchangelog =
++ gitchangelog.rc.*
++ templates/**/*
diff --git a/srcpkgs/python3-gitchangelog/patches/setup.py.patch b/srcpkgs/python3-gitchangelog/patches/setup.py.patch
new file mode 100644
index 00000000000..c9f5b7ced26
--- /dev/null
+++ b/srcpkgs/python3-gitchangelog/patches/setup.py.patch
@@ -0,0 +1,25 @@
+The d2to1 package is defunct and not offered by Void; roughly equivalent
+functionality is provided by setuptools_scm, which is provided by Void. Drop
+the special d2to1 setup call to allow setuptools_scm to work properly.
+
+--- setup.py 2021-01-28 10:00:20.165871918 -0500
++++ setup.py 2021-01-28 10:01:07.760817952 -0500
+@@ -58,17 +58,4 @@
+ ## Normal d2to1 setup
+ ##
+
+-setup(
+- setup_requires=['d2to1'],
+- extras_require={
+- 'Mustache': ["pystache", ],
+- 'Mako': ["mako", ],
+- 'test': [
+- "nose",
+- "minimock",
+- "mako",
+- "pystache",
+- ],
+- },
+- d2to1=True
+-)
++setup(use_scm_version=True)
diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template
index c62eecee9a4..348dc2c83b6 100644
--- a/srcpkgs/python3-gitchangelog/template
+++ b/srcpkgs/python3-gitchangelog/template
@@ -1,11 +1,10 @@
# Template file for 'python3-gitchangelog'
pkgname=python3-gitchangelog
version=3.0.4
-revision=3
+revision=4
wrksrc="gitchangelog-${version}"
build_style=python3-module
-pycompile_module="gitchangelog"
-hostmakedepends="python3-setuptools git"
+hostmakedepends="python3-setuptools_scm"
depends="python3-pystache python3-Mako"
short_desc="Creates a changelog from git log history"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8e07410e054dfc13911a324335af91ae63586037 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:23:11 -0500
Subject: [PATCH 306/634] python3-changelogs: update to 0.15.0.
---
srcpkgs/python3-changelogs/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-changelogs/template b/srcpkgs/python3-changelogs/template
index b86a11862af..6893d6f8d97 100644
--- a/srcpkgs/python3-changelogs/template
+++ b/srcpkgs/python3-changelogs/template
@@ -1,20 +1,19 @@
# Template file for 'python3-changelogs'
pkgname=python3-changelogs
-version=0.14.0
-revision=3
+version=0.15.0
+revision=1
wrksrc="changelogs-${version}"
build_style=python3-module
-pycompile_module="changelogs"
hostmakedepends="python3-setuptools"
-depends="python3-requests python3-lxml python3-packaging python3-validators
- python3-gitchangelog"
+depends="python3-requests python3-lxml python3-packaging
+ python3-validators python3-gitchangelog"
short_desc="Changelog finder and parser for vendors like PyPi and npm"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pyupio/changelogs"
changelog="https://raw.githubusercontent.com/pyupio/changelogs/master/HISTORY.rst"
distfiles="https://github.com/pyupio/changelogs/archive/${version}.tar.gz"
-checksum=90f5e631e580f928b732e3941a5ce26520ba53879bd95daab57018e01dbfabc7
+checksum=d2c14fd7c0847effe2f8eaebf33d77c7872c60f246aa592ca6906a1b32c02b9c
post_install() {
vlicense LICENSE
From 0c73f1675551ccb338193f594b02b208c262c2b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:41:55 -0500
Subject: [PATCH 307/634] python3-guessit: specify all python3 hostmakedepends
---
srcpkgs/python3-guessit/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-guessit/template b/srcpkgs/python3-guessit/template
index ededabb16e4..8945e95b041 100644
--- a/srcpkgs/python3-guessit/template
+++ b/srcpkgs/python3-guessit/template
@@ -1,7 +1,7 @@
# Template file for 'python3-guessit'
pkgname=python3-guessit
version=3.1.1
-revision=2
+revision=3
wrksrc="guessit-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,3 +12,8 @@ license="LGPL-3.0-only"
homepage="https://guessit.readthedocs.io/en/latest/"
distfiles="${PYPI_SITE}/g/guessit/guessit-${version}.tar.gz"
checksum=71c68c6d4e9d639eba6534a838468115ad20f4c5a688eae3079f0c08d605a3b0
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
From 3bea046167103609450e85f6e78e4e9438d0b290 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:43:25 -0500
Subject: [PATCH 308/634] python3-humanize: specify all python3 hostmakedepends
---
srcpkgs/python3-humanize/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-humanize/template b/srcpkgs/python3-humanize/template
index 16c3f2b99e5..c87482c4cdd 100644
--- a/srcpkgs/python3-humanize/template
+++ b/srcpkgs/python3-humanize/template
@@ -1,10 +1,10 @@
# Template file for 'python3-humanize'
pkgname=python3-humanize
version=2.0.0
-revision=2
+revision=3
wrksrc="humanize-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
checkdepends="python3-pytest python3-freezegun"
short_desc="Python humanize utilities"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
From 2613fdce524d830743c9a0781383765af64919ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:48:44 -0500
Subject: [PATCH 309/634] python3-irc: specify all python3 hostmakedepends
---
srcpkgs/python3-irc/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-irc/template b/srcpkgs/python3-irc/template
index f35356ccbe7..2acc061017f 100644
--- a/srcpkgs/python3-irc/template
+++ b/srcpkgs/python3-irc/template
@@ -1,11 +1,10 @@
# Template file for 'python3-irc'
pkgname=python3-irc
version=17.1
-revision=3
+revision=4
wrksrc="irc-${version}"
build_style=python3-module
-pycompile_module="irc"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-six"
short_desc="Full-featured Python IRC library for Python3"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From 9dd7fd6cb677922f45638a84288b6d365c716805 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 310/634] python3-jaraco.classes: specify all python3
hostmakedepends
---
srcpkgs/python3-jaraco.classes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jaraco.classes/template b/srcpkgs/python3-jaraco.classes/template
index a7dd48bd5cd..162a4a99413 100644
--- a/srcpkgs/python3-jaraco.classes/template
+++ b/srcpkgs/python3-jaraco.classes/template
@@ -1,10 +1,10 @@
# Template file for 'python3-jaraco.classes'
pkgname=python3-jaraco.classes
version=3.1.0
-revision=2
+revision=3
wrksrc="jaraco.classes-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-jaraco python3-more-itertools"
short_desc="Utility functions for Python class constructs (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
From 28c59344421da7f6fcc4c708f43e37bf50ef7761 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 311/634] python3-jaraco.collections: specify all python3
hostmakedepends
---
srcpkgs/python3-jaraco.collections/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jaraco.collections/template b/srcpkgs/python3-jaraco.collections/template
index 68ee5f3c353..41e658e921e 100644
--- a/srcpkgs/python3-jaraco.collections/template
+++ b/srcpkgs/python3-jaraco.collections/template
@@ -1,10 +1,10 @@
# Template file for 'python3-jaraco.collections'
pkgname=python3-jaraco.collections
version=3.0.0
-revision=2
+revision=3
wrksrc="jaraco.collections-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-jaraco.classes python3-jaraco.text python3-six"
short_desc="Collection of objects similar to stdlib by jaraco (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
From eb23a11686554046b9f9323d3e6fdfd0a5222aa7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 312/634] python3-jaraco.text: specify all python3
hostmakedepends
---
srcpkgs/python3-jaraco.text/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jaraco.text/template b/srcpkgs/python3-jaraco.text/template
index ffe2f5bb1ab..c8e03b56e64 100644
--- a/srcpkgs/python3-jaraco.text/template
+++ b/srcpkgs/python3-jaraco.text/template
@@ -1,10 +1,10 @@
# Template file for 'python3-jaraco.text'
pkgname=python3-jaraco.text
version=3.2.0
-revision=2
+revision=3
wrksrc="jaraco.text-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-jaraco.functools python3-six"
short_desc="Module for text manipulation (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
From cc4d22ee4edae9785fb77a74de6cc0f565681644 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 313/634] python3-jaraco.functools: specify all python3
hostmakedepends
---
srcpkgs/python3-jaraco.functools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jaraco.functools/template b/srcpkgs/python3-jaraco.functools/template
index bedec81e130..d6ad6cfafa8 100644
--- a/srcpkgs/python3-jaraco.functools/template
+++ b/srcpkgs/python3-jaraco.functools/template
@@ -1,10 +1,10 @@
# Template file for 'python3-jaraco.functools'
pkgname=python3-jaraco.functools
version=3.0.1
-revision=2
+revision=3
wrksrc="jaraco.functools-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml python3-more-itertools"
depends="python3-more-itertools python3-jaraco"
checkdepends="${depends} python3-pytest python3-jaraco.classes"
short_desc="Functools like those found in stdlib (Python3)"
From b6c823b5a68448e9e4acdbce540994a0c080605f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 314/634] python3-keyring: specify all python3 hostmakedepends
---
srcpkgs/python3-keyring/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 34b73a55048..89783fc3036 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,10 +1,10 @@
# Template file for 'python3-keyring'
pkgname=python3-keyring
version=21.2.1
-revision=2
+revision=3
wrksrc="keyring-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml"
depends="python3-setuptools python3-SecretStorage python3-entrypoints"
short_desc="Python interface to the system keyring service"
maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
From cbf9f2e96c1ab39af368d722a637ef56f738459f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 315/634] python3-keyrings-alt: specify all python3
hostmakedepends
---
srcpkgs/python3-keyrings-alt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-keyrings-alt/template b/srcpkgs/python3-keyrings-alt/template
index 8ef8354489f..24e1d8a79d9 100644
--- a/srcpkgs/python3-keyrings-alt/template
+++ b/srcpkgs/python3-keyrings-alt/template
@@ -1,10 +1,10 @@
# Template file for 'python3-keyrings-alt'
pkgname=python3-keyrings-alt
version=4.0.2
-revision=1
+revision=2
wrksrc="keyrings.alt-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml"
depends="python3-keyring"
checkdepends="${depends} python3-pytest"
short_desc="Alternate keyring backend implementations"
From c3e55cde46735fb743ad863be38012b79ec18c45 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 316/634] python3-keyutils: specify all python3 hostmakedepends
---
srcpkgs/python3-keyutils/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
index dae38bbae85..6a71cbb6b4e 100644
--- a/srcpkgs/python3-keyutils/template
+++ b/srcpkgs/python3-keyutils/template
@@ -1,7 +1,7 @@
# Template file for 'python3-keyutils'
pkgname=python3-keyutils
version=0.6
-revision=4
+revision=5
wrksrc=python-keyutils-$version
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,3 +12,8 @@ license="Apache-2.0"
homepage="https://github.com/sassoftware/python-keyutils"
distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
From d5fa778a46f7dde87619679da01406b346a62657 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:02:10 -0500
Subject: [PATCH 317/634] python3-marisa-trie: specify all python3
hostmakedepends
---
srcpkgs/python3-marisa-trie/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
index 288e5650df1..9b4d15dbffa 100644
--- a/srcpkgs/python3-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,7 +1,7 @@
# Template file for 'python3-marisa-trie'
pkgname=python3-marisa-trie
version=0.7.5
-revision=5
+revision=6
wrksrc="marisa-trie-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
@@ -14,6 +14,11 @@ changelog="https://raw.githubusercontent.com/pytries/marisa-trie/master/CHANGES.
distfiles="${PYPI_SITE}/m/marisa-trie/marisa-trie-${version}.tar.gz"
checksum=c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
+
pre_build() {
rm -f src/marisa_trie.cpp
cython src/*.pyx src/*.pxd --cplus
From cce13befcba16cba307bb0f9bb5a448410e9dd9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:09:56 -0500
Subject: [PATCH 318/634] python3-pluggy: specify all python3 hostmakedepends
---
srcpkgs/python3-pluggy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index c0b4b1c2bc8..1f615db5217 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pluggy'
pkgname=python3-pluggy
version=0.13.1
-revision=5
+revision=6
wrksrc="pluggy-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3"
checkdepends="python3-pytest"
short_desc="Minimalist production ready plugin system (Python3)"
From b1e52675440e9bd53811bdb451ef0e03f2bf0a95 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:14 -0500
Subject: [PATCH 319/634] python3-portend: specify all python3 hostmakedepends
---
srcpkgs/python3-portend/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-portend/template b/srcpkgs/python3-portend/template
index b3b889ce16a..27b2642a28e 100644
--- a/srcpkgs/python3-portend/template
+++ b/srcpkgs/python3-portend/template
@@ -1,10 +1,10 @@
# Template file for 'python3-portend'
pkgname=python3-portend
version=2.7.0
-revision=1
+revision=2
wrksrc="portend-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+hostmakedepends="python3-setuptools_scm python3-toml"
depends="python3-tempora python3-jaraco.functools"
short_desc="TCP port monitoring utilities (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
From 814153b3087758691ae532e863716755f5a472df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:26 -0500
Subject: [PATCH 320/634] python3-pylast: specify all python3 hostmakedepends
---
srcpkgs/python3-pylast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index 2f37811d5ab..bc82ff5514d 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pylast'
pkgname=python3-pylast
version=4.1.0
-revision=1
+revision=2
wrksrc="pylast-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3"
short_desc="Python3 interface to last.fm and libre.fm"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
From c817ca20e7f9094cf8faeab00bea6da29441ca94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:34 -0500
Subject: [PATCH 321/634] python3-pysol_cards: specify all python3
hostmakedepends
---
srcpkgs/python3-pysol_cards/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index f97857216d9..9e992b77956 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pysol_cards'
pkgname=python3-pysol_cards
version=0.10.1
-revision=2
+revision=3
wrksrc="pysol_cards-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-pbr"
depends="python3-pbr python3-six"
checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
python3-cryptography python3-dogpile.cache python3-future python3-jmespath
From 0fe6071421034b0704667b03a46b85e7fa7ce47c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:44 -0500
Subject: [PATCH 322/634] python3-pytest-qt: specify all python3
hostmakedepends
---
srcpkgs/python3-pytest-qt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template
index ab870da8e06..0325ffe5611 100644
--- a/srcpkgs/python3-pytest-qt/template
+++ b/srcpkgs/python3-pytest-qt/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pytest-qt'
pkgname=python3-pytest-qt
version=3.3.0
-revision=2
+revision=3
wrksrc=pytest-qt-${version}
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-pytest"
checkdepends="$depends python3-pyside2 python3-PyQt5 python3-pytest-xvfb
xdpyinfo"
From 2106830d85f6a02110fae0b3a93d43661e92c49b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:34 -0500
Subject: [PATCH 323/634] python3-rebulk: specify all python3 hostmakedepends
---
srcpkgs/python3-rebulk/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-rebulk/template b/srcpkgs/python3-rebulk/template
index 42118c4629a..3d620df0c61 100644
--- a/srcpkgs/python3-rebulk/template
+++ b/srcpkgs/python3-rebulk/template
@@ -1,7 +1,7 @@
# Template file for 'python3-rebulk'
pkgname=python3-rebulk
version=2.0.1
-revision=3
+revision=4
wrksrc="rebulk-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,6 +13,11 @@ homepage="https://github.com/Toilal/rebulk"
distfiles="${PYPI_SITE}/r/rebulk/rebulk-${version}.tar.gz"
checksum=320ded3cc456347d828f95e9aa5f8bab77ac01943cad024c06012069fe19690a
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
+
post_install() {
vlicense LICENSE
}
From f63e204ebd8a26d845ab0fdea78ee403b7ff25ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:44 -0500
Subject: [PATCH 324/634] python3-testtools: specify all python3
hostmakedepends
---
srcpkgs/python3-testtools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-testtools/template b/srcpkgs/python3-testtools/template
index 43500391a4f..3fcae7eec93 100644
--- a/srcpkgs/python3-testtools/template
+++ b/srcpkgs/python3-testtools/template
@@ -1,10 +1,10 @@
# Template file for 'python3-testtools'
pkgname=python3-testtools
version=2.4.0
-revision=2
+revision=3
wrksrc="testtools-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-pbr"
short_desc="Python3 standard library unit testing framework"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="MIT"
From 2c1519eb8e5b1897cb0ba98a2df060a6eb4177b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:54 -0500
Subject: [PATCH 325/634] python3-treq: specify all python3 hostmakedepends
---
srcpkgs/python3-treq/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template
index 21a11977189..977b97fb642 100644
--- a/srcpkgs/python3-treq/template
+++ b/srcpkgs/python3-treq/template
@@ -1,11 +1,11 @@
# Template file for 'python3-treq'
pkgname=python3-treq
version=20.3.0
-revision=2
+revision=3
wrksrc="treq-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-incremental python3-requests>=2.1.0 python3-six
+hostmakedepends="python3-setuptools python3-incremental"
+depends="python3-incremental python3-requests python3-six
python3-Twisted python3-attrs"
short_desc="Requests-like API built on top of twisted.web's Agent"
maintainer="Orphaned <orphan@voidlinux.org>"
From c30bf817f1bc23daf2210f2b1cad40ff62e66d5a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:12:07 -0500
Subject: [PATCH 326/634] python3-zope.security: specify all python3
hostmakedepends
---
srcpkgs/python3-zope.security/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-zope.security/template b/srcpkgs/python3-zope.security/template
index 5cc8e5c95dc..73a82360ce0 100644
--- a/srcpkgs/python3-zope.security/template
+++ b/srcpkgs/python3-zope.security/template
@@ -1,10 +1,10 @@
# Template file for 'python3-zope.security'
pkgname=python3-zope.security
version=5.1.1
-revision=2
+revision=3
wrksrc="zope.security-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools python3-distutils-extra"
+hostmakedepends="python3-setuptools python3-zope.proxy"
makedepends="python3-devel"
depends="python3-zope.component python3-zope.configuration python3-zope.testing
python3-zope.testrunner python3-zope.location"
From c2a72a4c7ed7d412a619bd1d2ff01cde241536c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:14:44 -0500
Subject: [PATCH 327/634] python3-numexpr: fix checksum
---
srcpkgs/python3-numexpr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
index 31984949e5e..16f21540547 100644
--- a/srcpkgs/python3-numexpr/template
+++ b/srcpkgs/python3-numexpr/template
@@ -1,7 +1,7 @@
# Template file for 'python3-numexpr'
pkgname=python3-numexpr
version=2.7.2
-revision=1
+revision=2
wrksrc="numexpr-${version}"
build_style=python3-module
build_helper=numpy
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pydata/numexpr"
distfiles="https://github.com/pydata/numexpr/archive/v${version}.tar.gz"
-checksum=c939f806c179e9fcb80100f3cd32a748d14a6101c29fb102cc77844549c88291
+checksum=7d1b3790103221feda07f4a93a4fa5c6654f46865197a677ca6f27eb5cb4e5ef
post_install() {
vlicense LICENSE.txt
From 35c174c369d2fd29c06a5fb98a391346c400ff9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:39:08 -0500
Subject: [PATCH 328/634] nagstamon: fix checksum
---
srcpkgs/nagstamon/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template
index bf07c6d1bce..a3e92bfa761 100644
--- a/srcpkgs/nagstamon/template
+++ b/srcpkgs/nagstamon/template
@@ -1,10 +1,9 @@
# Template file for 'nagstamon'
pkgname=nagstamon
version=3.4.1
-revision=1
+revision=2
wrksrc=Nagstamon
build_style=python3-module
-pycompile_module="Nagstamon"
hostmakedepends="python3-setuptools python3-keyring python3-psutil"
depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
python3-psutil python3-PyQt5-multimedia python3-PyQt5-svg python3-requests"
@@ -13,7 +12,7 @@ maintainer="Laszlo Dvornik <laulicus@zoho.com>"
license="GPL-2.0-or-later"
homepage="https://nagstamon.ifw-dresden.de"
distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"
-checksum=2d26cf4d64a6e27fe55f1c5e5f042af511bcb09876ae16a456aee5800a98adea
+checksum=7a9611f40b08269bba4100ab2598ee089c7d0ebc6c4e9d7132689342f71150ec
post_patch() {
# This relies on /etc/os-release, which doesn't exist without
From fe419e423e4c152ed2a49d321eb334a2be8a72b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 329/634] duplicity: specify all python3 hostmakedepends
---
srcpkgs/duplicity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index fa066c26750..85bfe131638 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,9 +1,9 @@
# Template file for 'duplicity'
pkgname=duplicity
version=0.8.18
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="gettext python3-setuptools"
+hostmakedepends="gettext python3-setuptools_scm"
makedepends="python3-devel librsync-devel"
depends="python3-fasteners gnupg python3-future python3-urllib3"
short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"
From a5beb95a315449aeb1f9b922f3017508ff2a31be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 330/634] fava: specify all python3 hostmakedepends
---
srcpkgs/fava/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index a5463088647..0478e011501 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,9 +1,9 @@
# Template file for 'fava'
pkgname=fava
version=1.17
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
python3-Jinja2 beancount python3-click python3-markdown2 python3-ply
python3-simplejson python3-Werkzeug python3-aiohttp"
From 472264a4b675e09943ac2e2e7a26e00f7c860634 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 331/634] khard: specify all python3 hostmakedepends
---
srcpkgs/khard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/khard/template b/srcpkgs/khard/template
index da57783e4e6..cdbaa5b0b6f 100644
--- a/srcpkgs/khard/template
+++ b/srcpkgs/khard/template
@@ -1,9 +1,9 @@
# Template file for 'khard'
pkgname=khard
version=0.17.0
-revision=2
+revision=3
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-setuptools python3-atomicwrites python3-configobj
python3-vobject python3-Unidecode python3-ruamel.yaml"
short_desc="Command-line addressbook built around CardDAV"
From f7f452df3813883539231d68c8289dab049162f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 332/634] protontricks: specify all python3 hostmakedepends
---
srcpkgs/protontricks/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index d53364f804a..306a6c7e2d6 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,10 +1,9 @@
# Template file for 'protontricks'
pkgname=protontricks
version=1.4.3
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-vdf winetricks"
short_desc="Simple wrapper that does winetricks things for Proton enabled games"
maintainer="Orphaned <orphan@voidlinux.org>"
From 1e607ed3d10a4d77aee5f4bb2f6d772f3204b789 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 333/634] python-b2sdk: specify all python3 hostmakedepends
---
srcpkgs/python-b2sdk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index d394714962d..838d3c2fb89 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -2,10 +2,10 @@
# keep python-b2sdk name to revert this package
pkgname=python-b2sdk
version=1.3.0
-revision=1
+revision=2
wrksrc="b2sdk-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-logfury python3-Arrow python3-requests python3-six"
checkdepends="python3-pytest $depends python3-dateutil python3-nose
python3-mock python3-tqdm python3-pyflakes"
From c8348e5e459b0e948cb800c6ea67625d7db18816 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 334/634] rdiff-backup: specify all python3 hostmakedepends
---
srcpkgs/rdiff-backup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rdiff-backup/template b/srcpkgs/rdiff-backup/template
index 752c58e6cbc..a237dd4ce4c 100644
--- a/srcpkgs/rdiff-backup/template
+++ b/srcpkgs/rdiff-backup/template
@@ -1,11 +1,11 @@
# Template file for 'rdiff-backup'
pkgname=rdiff-backup
version=2.0.5
-revision=2
+revision=3
build_style=python3-module
-hostmakedepends="python3 python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
makedepends="python3-devel librsync-devel"
-depends="python3 python3-pyxattr"
+depends="python3-pyxattr"
short_desc="Local/remote mirroring and incremental backups"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
From e2abc1b28bef9acd4320d52314881a6f5b966d49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 335/634] terminator: specify all python3 hostmakedepends
---
srcpkgs/terminator/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/terminator/template b/srcpkgs/terminator/template
index db55cc6c38c..c29cbc4a756 100644
--- a/srcpkgs/terminator/template
+++ b/srcpkgs/terminator/template
@@ -1,7 +1,7 @@
# Template file for 'terminator'
pkgname=terminator
version=2.0.1
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="intltool python3-setuptools"
depends="desktop-file-utils gsettings-desktop-schemas libkeybinder3 libnotify
@@ -13,3 +13,8 @@ homepage="https://gnome-terminator.org"
changelog="https://raw.githubusercontent.com/gnome-terminator/terminator/master/CHANGELOG.md"
distfiles="https://github.com/gnome-terminator/terminator/releases/download/v$version/terminator-$version.tar.gz"
checksum=e6a21ea18c48b9dcb8fac3b48fd90bc49768de13c2a749047c46a6e0f14abb24
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e '/pytest-runner/d' -i setup.py
+}
From 45a6cabe3febf8a2628a6cda03fd90d0e063a2ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 336/634] todoman: specify all python3 hostmakedepends
---
srcpkgs/todoman/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/todoman/template b/srcpkgs/todoman/template
index 4eecfc758b2..1236479016a 100644
--- a/srcpkgs/todoman/template
+++ b/srcpkgs/todoman/template
@@ -1,9 +1,9 @@
# Template file for 'todoman'
pkgname=todoman
version=3.8.0
-revision=2
+revision=3
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-icalendar python3-urwid python3-xdg python3-parsedatetime
python3-atomicwrites python3-click-repl python3-configobj python3-click-log
python3-dateutil python3-tabulate python3-humanize"
From 29d96d6edfaf5a7bbe0dbe1649cd2c432e79bd1b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 337/634] whipper: specify all python3 hostmakedepends
Closes: #28261.
---
srcpkgs/whipper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index 03e5b89030b..8826ee845ab 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -1,9 +1,9 @@
# Template file for 'whipper'
pkgname=whipper
version=0.9.0
-revision=2
+revision=3
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
makedepends="libsndfile-devel python3-devel"
depends="libcdio-paranoia cdrdao python3-gobject python3-musicbrainzngs
python3-mutagen python3-requests python3-pycdio python3-discid
From 8198ccb85b7bf369b438d849e9ddf5dd8958c3cb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 28 Jan 2021 22:20:42 +0100
Subject: [PATCH 338/634] opendoas: update to 6.8.1.
This fixes CVE-2019-25016.
---
srcpkgs/opendoas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opendoas/template b/srcpkgs/opendoas/template
index fb68b70ddeb..e70c2509cbf 100644
--- a/srcpkgs/opendoas/template
+++ b/srcpkgs/opendoas/template
@@ -1,7 +1,7 @@
# Template file for 'opendoas'
pkgname=opendoas
-version=6.8
-revision=2
+version=6.8.1
+revision=1
wrksrc="OpenDoas-$version"
build_style=configure
configure_args="--prefix=/usr $(vopt_with 'pam') $(vopt_with 'timestamp')"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="ISC, BSD-3-Clause"
homepage="https://github.com/Duncaen/OpenDoas"
distfiles="https://github.com/Duncaen/OpenDoas/archive/v${version}.tar.gz"
-checksum=c53edc59a576cfe8ec8737230e7d0398842a5a8c925e25065463ab632a7eaba9
+checksum=c9070ae745d0f1bbe68ef0783a3958cd011b409959f65fd100e6b42b8ad6b162
build_options="pam timestamp"
build_options_default="pam timestamp"
From 07239afea0499d12811c2ee6c63f72f90439bd36 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 28 Jan 2021 22:25:01 +0100
Subject: [PATCH 339/634] umurmur: update to 0.2.19.
---
srcpkgs/umurmur/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index eac7c275465..276bdd8302c 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,6 +1,6 @@
# Template file for 'umurmur'
pkgname=umurmur
-version=0.2.18
+version=0.2.19
revision=1
build_style=gnu-configure
configure_args="--enable-shmapi --with-ssl=openssl"
@@ -11,8 +11,9 @@ short_desc="Minimalistic Mumble server"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-clause"
homepage="http://umurmur.net/"
+changelog="https://github.com/umurmur/umurmur/raw/master/ChangeLog"
distfiles="https://github.com/umurmur/umurmur/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f72c2fe802c8ab2c8dc66eb5da1fbe0c3ee73aef16abf06bba94cc69e595354f
+checksum=338053160bc48e48850061cdfc19cf1b2bb66e56877c04cd6de7831b468646b6
system_accounts="umurmur"
umurmur_homedir="/var/lib/umurmur"
From 4ab5e7fc43303938ddd45f4029715193c87473e9 Mon Sep 17 00:00:00 2001
From: "Kira L. Patton" <roundduckkira@protonmail.com>
Date: Mon, 25 Jan 2021 13:33:01 -0500
Subject: [PATCH 340/634] PikoPixel.app: update to 1.0.b10, and fix and clean
up package code
---
srcpkgs/PikoPixel.app/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template
index 33eda021519..75580158737 100644
--- a/srcpkgs/PikoPixel.app/template
+++ b/srcpkgs/PikoPixel.app/template
@@ -1,6 +1,6 @@
# Template file for 'PikoPixel.app'
pkgname=PikoPixel.app
-version=1.0.b9e
+version=1.0.b10
revision=1
wrksrc="PikoPixel.Sources.${version%.*}-${version##*.}"
build_wrksrc=PikoPixel
@@ -8,21 +8,17 @@ build_style=gnu-makefile
make_use_env=yes
hostmakedepends="gnustep-make gcc-objc tar which"
makedepends="gnustep-base-devel gnustep-gui-devel"
-depends="gnustep-base gnustep-gui gnustep-back"
+depends="gnustep-back"
short_desc="GNUstep application for drawing/editing pixel-art"
-maintainer="Kira Patton <roundduckman@protonmail.com>"
+maintainer="Kira L. Patton <roundduckkira@protonmail.com>"
license="AGPL-3.0-only"
homepage="http://twilightedge.com/mac/pikopixel/"
distfiles="http://twilightedge.com/downloads/PikoPixel.Sources.${version%.*}-${version##*.}.tar.gz"
-checksum=96977fc51343d294c7d7e76d8f1ac7aa82ae9da1d7d082dee6cee8035959afbe
+checksum=e754a89b4a3de5e034c96468d3bc37a0909ea7c06905546ee85658a5dfb547ac
-pre_build() {
- source /usr/share/GNUstep/Makefiles/GNUstep.sh
-}
-
-pre_install() {
- source /usr/share/GNUstep/Makefiles/GNUstep.sh
-}
+if [ -e /usr/share/GNUstep/Makefiles/GNUstep.sh ]; then
+ . /usr/share/GNUstep/Makefiles/GNUstep.sh
+fi
post_install() {
vinstall PikoPixel.app/Resources/PikoPixel.desktop 0755 /usr/share/applications/
From 38943df2fca9ffd94ba6b3340b2be8a02d9b5930 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 21:04:54 +0300
Subject: [PATCH 341/634] inotify-tools: update to 3.20.11.0
---
srcpkgs/inotify-tools/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/inotify-tools/template b/srcpkgs/inotify-tools/template
index 36f30d23e40..c27984b3543 100644
--- a/srcpkgs/inotify-tools/template
+++ b/srcpkgs/inotify-tools/template
@@ -1,19 +1,18 @@
# Template file for 'inotify-tools'
pkgname=inotify-tools
-version=3.20.2.2
-revision=2
+version=3.20.11.0
+revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
short_desc="Provides a simple interface to inotify"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="https://github.com/rvoicilas/inotify-tools"
-distfiles="https://github.com/rvoicilas/${pkgname}/archive/${version}.tar.gz"
-checksum=770fb1d94ace659f975d7494e3ab8b421a6aab930b9c37c7c290ab5280abb7b8
+homepage="https://github.com/inotify-tools/inotify-tools"
+distfiles="https://github.com/inotify-tools/inotify-tools/archive/${version}.tar.gz"
+checksum=58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14
pre_configure() {
- touch README
- autoreconf -i
+ autoreconf -fi
}
libinotify-tools_package() {
From a04dfc08a1438e57283815c7bb087cceb32e5f9b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 29 Jan 2021 01:45:20 +0100
Subject: [PATCH 342/634] squashfs-tools-ng: update to 1.0.4.
---
srcpkgs/squashfs-tools-ng/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/squashfs-tools-ng/template b/srcpkgs/squashfs-tools-ng/template
index ca514c409aa..8494e2598e7 100644
--- a/srcpkgs/squashfs-tools-ng/template
+++ b/srcpkgs/squashfs-tools-ng/template
@@ -1,6 +1,6 @@
# Template file for 'squashfs-tools-ng'
pkgname=squashfs-tools-ng
-version=1.0.3
+version=1.0.4
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://infraroot.at/projects/squashfs-tools-ng/index.html"
changelog="https://git.infraroot.at/squashfs-tools-ng.git/plain/CHANGELOG.md"
distfiles="https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"
-checksum=b1e4b7206e4629ba47e74fea897eb50f938e095d51cae79e77226da008045143
+checksum=e2809efdc51156196db7af591fd9ffc44297624b369619f214794c1b34bffb13
squashfs-tools-ng-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 5775ccaf651f1644973963977449d8456539ba73 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 18:08:11 +0100
Subject: [PATCH 343/634] ncmpc: update to 0.43.
---
srcpkgs/ncmpc/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index ba407ca3ccb..191fdd33f14 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,6 +1,6 @@
# Template file for 'ncmpc'
pkgname=ncmpc
-version=0.42
+version=0.43
revision=1
build_style=meson
configure_args="-Dlirc=disabled"
@@ -10,9 +10,9 @@ short_desc="Ncurses-based mpd client"
maintainer="Getty Ritter <gettyritter@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/clients/ncmpc/"
-changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/v${version}/NEWS"
+changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/master/NEWS"
distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=a5f7471d766a71c222374efa4aa17ef6ee0e42ad48d15528edd935d1f0f6cd4d
+checksum=7abf3c83d3a77c18681a8ce90126c8cb1e1884ebde5be2a735293a4f535ed382
post_install() {
vmkdir usr/share/examples/ncmpc
From 9b8a48b4b5aaea316c8104dd96329c6111f64949 Mon Sep 17 00:00:00 2001
From: George Matsumura <gmmatsumura01@bvsd.org>
Date: Wed, 8 Jul 2020 21:16:47 -0600
Subject: [PATCH 344/634] sylpheed: patch to use SNI
Prior to this patch, sylpheed built against newer versions of LibreSSL could
not connect to IMAP server such as gmail's because it did not use SNI. This
patch from OpenBSD is a simple fix to implement it.
This patch is also necessary with OpenSSL.
Also xlint template.
Closes: #23487 [via git-merge-pr]
---
srcpkgs/sylpheed/patches/libsylph_ssl_c.patch | 20 +++++++++++++++++++
srcpkgs/sylpheed/template | 8 ++++----
2 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/sylpheed/patches/libsylph_ssl_c.patch
diff --git a/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch b/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch
new file mode 100644
index 00000000000..4ab0f7b5690
--- /dev/null
+++ b/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch
@@ -0,0 +1,20 @@
+See https://sylpheed.sraoss.jp/redmine/issues/306
+
+Patch is necessary both on LibreSSL and OpenSSL
+
+--- libsylph/ssl.c.orig
++++ libsylph/ssl.c
+@@ -258,6 +258,13 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinf
+ return FALSE;
+ }
+
++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
++ if (!SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname)) {
++ g_warning("Error setting servername extension\n");
++ return FALSE;
++ }
++#endif
++
+ SSL_set_fd(sockinfo->ssl, sockinfo->sock);
+ while ((ret = SSL_connect(sockinfo->ssl)) != 1) {
+ err = SSL_get_error(sockinfo->ssl, ret);
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index be188c4e2db..1e01726ef40 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,18 +1,18 @@
-# Template build file for 'sylpheed'.
+# Template file for 'sylpheed'
pkgname=sylpheed
version=3.7.0
-revision=5
-lib32disabled=yes
+revision=6
build_style=gnu-configure
configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
short_desc="GTK+ Lightweight and user-friendly e-mail client"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license=" GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://sylpheed.sraoss.jp"
distfiles="http://sylpheed.sraoss.jp/sylpheed/v${version%.*}/$pkgname-$version.tar.bz2"
checksum=eb23e6bda2c02095dfb0130668cf7c75d1f256904e3a7337815b4da5cb72eb04
+lib32disabled=yes
pre_configure() {
aclocal -I ac
From cd4d199ef0f9c41a0274af9acd36e57270fa12d2 Mon Sep 17 00:00:00 2001
From: Fabio Krapohl <fabio.u.krapohl@fau.de>
Date: Tue, 30 Jun 2020 00:22:26 +0200
Subject: [PATCH 345/634] nxt: update to 1.12.2.
Closes: #23312 [via git-merge-pr]
---
srcpkgs/nxt/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nxt/template b/srcpkgs/nxt/template
index eb98ca7e86d..3eeaae3f30a 100644
--- a/srcpkgs/nxt/template
+++ b/srcpkgs/nxt/template
@@ -1,16 +1,16 @@
# Template file for 'nxt'
pkgname=nxt
-version=1.11.15
+version=1.12.2
revision=1
wrksrc="${pkgname}"
hostmakedepends="unzip"
depends="virtual?java-runtime"
short_desc="Client for the NXT cryptocurrency"
-maintainer="Fabio Krapohl <fabio.u.krapohl@fau.de>"
-license="Jelurida Public License 1.1"
+maintainer="Fabio Krapohl <Krapohl.f@gmx.de>"
+license="custom:Jelurida Public License 1.1"
homepage="https://nxt.org"
distfiles="https://bitbucket.org/Jelurida/${pkgname}/downloads/${pkgname}-client-${version}.zip"
-checksum=933f7a5ed02b6f4af2d50060e60acda746a2261f733b90f2ab969e951c735dfa
+checksum=83689f6d85e59be44920328d99aa934bb8998f4b5c7ea8088c83ab4503b49a42
do_install() {
vbin ${FILESDIR}/bin/${pkgname}
From 02cfe4e1f0c492fe707cb99eaeb0e154e8e6d146 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 23 Dec 2020 23:42:29 -0700
Subject: [PATCH 346/634] weston: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/weston/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1019bbbe54f..91a9d7a282e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3016,7 +3016,7 @@ libspectrum.so.8 libspectrum-1.2.2_1
libbearssl.so.0 bearssl-0.3_1
libXfont2.so.2 libXfont2-2.0.1_1
libqalculate.so.21 libqalculate-3.0.0_1
-libweston-8.so.0 weston-8.0.0_1
+libweston-9.so.0 weston-9.0.0_1
libostree-1.so.1 libostree-2017.3_1
librhash.so.0 rhash-1.3.4_1
libserialport.so.0 libserialport-0.1.1_1
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 148671b8ef4..4eb882a6c22 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,6 +1,6 @@
# Template file for 'weston'
pkgname=weston
-version=8.0.0
+version=9.0.0
revision=1
build_style=meson
configure_args="-Dtest-junit-xml=false -Dbackend-rdp=false -Dsystemd=false
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://wayland.freedesktop.org/"
distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848
+checksum=5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe
system_groups="weston-launch"
lib32disabled=yes
@@ -66,7 +66,7 @@ weston-x11_package() {
}
weston-xwayland_package() {
- short_desc+=" - xwayland backend"
+ short_desc+=" - xwayland plugin"
pkg_install() {
vmove "/usr/lib/libweston-${version%%.*}/xwayland.so"
}
From 938c7a3a22b507f056c676beaf2fc1b1c3e2e65d Mon Sep 17 00:00:00 2001
From: rev1e <62853071+rev1e@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:13:27 +0100
Subject: [PATCH 347/634] lemonbar: update to 1.4.
Also fix xlint.
Closes: #27609 [via git-merge-pr]
---
srcpkgs/lemonbar/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/lemonbar/template b/srcpkgs/lemonbar/template
index 35afe81e454..74bcedf324f 100644
--- a/srcpkgs/lemonbar/template
+++ b/srcpkgs/lemonbar/template
@@ -1,21 +1,21 @@
# Template file for 'lemonbar'
pkgname=lemonbar
-version=1.3
+version=1.4
revision=1
wrksrc="bar-${version}"
build_style=gnu-makefile
hostmakedepends="perl"
makedepends="libxcb-devel"
-short_desc="A lightweight xcb based bar"
+short_desc="Lightweight xcb based bar"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/LemonBoy/bar"
license="MIT"
+homepage="https://github.com/LemonBoy/bar"
distfiles="https://github.com/LemonBoy/bar/archive/v${version}.tar.gz"
-checksum=eae784c5e375b2d0b12138be1a9902beb4b5eeb807f3512f30f14ba23ddaa37d
+checksum=7bfd36d7a4a950f61ed0d32c7d219678e7787a546d9ef4bc33f02393d60e4939
pre_build() {
- sed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
- sed -i 's/^\(LDFLAGS *+=\)/override \1/' Makefile
+ vsed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
+ vsed -i 's/^\(LDFLAGS *+=\)/override \1/' Makefile
}
post_install() {
vlicense LICENSE
From 4ebeb16ca3ba34e96f0c1def952e1f159c4d66c0 Mon Sep 17 00:00:00 2001
From: tommyjanna <25873341+tommyjanna@users.noreply.github.com>
Date: Tue, 5 Jan 2021 13:23:16 -0500
Subject: [PATCH 348/634] python3-wrapt: update to 1.12.1.
---
srcpkgs/python3-wrapt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
index ccb7a685fcb..b182006befe 100644
--- a/srcpkgs/python3-wrapt/template
+++ b/srcpkgs/python3-wrapt/template
@@ -1,6 +1,6 @@
# Template file for 'python3-wrapt'
pkgname=python3-wrapt
-version=1.11.2
+version=1.12.1
revision=4
wrksrc="wrapt-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://github.com/GrahamDumpleton/wrapt"
distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
-checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
+checksum=b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7
post_install() {
vlicense LICENSE
From ae9a11ed366010175dea7957bb35e3f2189c5f4a Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Mon, 21 Sep 2020 21:58:31 -0700
Subject: [PATCH 349/634] pinephone-uboot: update to 0.0.20200917.
Fixes random wifi MAC issue, see this issue for more details:
https://gitlab.com/ubports/community-ports/pinephone/-/issues/225
pinephone-uboot: fix usage of makejobs variable
---
srcpkgs/pinephone-uboot/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/pinephone-uboot/template b/srcpkgs/pinephone-uboot/template
index a92b6bb1d09..2073c910cb5 100644
--- a/srcpkgs/pinephone-uboot/template
+++ b/srcpkgs/pinephone-uboot/template
@@ -1,6 +1,6 @@
# Template file for 'pinephone-uboot'
pkgname=pinephone-uboot
-version=0.0.20200904
+version=0.0.20200917
revision=1
archs="aarch64*"
create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="John Sullivan <jsullivan@csumb.edu>"
license="GPL-2.0-only, BSD-3-Clause"
homepage="http://www.denx.de/wiki/U-Boot/WebHome"
-_tag_uboot=crust-2020-09-04
+_tag_uboot=crust-2020-09-17
_commit_armtf=2bdb4611ad6efdb3da2ff0d2de7fee4c43e95aeb
_commit_crust=e63106c70bc4ddfa3575e4f1f3667de0795252a8
@@ -24,7 +24,7 @@ distfiles="https://gitlab.com/pine64-org/u-boot/-/archive/${_tag_uboot}/${_uboot
https://github.com/ARM-software/arm-trusted-firmware/archive/${_commit_armtf}.tar.gz
https://github.com/crust-firmware/crust/archive/${_commit_crust}.tar.gz"
-checksum="06eb107aced5b41da3cd0cfdcc2ad90b7c51fcbec7aac5c7388e30c58e2536b8
+checksum="395e61790d4877e11c470445dfee834a017a4b5df5f7ee34ebcaa125713150dc
48291b621a4bc38c7956964407130edd2d02d8b3789fce4193ac1b747a5b37db
6fc2d68725a78b1ca6e7c6602286fc2aa2ddcdea28e83a85f6b988fcc5a513b8"
@@ -68,13 +68,13 @@ do_build() {
_hostcc="HOST_COMPILE=${XBPS_CROSS_TRIPLET}-"
fi
- make -C $_armtf $_cross PLAT=sun50i_a64 DEBUG=1 -j $makejobs bl31
- make -C $_crust $_hostcc $_or1k -j $makejobs scp
+ make -C $_armtf $_cross PLAT=sun50i_a64 DEBUG=1 $makejobs bl31
+ make -C $_crust $_hostcc $_or1k $makejobs scp
export BL31=$wrksrc/$_armtf/build/sun50i_a64/debug/bl31.bin
export SCP=$wrksrc/$_crust/build/scp/scp.bin
- make -C $_uboot $_cross -j $makejobs
+ make -C $_uboot $_cross $makejobs
}
do_install() {
From 011eb8eddc3273f2e0da5883eb895c6d51da3f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 00:36:07 -0300
Subject: [PATCH 350/634] guile: don't use variable in homepage.
---
srcpkgs/guile/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 60a5be98584..f9ce43c0670 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -10,7 +10,7 @@ makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
short_desc="A portable, embeddable Scheme implementation written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
subpackages="libguile guile-devel"
From 6e9a3bc8d1e35542dafe9313e190928accc4b7c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 11:03:44 +0100
Subject: [PATCH 351/634] 9base: update to 6.0.20190911
The distfile could perhaps be provided by the official Void Linux site.
---
srcpkgs/9base/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/9base/template b/srcpkgs/9base/template
index 39325c85562..a670631f0f7 100644
--- a/srcpkgs/9base/template
+++ b/srcpkgs/9base/template
@@ -1,8 +1,8 @@
# Template file for '9base'
pkgname=9base
-version=6.0.20170806
+version=6.0.20190911
revision=1
-_githash=09e95a2d6f8dbafc6601147b2f5f150355813be6
+_githash=63916da7bd6d73d9a405ce83fc4ca34845667cce
wrksrc="9base-${_githash}"
build_style=gnu-makefile
# we use byacc instead of internal version
@@ -11,8 +11,9 @@ short_desc="Revived minimalist port of Plan 9 userland to Unix"
maintainer='Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>'
license="custom"
homepage="http://git.suckless.org/9base"
-distfiles="https://distfiles.voidlinux.de/9base-${_githash}.tar.bz2"
-checksum=57640696d65a8acbaca5417f1db1dea5ebbc694e8bed0d4ee8a3229f4800dddd
+# Checked out from http://git.suckless.org/9base/ and created tarball with 'git archive'.
+distfiles="https://distfiles.voidlinux.de/9base-${_githash}.tar.gz"
+checksum=bb8cd1e0060824914839fd090353971862a1025ae4b8ea5d1e99618ddd1b160f
conflicts="plan9port"
provides="plan9port-20160418_4"
From ca2279c41574ebbff8f6f5e9c1710c47138d19ec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 11:54:38 +0100
Subject: [PATCH 352/634] dfu-util: update to 0.10.
---
srcpkgs/dfu-util/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dfu-util/template b/srcpkgs/dfu-util/template
index 25be1be5711..635703aefe6 100644
--- a/srcpkgs/dfu-util/template
+++ b/srcpkgs/dfu-util/template
@@ -1,6 +1,6 @@
# Template file for 'dfu-util'
pkgname=dfu-util
-version=0.9
+version=0.10
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Foxlet <foxlet@furcode.co>"
homepage="http://dfu-util.sourceforge.net/"
license="GPL-2.0-only"
distfiles="http://dfu-util.sourceforge.net/releases/dfu-util-${version}.tar.gz"
-checksum=36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833
+checksum=a03dc58dfc79c056819c0544b2a5970537566460102b3d82cfb038c60e619b42
From 69c8a62c81d017d25a0f80bba4d1a99a3b153f33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 12:01:19 +0100
Subject: [PATCH 353/634] swi-prolog: update to 8.2.4.
---
srcpkgs/swi-prolog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 046edd9af1a..ce5d45085d8 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,6 +1,6 @@
# Template file for 'swi-prolog'
pkgname=swi-prolog
-version=8.2.3
+version=8.2.4
revision=1
wrksrc="swipl-${version}"
build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.swi-prolog.org/"
changelog="http://www.swi-prolog.org/ChangeLog?branch=stable"
distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
-checksum=9403972f9d87f1f4971fbd4a5644b4976b1b18fc174be84506c6b713bd1f9c93
+checksum=f4bcc78437f9080ab089762e9e6afa7071df7f584c14999b92b9a90a4efbd7d8
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 276d4a0dade65e6f9fa72989ee2ad718d18e5bd5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:19:57 +0100
Subject: [PATCH 354/634] ugrep: update to 3.1.5.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 07acebd43ae..188a499d165 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.1.4
+version=3.1.5
revision=1
build_style=gnu-configure
configure_args="--disable-avx"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=3de80f56e82ac21fda574334a1e55d3a9027c156d4b1ce1b0e96ea99b25cda32
+checksum=f9efdc95c77e7c2651b614f7dc525db31c8e4809e70af4a9f2e33035859f7278
From 3aa14011c4fa2f2fc9f6973d70b1e0862d39ebfc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:23:53 +0100
Subject: [PATCH 355/634] xpdf: update to 4.03.
---
srcpkgs/xpdf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index fa3a213db45..4f3c4f0ac66 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -1,6 +1,6 @@
# Template file for 'xpdf'
pkgname=xpdf
-version=4.02
+version=4.03
revision=1
build_style=cmake
configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc"
@@ -12,8 +12,8 @@ short_desc="Viewer for Portable Document Format (PDF) files"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="http://www.xpdfreader.com/"
-distfiles="https://xpdfreader-dl.s3.amazonaws.com/xpdf-$version.tar.gz"
-checksum=52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4
+distfiles="https://dl.xpdfreader.com/xpdf-${version}.tar.gz"
+checksum=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846
patch_args="-Np1"
post_extract() {
From eef8841e2b3a0a387247cd7f0d835153d9dc31a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:24:31 +0100
Subject: [PATCH 356/634] python3-boto3: update to 1.16.62.
---
srcpkgs/python3-boto3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index d14270addb8..38121e097cd 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.58
+version=1.16.62
revision=1
wrksrc="boto3-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/boto/boto3"
distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=dd813463f50c969c367282ad8857ba6acaf15ce35edda383da643d00907cebfb
+checksum=6dcdf024d8b45b865a4895605c4ef8855bbd2bcfcfd3792050a79abe1c633237
post_install() {
vlicense LICENSE
From 1a422bb285986910b85ebd0f1b127eee7a3ac16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 14:05:02 +0100
Subject: [PATCH 357/634] 9base: name server problem fixed
---
srcpkgs/9base/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/9base/template b/srcpkgs/9base/template
index a670631f0f7..feade2c2eb4 100644
--- a/srcpkgs/9base/template
+++ b/srcpkgs/9base/template
@@ -1,4 +1,4 @@
-# Template file for '9base'
+# Template file for '9base'.
pkgname=9base
version=6.0.20190911
revision=1
From 42f3817ed880cd0e876b4afafe35b7f6f1f33097 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 14:20:39 +0100
Subject: [PATCH 358/634] xbps: make repo generation less error-prone
---
srcpkgs/xbps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index cae1b8681e9..728179a46fc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -35,13 +35,13 @@ do_configure() {
}
post_install() {
- local repo="repository=https://alpha.de.repo.voidlinux.org/current" suffix=
+ local repo="https://alpha.de.repo.voidlinux.org/current" suffix=
case "$XBPS_TARGET_MACHINE" in
aarch64*) suffix="/aarch64";;
*-musl) suffix="/musl";;
esac
- echo "${repo}${suffix}" > \
+ echo "repository=${repo}${suffix}" > \
${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
echo "architecture=${XBPS_TARGET_MACHINE}" > \
${DESTDIR}/usr/share/xbps.d/xbps-arch.conf
From 5bff5decc88abc65514b2c09fc843ab79c2135f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 14:30:23 +0100
Subject: [PATCH 359/634] kea: update to 1.9.4
---
common/shlibs | 34 +++++++++++++++++-----------------
srcpkgs/kea/template | 4 ++--
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 91a9d7a282e..75075c2d259 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2929,26 +2929,26 @@ libkj-http-0.8.0.so capnproto-0.8.0_1
libkj-async-0.8.0.so capnproto-0.8.0_1
libkj-test-0.8.0.so capnproto-0.8.0_1
libkj-0.8.0.so capnproto-0.8.0_1
-libkea-asiodns.so.1 libkea-1.7.0_1
-libkea-asiolink.so.21 libkea-1.9.3_1
-libkea-cc.so.20 libkea-1.9.2_1
-libkea-cfgclient.so.21 libkea-1.9.3_1
+libkea-asiodns.so.12 libkea-1.9.4_1
+libkea-asiolink.so.22 libkea-1.9.4_1
+libkea-cc.so.21 libkea-1.9.4_1
+libkea-cfgclient.so.22 libkea-1.9.4_1
libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.19 libkea-1.9.3_1
-libkea-dhcp++.so.31 libkea-1.9.2_1
-libkea-dhcp_ddns.so.14 libkea-1.9.1_1
-libkea-dhcpsrv.so.41 libkea-1.9.3_1
-libkea-dns++.so.5 libkea-1.8.0_1
-libkea-eval.so.23 libkea-1.9.2_1
+libkea-database.so.20 libkea-1.9.4_1
+libkea-dhcp++.so.32 libkea-1.9.4_1
+libkea-dhcp_ddns.so.15 libkea-1.9.4_1
+libkea-dhcpsrv.so.42 libkea-1.9.4_1
+libkea-dns++.so.16 libkea-1.9.4_1
+libkea-eval.so.24 libkea-1.9.4_1
libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.29 libkea-1.9.3_1
-libkea-http.so.22 libkea-1.9.3_1
-libkea-log.so.17 libkea-1.9.2_1
-libkea-pgsql.so.17 libkea-1.9.3_1
-libkea-process.so.24 libkea-1.9.3_1
-libkea-stats.so.16 libkea-1.9.0_1
+libkea-hooks.so.30 libkea-1.9.4_1
+libkea-http.so.23 libkea-1.9.4_1
+libkea-log.so.18 libkea-1.9.4_1
+libkea-pgsql.so.18 libkea-1.9.4_1
+libkea-process.so.25 libkea-1.9.4_1
+libkea-stats.so.18 libkea-1.9.4_1
libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.30 libkea-1.9.3_1
+libkea-util.so.31 libkea-1.9.4_1
libytnef.so.0 ytnef-1.8_1
libpisock.so.9 pilot-link-0.12.5_1
libpisync.so.1 pilot-link-0.12.5_1
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index c1e26d2d467..78ec7c0f956 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,6 +1,6 @@
# Template file for 'kea'
pkgname=kea
-version=1.9.3
+version=1.9.4
revision=1
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
@@ -20,7 +20,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="MPL-2.0, Apache-2.0"
homepage="https://kea.isc.org"
distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
-checksum=804b846eabf2fd8a577cd91e35c6a86c8e601f602f94be84fe59b61df3c04d9f
+checksum=0f3a28df4db0f3658fd58baa555bc36e82e3a36d9fb5cc71b557132fc695aa3b
build_options="botan mysql pgsql"
desc_option_botan="With Botan SSL support"
From 8a668bee1e465c859d7a33a4d15b16d7439f1307 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 29 Jan 2021 08:03:43 -0600
Subject: [PATCH 360/634] Amass: update to 3.11.2.
---
srcpkgs/Amass/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 0598c9ff251..c34b79c131a 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
# Template file for 'Amass'
pkgname=Amass
-version=3.11.1
+version=3.11.2
revision=1
build_style=go
go_import_path="github.com/OWASP/Amass/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=142d18f409acd93e622887181cf84bb9ef4e8bdeb1448158166b252609bbb4c9
+checksum=e1db845ba25e8d0b15476794517536fdcbdc661cf05d718a11a7d09dbbd7347c
From 501df43a08ed75ad9e0cbaa6477dd12827ccbcd8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 29 Jan 2021 08:07:32 -0600
Subject: [PATCH 361/634] python3-rich: update to 9.10.0.
---
srcpkgs/python3-rich/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 347396c6edb..5bc8426f438 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
# Template file for 'python3-rich'
pkgname=python3-rich
-version=9.9.0
+version=9.10.0
revision=1
wrksrc="rich-${version}"
build_style=python3-module
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/willmcgugan/rich"
distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=0bd8f42c3a03b7ef5e311d5e37f47bea9d268f541981c169072be5869c007957
+checksum=e0f2db62a52536ee32f6f584a47536465872cae2b94887cf1f080fb9eaa13eb2
post_install() {
vlicense LICENSE
From 5ceca1cd3467c410af635e3ddca260d97930ef1e Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Wed, 27 Jan 2021 13:59:23 -0800
Subject: [PATCH 362/634] broadcom-wl-dkms patch for kernel 5.10
---
.../broadcom-wl-dkms/patches/linux-5.10.patch | 179 ++++++++++++++++++
.../broadcom-wl-dkms/patches/linux-5.9.patch | 36 ----
srcpkgs/broadcom-wl-dkms/template | 2 +-
3 files changed, 180 insertions(+), 37 deletions(-)
create mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
delete mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
new file mode 100644
index 00000000000..429db60e730
--- /dev/null
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
@@ -0,0 +1,179 @@
+diff -u -r src/wl/sys/wl_cfg80211_hybrid.c src/wl/sys/wl_cfg80211_hybrid.c
+--- src/wl/sys/wl_cfg80211_hybrid.c 2021-01-25 08:55:05.625224400 -0800
++++ src/wl/sys/wl_cfg80211_hybrid.c 2021-01-25 08:58:30.000982902 -0800
+@@ -41,6 +41,7 @@
+ #include <wlioctl.h>
+ #include <proto/802.11.h>
+ #include <wl_cfg80211_hybrid.h>
++#include <wl_linux.h>
+
+ #define EVENT_TYPE(e) dtoh32((e)->event_type)
+ #define EVENT_FLAGS(e) dtoh16((e)->flags)
+@@ -446,30 +447,8 @@
+ static s32
+ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ {
+- struct ifreq ifr;
+- struct wl_ioctl ioc;
+- mm_segment_t fs;
+- s32 err = 0;
+-
+ BUG_ON(len < sizeof(int));
+-
+- memset(&ioc, 0, sizeof(ioc));
+- ioc.cmd = cmd;
+- ioc.buf = arg;
+- ioc.len = len;
+- strcpy(ifr.ifr_name, dev->name);
+- ifr.ifr_data = (caddr_t)&ioc;
+-
+- fs = get_fs();
+- set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+- err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+- err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+- set_fs(fs);
+-
+- return err;
++ return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+
+ static s32
+diff -u -r src/wl/sys/wl_iw.c src/wl/sys/wl_iw.c
+--- src/wl/sys/wl_iw.c 2021-01-25 09:00:13.163543809 -0800
++++ src/wl/sys/wl_iw.c 2021-01-25 09:02:04.218646005 -0800
+@@ -37,6 +37,7 @@
+
+ #include <wl_dbg.h>
+ #include <wl_iw.h>
++#include <wl_linux.h>
+
+ extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
+ uint32 reason, char* stringBuf, uint buflen);
+@@ -106,29 +107,7 @@
+ int len
+ )
+ {
+- struct ifreq ifr;
+- wl_ioctl_t ioc;
+- mm_segment_t fs;
+- int ret;
+-
+- memset(&ioc, 0, sizeof(ioc));
+- ioc.cmd = cmd;
+- ioc.buf = arg;
+- ioc.len = len;
+-
+- strcpy(ifr.ifr_name, dev->name);
+- ifr.ifr_data = (caddr_t) &ioc;
+-
+- fs = get_fs();
+- set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+- ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+- ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+- set_fs(fs);
+-
+- return ret;
++ return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+
+ static int
+diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
+--- src/wl/sys/wl_linux.c 2021-01-25 09:02:08.055475147 -0800
++++ src/wl/sys/wl_linux.c 2021-01-25 09:06:11.894764339 -0800
+@@ -1650,10 +1650,7 @@
+ goto done2;
+ }
+
+- if (segment_eq(get_fs(), KERNEL_DS))
+- buf = ioc.buf;
+-
+- else if (ioc.buf) {
++ if (ioc.buf) {
+ if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) {
+ bcmerror = BCME_NORESOURCE;
+ goto done2;
+@@ -1674,7 +1671,7 @@
+ WL_UNLOCK(wl);
+
+ done1:
+- if (ioc.buf && (ioc.buf != buf)) {
++ if (ioc.buf) {
+ if (copy_to_user(ioc.buf, buf, ioc.len))
+ bcmerror = BCME_BADADDR;
+ MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN));
+@@ -1684,6 +1681,39 @@
+ ASSERT(VALID_BCMERROR(bcmerror));
+ if (bcmerror != 0)
+ wl->pub->bcmerror = bcmerror;
++ return (OSL_ERROR(bcmerror));
++}
++
++int
++wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len)
++{
++ wl_info_t *wl;
++ wl_if_t *wlif;
++ int bcmerror;
++
++ if (!dev)
++ return -ENETDOWN;
++
++ wl = WL_INFO(dev);
++ wlif = WL_DEV_IF(dev);
++ if (wlif == NULL || wl == NULL || wl->dev == NULL)
++ return -ENETDOWN;
++
++ bcmerror = 0;
++
++ WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd));
++
++ WL_LOCK(wl);
++ if (!capable(CAP_NET_ADMIN)) {
++ bcmerror = BCME_EPERM;
++ } else {
++ bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif);
++ }
++ WL_UNLOCK(wl);
++
++ ASSERT(VALID_BCMERROR(bcmerror));
++ if (bcmerror != 0)
++ wl->pub->bcmerror = bcmerror;
+ return (OSL_ERROR(bcmerror));
+ }
+
+diff -u -r src/wl/sys/wl_linux.h src/wl/sys/wl_linux.h
+--- src/wl/sys/wl_linux.h 2021-01-25 09:06:15.188672391 -0800
++++ src/wl/sys/wl_linux.h 2021-01-25 09:07:49.457810535 -0800
+@@ -29,6 +29,7 @@
+ #define _wl_linux_h_
+
+ #include <wlc_types.h>
++#include <wlc_pub.h>
+
+ typedef struct wl_timer {
+ struct timer_list timer;
+@@ -194,6 +195,7 @@
+ extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+ extern void wl_free(wl_info_t *wl);
+ extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len);
+ extern struct net_device * wl_netdev_get(wl_info_t *wl);
+
+ #endif
+diff -u -r src/wl/sys/wlc_pub.h src/wl/sys/wlc_pub.h
+--- src/wl/sys/wlc_pub.h 2021-01-25 09:07:54.543645032 -0800
++++ src/wl/sys/wlc_pub.h 2021-01-25 09:08:10.772110464 -0800
+@@ -24,6 +24,7 @@
+
+ #include <wlc_types.h>
+ #include <wlc_utils.h>
++#include <siutils.h>
+ #include "proto/802.11.h"
+ #include "proto/bcmevent.h"
+
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
deleted file mode 100644
index c0af5c181dd..00000000000
--- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -u -r src/wl/sys/wl_cfg80211_hybrid.c src/wl/sys/wl_cfg80211_hybrid.c
---- src/wl/sys/wl_cfg80211_hybrid.c 2015-09-18 22:47:30.000000000 +0000
-+++ src/wl/sys/wl_cfg80211_hybrid.c 2020-10-12 21:20:05.200372484 +0000
-@@ -450,7 +450,7 @@
- ifr.ifr_data = (caddr_t)&ioc;
-
- fs = get_fs();
-- set_fs(get_ds());
-+ set_fs(KERNEL_DS);
- #if defined(WL_USE_NETDEV_OPS)
- err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
- #else
-diff -u -r src/wl/sys/wl_iw.c src/wl/sys/wl_iw.c
---- src/wl/sys/wl_iw.c 2015-09-18 22:47:30.000000000 +0000
-+++ src/wl/sys/wl_iw.c 2020-10-12 21:19:51.426836804 +0000
-@@ -117,7 +117,7 @@
- ifr.ifr_data = (caddr_t) &ioc;
-
- fs = get_fs();
-- set_fs(get_ds());
-+ set_fs(KERNEL_DS);
- #if defined(WL_USE_NETDEV_OPS)
- ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
- #else
-diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
---- src/wl/sys/wl_linux.c 2020-10-12 21:19:15.256305165 +0000
-+++ src/wl/sys/wl_linux.c 2020-10-12 21:20:38.687530895 +0000
-@@ -1643,7 +1643,7 @@
- goto done2;
- }
-
-- if (segment_eq(get_fs(), KERNEL_DS))
-+ if (get_fs().seg == KERNEL_DS.seg)
- buf = ioc.buf;
-
- else if (ioc.buf) {
diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template
index 59a0df64183..55bc9c0e1d3 100644
--- a/srcpkgs/broadcom-wl-dkms/template
+++ b/srcpkgs/broadcom-wl-dkms/template
@@ -2,7 +2,7 @@
pkgname=broadcom-wl-dkms
version=6.30.223.271
-revision=10
+revision=11
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:Proprietary Broadcom license"
homepage="http://broadcom.com"
From 015abe548a3361461e75f60779bf46d06b433ab5 Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Wed, 27 Jan 2021 18:08:00 -0800
Subject: [PATCH 363/634] added broadcom-wl-dkms linux-5.10 patch source and
commetary
---
.../broadcom-wl-dkms/patches/linux-5.10.patch | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
index 429db60e730..b3b136f5586 100644
--- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
@@ -1,3 +1,30 @@
+https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290
+
+From f3d652840f8dd959395065a1cf67ca40b04ec69b Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Tue, 13 Oct 2020 19:35:55 +0200
+Subject: [PATCH] Get rid of get_fs/set_fs calls in Broadcom WL driver.
+
+Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 5.10 (tested -rc1 up to 5.10.1)
+
+Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-23 on Arch Linux.
+
+NB: Some checks in wlc_ioctl_internal are likely superfluous,
+ but I'm not familiar enough with the driver to remove them with confidence.
+
+See also: https://lwn.net/Articles/722267/
+ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=47058bb54b57962b3958a936ddbc59355e4c5504
+ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5e6e9852d6f76e01b2e6803c74258afa5b432bc5
+
+Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 25 ++-------------------
+ src/wl/sys/wl_iw.c | 25 ++-------------------
+ src/wl/sys/wl_linux.c | 40 ++++++++++++++++++++++++++++-----
+ src/wl/sys/wl_linux.h | 2 ++
+ src/wl/sys/wlc_pub.h | 1 +
+ 5 files changed, 42 insertions(+), 51 deletions(-)
+
diff -u -r src/wl/sys/wl_cfg80211_hybrid.c src/wl/sys/wl_cfg80211_hybrid.c
--- src/wl/sys/wl_cfg80211_hybrid.c 2021-01-25 08:55:05.625224400 -0800
+++ src/wl/sys/wl_cfg80211_hybrid.c 2021-01-25 08:58:30.000982902 -0800
From 07c8ea3dba721a50d2008dbabf52403510cb6d47 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:56:24 +0100
Subject: [PATCH 364/634] haveged: update to 1.9.14.
Closes: #28162 [via git-merge-pr]
---
srcpkgs/haveged/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/haveged/template b/srcpkgs/haveged/template
index aa5dd7548c6..73b736dc6d5 100644
--- a/srcpkgs/haveged/template
+++ b/srcpkgs/haveged/template
@@ -1,6 +1,6 @@
# Template file for 'haveged'
pkgname=haveged
-version=1.9.13
+version=1.9.14
revision=1
build_style=gnu-configure
short_desc="Entropy harvesting daemon using CPU timings"
@@ -8,7 +8,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-3.0-or-later"
homepage="http://www.issihosts.com/haveged"
distfiles="https://github.com/jirka-h/haveged/archive/v${version}.tar.gz"
-checksum=d17bd22fa1745daca5ac72e014ed3b0fe5720da4c115953124b1bf2a0aa2b04b
+checksum=938cb494bcad7e4f24e61eb50fab4aa0acbc3240c80f3ad5c6cf7e6e922618c3
post_install() {
vsv $pkgname
From 4e8d639f5958db4ef14d2d7e18c6afab9cc9fcea Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 16:13:41 +0100
Subject: [PATCH 365/634] konsole: switch to ninja to drop cursed hack
this avoids running into the weird automoc race condition
so we can drop that whole path and be done with it
---
srcpkgs/konsole/template | 42 +++++-----------------------------------
1 file changed, 5 insertions(+), 37 deletions(-)
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 900cff279dd..13c87171b8b 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -3,9 +3,9 @@ pkgname=konsole
version=20.12.1
revision=1
build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
+configure_args="-DBUILD_TESTING=OFF -GNinja"
hostmakedepends="pkg-config extra-cmake-modules kcoreaddons qt5-devel
- gettext qt5-qmake kdoctools kconfig"
+ gettext qt5-qmake kdoctools kconfig ninja"
makedepends="kinit-devel knewstuff-devel knotifyconfig-devel kparts-devel
kpty-devel"
short_desc="KDE's Terminal Emulator"
@@ -15,46 +15,14 @@ homepage="https://kde.org/applications/en/system/org.kde.konsole"
distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
checksum=b690be392462cab5abac74d1e1010c3f991c3d00968b51ed5525040640d769ec
replaces="konsole5>=0"
+# FIXME: after we switch cmake build-style to ninja, remove this as well as
+# the ninja host-dependency and configure_arg as they will become superfluous
+make_cmd=ninja
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
fi
-post_configure() {
- # there is some really awful race in cmake or something
- #
- # careful inspection of a diff between a working platform and a broken
- # one (seemingly every big endian target) reveals that this dependency
- # is not added in these specific files and these file only; that results
- # in build errors like:
- #
- # [ 98%] Linking CXX shared library ../bin/libkdeinit5_konsole.so
- # /usr/bin/ld: ../ProfileModel.cpp.o: undefined reference to `vtable for Konsole::ProfileModel'
- #
- # this is obviously a horrible hack, but also debugging this seems pretty
- # non-trivial to say the least, and honestly i am not in the mood for
- # debugging this either, it's frustrating enough as it is
- #
- # next release we should try if this still fails, and in case it magically
- # gets fixed, remove this and pretend i've never made this change
- #
- # (git will remember, and it will haunt me forever, that is my punishment)
- #
- [ -n "$(grep 'konsoleprofile_autogen/mocs_compilation' \
- build/src/CMakeFiles/kdeinit_konsole.dir/build.make)" ] && return 0
-
- msg_normal "cursed build system encountered, brace for impact\n"
-
- vsed -i "s,^kdeinit_konsole_EXTERNAL_OBJECTS =,& $(pwd)/build/src/profile/CMakeFiles/konsoleprofile.dir/konsoleprofile_autogen/mocs_compilation.cpp.o," \
- build/src/CMakeFiles/kdeinit_konsole.dir/build.make
-
- echo "bin/libkdeinit5_konsole.so: src/profile/CMakeFiles/konsoleprofile.dir/konsoleprofile_autogen/mocs_compilation.cpp.o" \
- >> build/src/CMakeFiles/kdeinit_konsole.dir/build.make
-
- vsed -i "s,ProfileShortcutDelegate.cpp.o,& profile/CMakeFiles/konsoleprofile.dir/konsoleprofile_autogen/mocs_compilation.cpp.o," \
- build/src/CMakeFiles/kdeinit_konsole.dir/link.txt
-}
-
konsole5_package() {
build_style=meta
short_desc+=" (transitional dummy package)"
From 0e9cff57f2deeafe1165f0b40df4fc8a5773b6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 11:54:19 -0300
Subject: [PATCH 366/634] thunderbird: update to 78.7.0.
---
srcpkgs/thunderbird/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 90726eef564..dc3e3a03dc2 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
#
pkgname=thunderbird
-version=78.6.1
+version=78.7.0
revision=1
build_helper="rust"
short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.thunderbird.net/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=870b544d26f5e52c187499d134e49eded2943a4a029269ae86aba6a69c53dcc6
+checksum=77b6da5cab9107cc1650f95be8593f6344bfe04d7e4395a28fde64a4fc301c08
lib32disabled=yes
From 0007bc0f0aa7eb58dafeb49afa8f15e4b992e6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 12:26:53 -0300
Subject: [PATCH 367/634] thunderbird-i18n: update to 78.7.0.
---
srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
1 file changed, 56 insertions(+), 56 deletions(-)
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3385c87d31d..3439e2ece22 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'thunderbird-i18n'
pkgname=thunderbird-i18n
-version=78.6.1
+version=78.7.0
revision=1
build_style=meta
short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
}
}
-checksum="e219394dff8efa55cff3bcdfeb11512c05429a8a8b1b267a4e25d7b4f25ff8bf
- 70100e330a4357fd41aaace58191faa5d33ffc6160a71375fa50beac13426464
- 232de444679279f96d3aef9122c6ed1f1cd21519f8bade4921ba57cdae1841f5
- 7d72da039551edc420a8d26d4a36a8d2b4f157091acaf0743ea65da6b5fe94b9
- 0c26eee598ac67d9ee621a439c1c74fa3144a85a7a868330bc2896c01c2ec048
- 349c6745d419fa442dd9bb3b8e93a7ca3ee870d50365c52b059f7d17fdab7bf2
- 396b1ba5ce5f688e1ac46d240d5cf9ccb8e7c956c2fc11f92ad0cb8bba8fa02f
- a059986fa9a302f51ed5de605f48750b5d4c56def5843f9024b11dbb54fd0576
- 1b0f2bab89d93a7279114fb288ac3d7593d12d1b42ac8f33c50a4b701bd20907
- aba82ecc6d91d6d47440fbffeb14f6ede17eb89a06566c001de50b5b35f948fb
- 07b9b1837eaa5b4b1b7c45e37c83eb7225627daa088b841e006582cc244d798a
- 581f415d8146dce16ec3ef25b43c323f01a8d90d3aad9ba16801b30df410ad6c
- 2888542aac6163f93776bb43aa18a6636b2aa794ad8e349d95548faaf666569e
- c296a9bd8c6f89ef7c75707d239d218b918f9fc68f1a10262362963cbbe8a010
- 47903e76d08ae2f2cdc51828a65f9b34839930219a2c6e017e729c0d41f9677d
- 3e2a49c7314c050a680e85e40ec57794cdf8fa382c23744247d04db412d1527f
- e3123b6fa35c0b60c90c635bc80da772eecc3c60acf596af4a78ab01d9651863
- f04e7ccb3416f29dadb85caf193a1420c56d52797b28ddb0ed300e33f3de5b43
- 9022ec0a832d35982d8ebe2a847fb8cfd2e8c7def938d2262a671921832cef09
- 1e1a2640a14b9644e6e0e25a8e400c800d9855678a84e70bac35cbcea6e6e2de
- 248a7f831ebc78b21abc80046e1670183d24becc075929212d8f904a9a2bfad1
- 7b1ad4971690b75e41e881038773e9b14e74798888d4797b13a4d6149c6898ec
- 83c2393f2440dac78b601b4e037c86242dbd32dbf20e80ba9eef4aa100975eaf
- 9828b309b689d3dd193824b6d27e9d26ad0e64a6193b3917d80632051f7876e7
- 738653a9e4e5b42eb3aac6b21bd868bfd1d91e9f6df4fb9828dbfa5e3bf83edd
- b43cd7995f75b5c59851fec42864bdece44fe1a5e29125a59b8b4efdedb6e068
- 076f46a1c75cad00b07dec0009859133a0a8edab07a91c9c19f735891ae38368
- f60db3af5aa6f9e54a18792c23d1e37f3eb31d995062eb8e42803442029ad10e
- a0d2f462e3c1203315eeea160e44347a9f09a4e2be02fde958316987d280fce9
- 9c62dcfac247ec9daad9ae1040ce6cfe840f5ae7fc05c03531ef1baca8b9d2ed
- 65438bc89ee12fac5322b17eb460c399e1c79153b8401b3a903b7dcc1c334f74
- cf414370af76d6acc24e79024930ab285544be64fe21be97364616dd2a579e10
- 2127e4879f5e59cc843b9ef2dc4fb06649520685ced51ab0d87e8d703705b17e
- f868867c74a72317ec9df521e88e64308119def7b045119061a4e8be66285d0c
- aee136f1b637c3fe7432b15c1184b8ecf019da291a756a8a1269ecfad675f999
- 23a783b408b8f72fc8ed32fd0c8b62c3aeee458569f6c239554b57897bac7375
- 0d9d01a16595895546b40da1836a798395cd571e2e25d6b6d0b6852c4181efe8
- a6a187d0f22a9c14a293ce0da887f6954218c27cad89bbafbf29bd19b487d1ea
- 59b07afeed57833d55112aca0e4c054fdc7855c2b687a69ed8d3771b2b039d30
- 255759456642abb9b7a97f7ebedcc3c946d816b80db3b8ffdcbabb5420c96b41
- 56d761ca31c963351f6c34b15a82a31f5bf98a905eb1b02339a6e4613e12c7e5
- 19c814481e03422ecf538478806c4e64803c2a7a011eea614e26abe78210162b
- a5324699458b5f767e48cbf763a9a7aa89ffe003b7f7b3a2fa199fd24d063206
- fbd135f039a85e064420f6cb6859fbca3ba6c24e438339e9308253cf8aead81b
- c2f7b0ba8e1919b9452c0c02d3a8338442bfdcb17f2049c4b1e29a0c347fef0a
- 89eb18e56ca896cfa9d4059c7a9798afb539c4f18ead11d39f10d00967013938
- 9ebda35cadfddbc0e460cc0003e745f0e1fff1cff40e7a0fc03b10e5780f8456
- 6ba07d9ad3fa236c014a081697cf7f9f870a5bc9b60b7e03a456de3e3e597acb
- 6943914ef17d0f62de915721c526e4fbd3aa4d63bb8144cf95bd44a86a14bc69
- 4430402ad31bb9799f0b3110abbb2dc412022eb74b06bd5d656c6246f041b40c
- 17914302e797f5362f8e6b7473ba02278003263c63dd20b044eb70a575550050
- 66bb52f540987cb548353cd0f15d34fc6d600bedd9c07df25e3e7770d12bd7de
- 70cc073b366a3dc4c96369ba132308e7fa72f04c8ab3516460c45339d7ffb6b9
- 82a8ebb64d5e5af7d24b79d18650f632e90f9fd8c5d40379964d6f8bf403d336
- 613133513d1287ab13168f6ddf225d5ad9e697ec44f769cee3e9b70ee9b86150"
+checksum="dc139cb06a57b5fd523ca5a5841dbc46e058a88eee9c20d6bd5dfdd814fded42
+ bc6483761476acb595e7d06453059b3efd3974a2cfdbc7cb7eafda2b581d0010
+ 7df83d410595290a7c8d17e65429de7f7441068192b2e81aa00e34514a0a9d59
+ 1abf91853869dc9dd45f7f52d4efe4450404398a4646105749f94e674c69c4c8
+ 7c85abe833857a3d2d17f162ed0b5abf9098e78baa1f224fb65594986c61c47f
+ 0dd8a465ce974fec5c0be168ecff82cfd2de207c4ec40673fe67b57409735fcc
+ 2dfa481d8df8cf51e408c6198ff895e40f55b1a24d781f3a4f16f71b464069d8
+ 8654a0e1417138bd5a09621cfd74d68415886fa3714bed1fd0aa7edff8650938
+ 5cd2c6de1618d6a8be2a298731013da0bd8fca7601fd68f224c97e6820699ea6
+ e8a20ca1d4048db62c26399b29ba4107ee96c112c6f47cf87721dbd46df61d06
+ e6f835f1c5cdbe7f0c428b6f9b5b25eb8452b35300107dd17561f6acff5e665d
+ c8c4c8411fc3f4b9e555baf3dc6bbac60d51d218f095151ed9e29baf749d36d1
+ 3096dec5b02c82515764cdb9fda713dee85651b66a5bbff57ef32dcc812bcda3
+ bb28056a70c0112bc67acf2d8cc2f0719336ad4223d409cbc1d19b0a721d18e4
+ 1ec412d72bd8bd35b9fc417ecce15193955e78d93258ac1521b24fde5730221b
+ c6ca0dec779a05b52343e44df445e379c45532ca83681205be596d17d37ec7ac
+ f2a207215fff83daac000d90fd15d01475e92e2b21e74fada9796e61961b2f97
+ 7fc6cc0140288d1cbb0fe3fc6946803320249a68cd240290c0e5a6db38fa570c
+ c805abef39a262c61fdc394d41401b17f74b4c756abb67eb42ed5977cc66a5fe
+ da6903f1d3c8c4cc3e9d999533b3ef1717a472bd990819a12b8562f029b0435e
+ 4343d8dbc1c0f7c44ff293fef3e08014090a0bc60b3a0cab4b43922c3713a383
+ efa4bdf912c581b84370cbc0b8da6ea452fbf5b77ad3a3a6e8aacd3dbd9edbaa
+ 032010b9fb64344207a18e6500d6a416f76e89b5abad3c9c6c7b0d5ba42af2c5
+ cad754a63527e81f8bca3497cd26747ed0199a9be8e5325b813d6a89a6c4ac2e
+ 8a19a42f0637c00a0d0d47f1dae2732330f7561c231d02504ca831e915405cb6
+ cec085d5c74781feab3a3e7e2d798529acb3daf83b457e643fdba67d140b6792
+ 5d880d49e484c812c33f1e29f0eaefb5f8464115566c989421efe9adfd658293
+ aebb685b45988439be1a24ed85fe0644bf7ec101a7dd5862c20466db284a42b5
+ 9982d440c315995e4942e188413de7634706265947c19eb8c2fe9a21fcf2fc5d
+ 8cead19b18afaf2a3846eab8b87e6b438a4fe0eac0520ffd288613a2e3f0b436
+ 36aa8cd7bf8001b6fe4f2e309fccb96c8b509c98c76d04b433de6e7933c24109
+ 7da7495366920a00b69083f3f0e3ae42c656f1125d812dfd491e3729de3efac1
+ c36c1275fdcf8218364653858c62c31b6d6b35f32305a992000c96686e7b93a9
+ c05086da1d19050d5af120f9b42c7cc7137500f86f8f0fa30091419e640262c9
+ 5621d942d8aac2c1c434cacfbad4bb906408c822b94b29569d3ee824aca520db
+ 74dec8ab24e01863a94a49e4870fa64a0dc7c499879da424fed14d5b5c5ceb66
+ 327eea1f4db3f315e2e02011232d00738ced6bb70da0a654afa2bb650f43bd03
+ 6ff122c21e17fdc2b5b9123a8238c279b9fe19290ea5a1492792f97be012de77
+ 6099fa7ff2717057100a0214c75bdd06a754005dc66ae71c7c308dd57aa01b35
+ 22525b2ac8292c2e66a3e5609a82ad4d6defaaa16acae85223ce54bab9ecbafa
+ 49614bb2693f9ab0899fb411e41b90ef2abac8791a942c181b3b547ca1f9a6ef
+ b074a72df48573d9bbfa9d48fcd034acc012312b527baf6fc515a2a2a00c6c39
+ d715b12462732993d062366ba5742a8c5b8e7f191fc65acf6a70421f088b2ed0
+ 4d2916db09c2ff79a795cb82a7f5e9445c57bfb9b29ba9adc7d258318f0dc621
+ 3c760fd67702920bafe47e1747862a1baebcc8ec9fde2e4b8f2a919222e5aeb9
+ fdddfd5236a43273c031c1ce84b78a9aba5b8a4edffca7ab4ca90ef56ac78797
+ fd96e238020144f026391c4b602faa39b2bc52d8de499447a5daa0aef5307e88
+ 2c391159d9006f0fd2b273c18c2892e910d82dfd31708b64746b27d3b755c458
+ 5a9dbbd62a2d70629b1c06a211b026a59e78ab6bb72ec17aa4b043190e1e8b7e
+ 6a983d0d8ac5bd808183d9ee8fce79e970eb84d59b24973a8890413435c6fd45
+ 9487cfa39c8cdcd0f7d65ab87256eced5337f67dddd1800cb477219b3b13b845
+ 5d751de257ca6f33d3f2dd8c11e794d5726eab35f8c7c686e09bb274aa3b5915
+ 78a04fe243243ceaba73125582e06eda9f1c868724cc7eef10528a9c2eb507ac
+ cc54c95770f1769d268026acd96d84a9828080ba07c0bb43b20c115bc829d23a
+ e3620e77f10074832d5df21474f9bbc7814949b9bb4f941dd420ffe1bb447eda"
From 9afc6acf2b9139b7dbf2773161af813ee19b4880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 19:28:13 +0100
Subject: [PATCH 368/634] switchboard-plug-printers: fix build
---
.../patches/fix-signal_subscribe.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
new file mode 100644
index 00000000000..fa2a534e4f1
--- /dev/null
+++ b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
@@ -0,0 +1,11 @@
+--- src/CUPSNotifier.vala 2018-11-28 12:34:33.000000000 +0100
++++ src/CUPSNotifier.vala 2021-01-29 19:26:11.191992396 +0100
+@@ -63,7 +63,7 @@
+ Bus.get_proxy.begin<NotifierDBus> (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => {
+ try {
+ dbus_notifier = Bus.get_proxy.end (res);
+- ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback);
++ ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback);
+ } catch (IOError e) {
+ critical (e.message);
+ }
From 67a4da569a3390f00ad111309091ca9146fa6c67 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 19:42:11 +0100
Subject: [PATCH 369/634] perl-Authen-SASL: fix build and deps.
---
srcpkgs/perl-Authen-SASL/patches/inc.patch | 10 ++++++++++
srcpkgs/perl-Authen-SASL/template | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/perl-Authen-SASL/patches/inc.patch
diff --git a/srcpkgs/perl-Authen-SASL/patches/inc.patch b/srcpkgs/perl-Authen-SASL/patches/inc.patch
new file mode 100644
index 00000000000..8ba0ca2d3ac
--- /dev/null
+++ b/srcpkgs/perl-Authen-SASL/patches/inc.patch
@@ -0,0 +1,10 @@
+--- Makefile.PL.orig
++++ Makefile.PL
+@@ -3,6 +3,7 @@
+ use strict;
+ use warnings;
+ use 5.005;
++use lib ".";
+ use inc::Module::Install;
+
+ name 'Authen-SASL';
diff --git a/srcpkgs/perl-Authen-SASL/template b/srcpkgs/perl-Authen-SASL/template
index 8f6fba0b542..c9aea8eb958 100644
--- a/srcpkgs/perl-Authen-SASL/template
+++ b/srcpkgs/perl-Authen-SASL/template
@@ -1,11 +1,11 @@
# Template file for 'perl-Authen-SASL'
pkgname=perl-Authen-SASL
version=2.16
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
-makedepends="$hostmakedepends"
+makedepends="$hostmakedepends perl-Digest-HMAC"
depends="$makedepends"
short_desc="Authen::SASL -- SASL authentication framework"
maintainer="Orphaned <orphan@voidlinux.org>"
From c65e8ac1aeb2ad6a232701cecf6f9ad92163ebf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 00:36:42 -0300
Subject: [PATCH 370/634] tzdata: update to 2021a.
---
srcpkgs/tzdata/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 0f324ff3fc8..25f79d0a192 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -1,6 +1,6 @@
# Template file for 'tzdata'
pkgname=tzdata
-version=2020d
+version=2021a
revision=1
wrksrc=tzdata
create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="Public Domain"
homepage="http://www.iana.org/time-zones"
distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=8d813957de363387696f05af8a8889afa282ab5016a764c701a20758d39cbaf3
+checksum=39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08
do_install() {
local timezones="africa antarctica asia australasia europe northamerica \
From 9d372c1468c03dfb95c5743ea20f379fe3c6b9a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 00:36:49 -0300
Subject: [PATCH 371/634] tzutils: update to 2021a.
---
srcpkgs/tzutils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index cd1d30fd253..3bd79fb85cb 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,6 +1,6 @@
# Template file for 'tzutils'
pkgname=tzutils
-version=2020d
+version=2021a
revision=1
wrksrc="tz-${version}"
short_desc="Time zone and daylight-saving time utilities"
@@ -8,7 +8,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="Public Domain, BSD-3-Clause"
homepage="https://www.iana.org/time-zones"
distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
-checksum=6b9ec90e79593913f687e3af5d880eaa036bb0aafea9707682b0cbd00fadbb09
+checksum=bd7ecd99cbb0a2f15bb7e38be2cbc04dced89922fce4ac0ffcd1ca844ba9362f
do_build() {
make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
From 06b54203f2011931d4326bcf22a00365346d667f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 29 Jan 2021 19:39:28 +0100
Subject: [PATCH 372/634] tokei: update to 12.1.2.
---
srcpkgs/tokei/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template
index 30ba02dcb3d..59205436a68 100644
--- a/srcpkgs/tokei/template
+++ b/srcpkgs/tokei/template
@@ -1,6 +1,6 @@
# Template file for 'tokei'
pkgname=tokei
-version=12.0.4
+version=12.1.2
revision=1
build_style=cargo
short_desc="Count lines of code"
@@ -8,7 +8,7 @@ maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
license="Apache-2.0, MIT"
homepage="https://github.com/XAMPPRocky/tokei"
distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}.tar.gz"
-checksum=031dabbe1253af53fea8258e11eeb352371b6cf0c790db573ca7be33f761c733
+checksum=81ef14ab8eaa70a68249a299f26f26eba22f342fb8e22fca463b08080f436e50
post_install() {
vlicense LICENCE-MIT
From 6b1da182dd360604b42a7021da59e088a8c366de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 21:08:12 +0100
Subject: [PATCH 373/634] busybox: fix build w/ glibc-2.32 by disabling NFS
---
srcpkgs/busybox/files/dotconfig | 2 +-
srcpkgs/busybox/patches/missing-stime.patch | 32 +++++++++++++++++++++
srcpkgs/busybox/template | 3 +-
3 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/busybox/patches/missing-stime.patch
diff --git a/srcpkgs/busybox/files/dotconfig b/srcpkgs/busybox/files/dotconfig
index 68876b0821a..b3c2a607ecc 100644
--- a/srcpkgs/busybox/files/dotconfig
+++ b/srcpkgs/busybox/files/dotconfig
@@ -654,7 +654,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y
CONFIG_FEATURE_MOUNT_VERBOSE=y
CONFIG_FEATURE_MOUNT_HELPERS=y
CONFIG_FEATURE_MOUNT_LABEL=y
-CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_NFS=n
CONFIG_FEATURE_MOUNT_CIFS=y
CONFIG_FEATURE_MOUNT_FLAGS=y
CONFIG_FEATURE_MOUNT_FSTAB=y
diff --git a/srcpkgs/busybox/patches/missing-stime.patch b/srcpkgs/busybox/patches/missing-stime.patch
new file mode 100644
index 00000000000..7cef477c756
--- /dev/null
+++ b/srcpkgs/busybox/patches/missing-stime.patch
@@ -0,0 +1,32 @@
+--- libbb/missing_syscalls.c 2019-06-10 12:50:53.000000000 +0200
++++ libbb/missing_syscalls.c 2021-01-29 20:48:33.413486161 +0100
+@@ -7,14 +7,6 @@
+
+ #include "libbb.h"
+
+-#if defined(ANDROID) || defined(__ANDROID__)
+-/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
+-# include <sys/syscall.h>
+-pid_t getsid(pid_t pid)
+-{
+- return syscall(__NR_getsid, pid);
+-}
+-
+ int stime(const time_t *t)
+ {
+ struct timeval tv;
+@@ -23,6 +15,14 @@
+ return settimeofday(&tv, NULL);
+ }
+
++#if defined(ANDROID) || defined(__ANDROID__)
++/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
++# include <sys/syscall.h>
++pid_t getsid(pid_t pid)
++{
++ return syscall(__NR_getsid, pid);
++}
++
+ int sethostname(const char *name, size_t len)
+ {
+ return syscall(__NR_sethostname, name, len);
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 35e589aced4..707dac57d2d 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,7 +1,7 @@
# Template file for 'busybox'
pkgname=busybox
version=1.31.1
-revision=3
+revision=4
hostmakedepends="perl"
checkdepends="zip"
short_desc="Swiss Army Knife of Embedded Linux"
@@ -48,7 +48,6 @@ do_configure() {
case "$XBPS_TARGET_MACHINE" in
*-musl) sed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
- -e /CONFIG_FEATURE_MOUNT_NFS/s/y/n/ \
${t}/.config;;
esac
From eba97767a13f28ef987c5ddac474c3402a4c14b2 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Fri, 29 Jan 2021 18:30:55 +0000
Subject: [PATCH 374/634] ImageMagick: update to 7.0.10.60.
---
srcpkgs/ImageMagick/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 5764712db61..17e59755740 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
_majorver=7.0.10
-_patchver=58
+_patchver=60
version="${_majorver}.${_patchver}"
revision=1
wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -21,7 +21,7 @@ license="ImageMagick"
homepage="https://www.imagemagick.org/"
changelog="https://imagemagick.org/script/changelog.php"
distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=0daabb64602164940fbf95cbd6f16709903eef5d3eee7bd329da878f17605df5
+checksum=044fc1b27bd9aab515d4c512a33cf3a39313af2baef4aebf5c5c3044b7366ee4
subpackages="libmagick libmagick-devel"
From a634ed716b811356724a1275c5eecdf3e8ce40cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 29 Jan 2021 17:57:05 +0100
Subject: [PATCH 375/634] tml: update to 0.4.0.
---
srcpkgs/tml/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 494883b1010..fb1e4b7953c 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,17 +1,18 @@
# Template file for 'tml'
pkgname=tml
-version=0.3.0
+version=0.4.0
revision=1
build_style=go
go_import_path="github.com/liamg/tml"
go_package="github.com/liamg/tml/tml"
+go_ldflags="-X github.com/liamg/tml/version.Version=${TRAVIS_TAG}"
hostmakedepends="git"
short_desc="Tiny markup language for terminal output"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Unlicense"
homepage="https://github.com/liamg/tml"
distfiles="https://github.com/liamg/tml/archive/v${version}.tar.gz"
-checksum=083d0252827d13da36a0b9c967d522adf31f8ce770a00c29d84a197d0102216e
+checksum=b0c421ec8f3c3fcbdfbabe1a07c71ce5fd572a8f34181b8d032dff1a297d458b
post_install() {
vlicense LICENSE
From 4254ffed9f1e6da2c967649a13ad723054085410 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Fri, 29 Jan 2021 19:48:54 +0000
Subject: [PATCH 376/634] dehydrated: update to 0.7.0.
---
srcpkgs/dehydrated/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dehydrated/template b/srcpkgs/dehydrated/template
index b624b1fe226..949e5ab73b3 100644
--- a/srcpkgs/dehydrated/template
+++ b/srcpkgs/dehydrated/template
@@ -1,7 +1,7 @@
# Template file for 'dehydrated'
pkgname=dehydrated
-version=0.6.5
-revision=2
+version=0.7.0
+revision=1
depends="curl"
short_desc="Acme client implemented as a shell-script – just add water"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://dehydrated.io/"
changelog="https://raw.githubusercontent.com/lukas2511/dehydrated/master/CHANGELOG"
distfiles="https://github.com/lukas2511/dehydrated/releases/download/v${version}/dehydrated-${version}.tar.gz"
-checksum=10aabd0027450bc70a18e49acaca7a9697e0cfb92368d3e508b7a4d6d69bfa35
+checksum=1c5f12c2e57e64b1762803f82f0f7e767a72e65a6ce68e4d1ec197e61b9dc4f9
conf_files="/etc/dehydrated/config
/etc/dehydrated/domains.txt
/etc/dehydrated/hook.sh"
From a9bdd436eff3fdd489894c405402f9651f04a3e4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 22:44:49 +0100
Subject: [PATCH 377/634] linux5.10: enable amdgpu dcn30 (rx 6xxx series) on
ppc64
---
srcpkgs/linux5.10/files/ppc64-dotconfig | 4 +-
srcpkgs/linux5.10/files/ppc64le-dotconfig | 19 ++------
.../patches/amdgpu-dcn30-ppc64.patch | 46 +++++++++++++++++++
3 files changed, 53 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 4299f42e17c..4579421aac2 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.10 Kernel Configuration
+# Linux/powerpc 5.10.11 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
@@ -6032,6 +6032,7 @@ CONFIG_DRM_AMD_ACP=y
#
CONFIG_DRM_AMD_DC=y
CONFIG_DRM_AMD_DC_DCN=y
+CONFIG_DRM_AMD_DC_DCN3_0=y
# CONFIG_DRM_AMD_DC_HDCP is not set
CONFIG_DRM_AMD_DC_SI=y
# end of Display Engine Configuration
@@ -7197,7 +7198,6 @@ CONFIG_USB_BDC_UDC=m
#
# Platform Support
#
-CONFIG_USB_BDC_PCI=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
# CONFIG_USB_NET2272_DMA is not set
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index 1397fe1b776..08459346e24 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -1,11 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.1 Kernel Configuration
+# Linux/powerpc 5.10.11 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
@@ -4202,7 +4202,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_REGMAP=m
CONFIG_GPIO_MAX730X=m
#
@@ -4261,7 +4260,6 @@ CONFIG_GPIO_MAX77620=m
CONFIG_GPIO_MAX77650=m
CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_RC5T583=y
-CONFIG_GPIO_SL28CPLD=m
CONFIG_GPIO_STMPE=y
CONFIG_GPIO_TC3589X=y
CONFIG_GPIO_TPS65086=m
@@ -4545,7 +4543,6 @@ CONFIG_SENSORS_UCD9200=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_ZL6100=m
CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_SL28CPLD=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SHT3x=m
@@ -4638,7 +4635,6 @@ CONFIG_WM831X_WATCHDOG=m
# CONFIG_WM8350_WATCHDOG is not set
CONFIG_XILINX_WATCHDOG=m
CONFIG_ZIIRAVE_WATCHDOG=m
-CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_CADENCE_WATCHDOG=m
CONFIG_DW_WATCHDOG=m
CONFIG_RN5T618_WATCHDOG=m
@@ -4763,8 +4759,6 @@ CONFIG_MFD_RK808=m
CONFIG_MFD_RN5T618=m
# CONFIG_MFD_SEC_CORE is not set
CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SKY81452=m
@@ -5838,6 +5832,7 @@ CONFIG_DRM_AMD_ACP=y
#
CONFIG_DRM_AMD_DC=y
CONFIG_DRM_AMD_DC_DCN=y
+CONFIG_DRM_AMD_DC_DCN3_0=y
# CONFIG_DRM_AMD_DC_HDCP is not set
CONFIG_DRM_AMD_DC_SI=y
# end of Display Engine Configuration
@@ -6893,7 +6888,6 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
@@ -6949,7 +6943,6 @@ CONFIG_USB_BDC_UDC=m
#
# Platform Support
#
-CONFIG_USB_BDC_PCI=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
# CONFIG_USB_NET2272_DMA is not set
@@ -8503,7 +8496,6 @@ CONFIG_PWM_FSL_FTM=m
CONFIG_PWM_IQS620A=m
CONFIG_PWM_LP3943=m
CONFIG_PWM_PCA9685=m
-CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_STMPE=y
# CONFIG_PWM_TWL is not set
# CONFIG_PWM_TWL_LED is not set
@@ -9418,7 +9410,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_DMA_DECLARE_COHERENT=y
CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
-CONFIG_DMA_VIRT_OPS=y
CONFIG_SWIOTLB=y
# CONFIG_DMA_API_DEBUG is not set
CONFIG_SGL_ALLOC=y
diff --git a/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
new file mode 100644
index 00000000000..a72cdfea781
--- /dev/null
+++ b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
@@ -0,0 +1,46 @@
+From 3a75ebe236580073d77ad69730fc1d8980e130c2 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Fri, 29 Jan 2021 22:25:29 +0100
+Subject: [PATCH] amd/display: enable dcn30 for ppc64
+
+---
+ drivers/gpu/drm/amd/display/Kconfig | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
+index 3c410d2..a749cc7 100644
+--- a/drivers/gpu/drm/amd/display/Kconfig
++++ b/drivers/gpu/drm/amd/display/Kconfig
+@@ -19,7 +19,7 @@ config DRM_AMD_DC_DCN
+
+ config DRM_AMD_DC_DCN3_0
+ bool "DCN 3.0 family"
+- depends on DRM_AMD_DC && X86
++ depends on DRM_AMD_DC
+ depends on DRM_AMD_DC_DCN
+ help
+ Choose this option if you want to have
+diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
+index bd2a068..248c271 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
++++ b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
+@@ -52,6 +52,7 @@ IS_OLD_GCC = 1
+ endif
+ endif
+
++ifdef CONFIG_X86
+ ifdef IS_OLD_GCC
+ # Stack alignment mismatch, proceed with caution.
+ # GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3
+@@ -62,6 +63,7 @@ else
+ CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_resource.o += -msse2
+ CFLAGS_$(AMDDALPATH)/dc/dcn30/dcn30_optc.o += -msse2
+ endif
++endif
+
+ AMD_DAL_DCN30 = $(addprefix $(AMDDALPATH)/dc/dcn30/,$(DCN30))
+
+--
+2.30.0
+
From 1946023b2f38dc93730df7d610b15c97103f2d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 29 Jan 2021 23:48:59 +0100
Subject: [PATCH 378/634] ario: fix install path for locale files
---
srcpkgs/ario/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..80caeb5b559 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
@@ -16,6 +16,6 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
post_extract() {
- sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
- sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+ vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+ vsed -i 's,$(prefix)/$(DATADIRNAME)/locale,$(datarootdir)/locale,' po/Makefile.in.in
}
From fb37ae7d67c3216376e4a2306834512c68a5b461 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 23:56:44 +0100
Subject: [PATCH 379/634] ario: fix the l10n dir, this time properly
the previous change would change the install path but not where
the patch actually looks up the files, breaking locale support
entirely
---
srcpkgs/ario/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 80caeb5b559..eaa4bb2b89c 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
@@ -17,5 +17,5 @@ checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
post_extract() {
vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
- vsed -i 's,$(prefix)/$(DATADIRNAME)/locale,$(datarootdir)/locale,' po/Makefile.in.in
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
From e3d05d1c1bfe4ed1ad5d6d949a57a902d1c9aeeb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:32:58 +0100
Subject: [PATCH 380/634] appdata-tools: properly fix locale dir
---
srcpkgs/appdata-tools/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index 126997ddee9..3613bef253e 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,18 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
pkgname=appdata-tools
version=0.1.8
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
short_desc="Tools to handle the AppData files"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://people.freedesktop.org/~hughsient/appdata"
distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
post_configure() {
- vsed -i po/Makefile \
- -e 's;\(itlocaledir = $(prefix)\)/$(DATADIRNAME)/locale;\1/share/locale;'
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
From ed42b98bf8c9b1f767752b8c62bf6bfdc65270b6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:38:25 +0100
Subject: [PATCH 381/634] appdata-tools: use post_patch
oops, post_configure wasn't correct but it also built fine because
the changed timestamp would make it re-run configure
---
srcpkgs/appdata-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index 3613bef253e..40779679ba1 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -12,6 +12,6 @@ homepage="http://people.freedesktop.org/~hughsient/appdata"
distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
-post_configure() {
+post_patch() {
vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
From 392add6071f361b3a10f40bd2490d2772ddd5113 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:40:47 +0100
Subject: [PATCH 382/634] polkit-gnome: fix l10n directory
---
srcpkgs/polkit-gnome/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..21841eebb2c 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'polkit-gnome'
pkgname=polkit-gnome
version=0.105
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="polkit-devel gtk+3-devel"
@@ -12,6 +12,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
post_install() {
vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
}
From f944a2b585a1f299d7d6582dad6fa23eaf9d4d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 26 Jan 2021 17:28:49 -0300
Subject: [PATCH 383/634] librsvg: update to 2.50.3.
Remove outdated comments.
Remove forgotten conditionals for vmoves. Would have built erroneous
packages.
Add changelog.
---
srcpkgs/librsvg/template | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 3e4954a1332..871e6148283 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,7 +1,6 @@
# Template file for 'librsvg'
pkgname=librsvg
-# https://gitlab.gnome.org/GNOME/librsvg/-/issues/604
-version=2.48.8
+version=2.50.3
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -13,11 +12,14 @@ short_desc="SVG library for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/LibRsvg"
+# update changelog when release series changes
+changelog="https://gitlab.gnome.org/GNOME/librsvg/-/raw/librsvg-2.50/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f480a325bbdf26d1874eb6fb330ebc5920ba64e3e08de61931bb4506dfef2692
+checksum=a4298a98e3a95fdd73c858c17d4dd018525fb09dbb13bbd668a0c2243989e958
do_check() {
- # reference files are for pango 1.44.x, we're on 1.42.x
+ # reference files are for specific pango and harfbuzz versions
+ # the test suite isn't designed to be run by distros
:
}
@@ -29,12 +31,8 @@ librsvg-devel_package() {
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- if [ "$build_option_vala" ]; then
- vmove usr/share/vala
- fi
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
}
}
librsvg-utils_package() {
From d97887cf83b71a219ef2c491a4951c498a753130 Mon Sep 17 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, 30 Jan 2021 09:43:02 +0700
Subject: [PATCH 384/634] geeqie: fix l10n dir
---
srcpkgs/geeqie/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..efc425e9d83 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
# Template file for 'geeqie'
pkgname=geeqie
version=1.5.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-gtk3"
hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel"
@@ -25,6 +25,11 @@ post_extract() {
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
+ # The shipped configure doesn't have the code path
+ # for generating gtk+3 cflags and ldflags
+ vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+ -e '/CATOBJEXT=/s/\.mo/.gmo/' \
+ configure
}
do_build() {
From 26b556a218b18cc340682c60f52c6051cbb7de51 Mon Sep 17 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, 30 Jan 2021 09:50:10 +0700
Subject: [PATCH 385/634] libgpod: fix l10n dir
---
srcpkgs/libgpod/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..8e547f1f9eb 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,7 +1,7 @@
# Template file for 'libgpod'
pkgname=libgpod
version=0.8.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
@@ -19,6 +19,7 @@ post_patch() {
pre_configure() {
autoreconf -fi
+ vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
}
libgpod-devel_package() {
From 1af31b4311af8e67192993cbddedb82dde3d03da Mon Sep 17 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, 30 Jan 2021 13:40:19 +0700
Subject: [PATCH 386/634] pragha: fix l10n dir, remove build_options
---
srcpkgs/pragha/template | 44 ++++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 25 deletions(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2069b22b1ef 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,41 +1,35 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.3
-revision=5
+revision=6
build_style=gnu-configure
-hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
+hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
+ pkg-config"
makedepends="
gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
- $(vopt_if peas libpeas-devel) libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
+ libpeas-devel libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
libnotify-devel libcdio-devel libcdio-paranoia-devel libcddb-devel
libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
-short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
+short_desc="Lightweight Music Player for GNU/Linux"
maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://pragha-music-player.github.io/"
distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8
-build_options="peas"
-desc_option_peas="Enable libpeas plugin library"
-
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="peas"
-fi
-
-pre_configure() {
- CPP=$CPP ./autogen.sh
+do_configure() {
+ CFLAGS+=" $($PKG_CONFIG --cflags gupnp-1.2)"
+ CPP=$CPP ./autogen.sh \
+ $configure_args \
+ --disable-maintainer-mode \
+ --with-locales-dir=/usr/share/locale
}
-if [ -z "$CROSS_BUILD" ]; then
-
- pragha-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include/pragha/plugins
- vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
- }
+pragha-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/pragha/plugins
+ vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
}
-
-fi
+}
From 81813c430326aaface4e531e0e0256cfa69b7b2e Mon Sep 17 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, 30 Jan 2021 14:29:51 +0700
Subject: [PATCH 387/634] gtk+: fix l10n dir
---
srcpkgs/gtk+/template | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..8c6bc811502 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
# Template file for 'gtk+'
pkgname=gtk+
version=2.24.32
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
homepage="http://www.gtk.org"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
# Package build options
@@ -27,11 +28,17 @@ build_options_default="gir cups"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
- pre_configure() {
- autoreconf -if
- }
fi
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ autoreconf -if
+ fi
+ vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+ -e '/CATOBJEXT=/s/\.mo/.gmo/' \
+ configure
+}
+
post_install() {
# Provide a default (icon)theme and font.
vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0
From 7bf12f8378193197ea9afaae81aae7a08d8def1b Mon Sep 17 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, 30 Jan 2021 13:59:01 +0700
Subject: [PATCH 388/634] xsane: fix l10n dir
---
srcpkgs/xsane/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..65c6fd79288 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,8 +1,8 @@
# Template file for 'xsane'
pkgname=xsane
version=0.999
-revision=3
-hostmakedepends="pkg-config"
+revision=4
+hostmakedepends="pkg-config sane-devel gettext"
makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
depends="sane"
short_desc="GTK-based X11 frontend for SANE"
@@ -12,9 +12,11 @@ homepage="http://www.xsane.org"
distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz"
checksum=5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" sane-devel"
-fi
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \
+ -e 's,/usr/local/include,/usr/include,' \
+ configure
+}
do_build() {
local _args="--prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
@@ -26,7 +28,6 @@ do_build() {
make clean
echo "=== ./configure ${_args} --disable-gimp"
./configure ${_args} --disable-gimp
- sed -i 's;/usr/local;/usr;g' src/Makefile
make ${makejobs}
}
From 07126932da34acba292dd0fd573cc460216858bf Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 30 Jan 2021 13:52:45 +0000
Subject: [PATCH 389/634] entr: update to 4.7.
---
srcpkgs/entr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template
index af4119764bb..0b42bf9c50e 100644
--- a/srcpkgs/entr/template
+++ b/srcpkgs/entr/template
@@ -1,6 +1,6 @@
# Template file for 'entr'
pkgname=entr
-version=4.6
+version=4.7
revision=1
build_style=gnu-makefile
short_desc="Utility for running arbitrary commands when files change"
@@ -8,7 +8,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="ISC"
homepage="http://entrproject.org"
distfiles="$homepage/code/$pkgname-$version.tar.gz"
-checksum=16de20820df4a38162354754487b1248c8711822c7342d2f6d4f28fbd4a38e6d
+checksum=b6c1ab7644d83bb2a269dc74160867a3be0f5df116c7eb453c25053173534429
post_extract() {
case "$XBPS_TARGET_MACHINE" in
From 622db9dd0c6086dc9b7bdad0458b0d4972cc8753 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:58:07 +0100
Subject: [PATCH 390/634] perl-Specio: update to 0.47
---
srcpkgs/perl-Specio/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Specio/template b/srcpkgs/perl-Specio/template
index 5f9190c0a48..23a14cba192 100644
--- a/srcpkgs/perl-Specio/template
+++ b/srcpkgs/perl-Specio/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Specio'
pkgname=perl-Specio
-version=0.46
-revision=2
+version=0.47
+revision=1
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -14,4 +14,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="Artistic-2.0"
homepage="https://metacpan.org/release/Specio"
distfiles="${CPAN_SITE}/Test/Specio-${version}.tar.gz"
-checksum=0bf42aa116076d6efc18f72b72c7acb5638bd41c0aa09aecc12fc8bf9ceb9596
+checksum=f41307f14444f8777e572f27eeb6a964084399e7e382c47c577827ad8a286a1c
From 4a24ab4a2643558dea9f46623832403bdd3f06df Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 01:58:11 -0700
Subject: [PATCH 391/634] procs: update to 0.11.3.
---
srcpkgs/procs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index ec213049c73..17a0dc5e052 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
# Template file for 'procs'
pkgname=procs
-version=0.10.10
+version=0.11.3
revision=1
build_style=cargo
short_desc="Modern replacement for ps written in Rust"
@@ -8,7 +8,7 @@ maintainer="travankor <travankor@tuta.io>"
license="MIT"
homepage="https://github.com/dalance/procs"
distfiles="https://github.com/dalance/procs/archive/v${version}.tar.gz"
-checksum=dbef5afc118f54e794b539b86fc3a53ac4a94ec566ad78cddfe0580940388421
+checksum=bf56fde52d0f6544a2ca3db6d4552867e5cf9daf1c5a31f8b3ad6e3258986b0f
post_install() {
vlicense LICENSE
From d446b87e0ceb5c7d2564756e713110ed20ce631e Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sat, 30 Jan 2021 05:53:35 +0000
Subject: [PATCH 392/634] delve: update to 1.6.0
---
srcpkgs/delve/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index 00360982335..22f8bc63051 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,6 +1,6 @@
# Template file for 'delve'
pkgname=delve
-version=1.5.0
+version=1.6.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=f8bbaecdfc9d1ff6148900d3dea44b6dd06a7f0197be4e9a75c289b7f62682ab
+checksum=a10a6fc40d87572c6d3f3becdb1a289269e17526d038749f2fa04dd9f591f26a
case "$XBPS_TARGET_MACHINE" in
i686*|arm*|ppc*) broken=yes ;;
From 7c3cd69c554d937f143c933abd92a1ce4af4aba5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:53:36 +0100
Subject: [PATCH 393/634] perl-Role-Tiny: update to 2.002004
---
srcpkgs/perl-Role-Tiny/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Role-Tiny/template b/srcpkgs/perl-Role-Tiny/template
index f0754d4ab5b..7887cfeb166 100644
--- a/srcpkgs/perl-Role-Tiny/template
+++ b/srcpkgs/perl-Role-Tiny/template
@@ -1,6 +1,6 @@
# Template file for 'perl-Role-Tiny'
pkgname=perl-Role-Tiny
-version=2.002003
+version=2.002004
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Role-Tiny"
distfiles="${CPAN_SITE}/lib/HAARG/Role-Tiny-${version}.tar.gz"
-checksum=6981e5f2d0beded157840199d678da462b22a9a3753333cab322ab6efb0fbb89
+checksum=d7bdee9e138a4f83aa52d0a981625644bda87ff16642dfa845dcb44d9a242b45
From 421cc6ab7a90313f04e19ccd84bb4c6b1f2827fe Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:50:21 +0100
Subject: [PATCH 394/634] perl-Gtk3: update to 0.038
---
srcpkgs/perl-Gtk3/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Gtk3/template b/srcpkgs/perl-Gtk3/template
index b5ef6929ba0..7b0b175733c 100644
--- a/srcpkgs/perl-Gtk3/template
+++ b/srcpkgs/perl-Gtk3/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Gtk3'
pkgname=perl-Gtk3
-version=0.037
-revision=2
+version=0.038
+revision=1
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="LGPL-2.1-or-later"
homepage="http://gtk2-perl.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Gtk3/Gtk3-${version}.tar.gz"
-checksum=bf5ae1547294a78ca8ba5a88cb20f99a16e4c82bed55446aa054c944918e3f51
+checksum=70dc4bf2aa74981c79e15fd298d998e05a92eba4811f1ad5c9f1f4de37737acc
From ece4ac68404dec4e2bc9132e6a807fb80c023316 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 23:27:49 -0500
Subject: [PATCH 395/634] lxc: update to 4.0.6.
---
srcpkgs/lxc/patches/fix-config-parsing.patch | 169 -------------------
srcpkgs/lxc/patches/fix-rootfs-mount.patch | 27 ---
srcpkgs/lxc/template | 11 +-
3 files changed, 5 insertions(+), 202 deletions(-)
delete mode 100644 srcpkgs/lxc/patches/fix-config-parsing.patch
delete mode 100644 srcpkgs/lxc/patches/fix-rootfs-mount.patch
diff --git a/srcpkgs/lxc/patches/fix-config-parsing.patch b/srcpkgs/lxc/patches/fix-config-parsing.patch
deleted file mode 100644
index cbb435c3e4a..00000000000
--- a/srcpkgs/lxc/patches/fix-config-parsing.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 26dffd825842edf019bc17da24a6809ed51c048c Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Mon, 16 Nov 2020 12:18:14 +0100
-Subject: [PATCH] parse: rework config parsing routine
-
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- src/lxc/file_utils.c | 7 +++++--
- src/lxc/file_utils.h | 6 +++++-
- src/lxc/parse.c | 49 ++++++++++++++++++++++++--------------------
- 3 files changed, 37 insertions(+), 25 deletions(-)
-
-diff --git src/lxc/file_utils.c src/lxc/file_utils.c
-index fafaba354c..3b4bffb399 100644
---- src/lxc/file_utils.c
-+++ src/lxc/file_utils.c
-@@ -382,8 +382,10 @@ ssize_t lxc_sendfile_nointr(int out_fd, int in_fd, off_t *offset, size_t count)
- return ret;
- }
-
--int fd_to_fd(int from, int to)
-+ssize_t __fd_to_fd(int from, int to)
- {
-+ ssize_t total_bytes = 0;
-+
- for (;;) {
- uint8_t buf[PATH_MAX];
- uint8_t *p = buf;
-@@ -407,9 +409,10 @@ int fd_to_fd(int from, int to)
- bytes_to_write -= bytes_written;
- p += bytes_written;
- } while (bytes_to_write > 0);
-+ total_bytes += bytes_to_write;
- }
-
-- return 0;
-+ return total_bytes;
- }
-
- int fd_to_buf(int fd, char **buf, size_t *length)
-diff --git src/lxc/file_utils.h src/lxc/file_utils.h
-index ea9570dd18..11acdb3a7b 100644
---- src/lxc/file_utils.h
-+++ src/lxc/file_utils.h
-@@ -68,7 +68,11 @@ __hidden extern FILE *fopen_cloexec(const char *path, const char *mode);
- __hidden extern ssize_t lxc_sendfile_nointr(int out_fd, int in_fd, off_t *offset, size_t count);
- __hidden extern char *file_to_buf(const char *path, size_t *length);
- __hidden extern int fd_to_buf(int fd, char **buf, size_t *length);
--__hidden extern int fd_to_fd(int from, int to);
-+__hidden extern ssize_t __fd_to_fd(int from, int to);
-+static inline int fd_to_fd(int from, int to)
-+{
-+ return __fd_to_fd(from, to) >= 0;
-+}
- __hidden extern int lxc_open_dirfd(const char *dir);
- __hidden extern FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer);
- __hidden extern FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffer);
-diff --git src/lxc/parse.c src/lxc/parse.c
-index 291bf3efc1..5a5b853458 100644
---- src/lxc/parse.c
-+++ src/lxc/parse.c
-@@ -5,6 +5,7 @@
- #endif
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -50,11 +51,12 @@ int lxc_strmunmap(void *addr, size_t length)
-
- int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *data)
- {
-- int saved_errno;
-- ssize_t ret = -1, bytes_sent;
-- char *line;
-- int fd = -1, memfd = -1;
-+ __do_close int fd = -EBADF, memfd = -EBADF;
-+ ssize_t ret = -1;
- char *buf = NULL;
-+ struct stat st = {};
-+ ssize_t bytes;
-+ char *line;
-
- memfd = memfd_create(".lxc_config_file", MFD_CLOEXEC);
- if (memfd < 0) {
-@@ -65,8 +67,7 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- goto on_error;
- }
-
-- TRACE("Failed to create in-memory file. Falling back to "
-- "temporary file");
-+ TRACE("Failed to create in-memory file. Falling back to temporary file");
- memfd = lxc_make_tmpfile(template, true);
- if (memfd < 0) {
- SYSERROR("Failed to create temporary file \"%s\"", template);
-@@ -80,10 +81,21 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- goto on_error;
- }
-
-- /* sendfile() handles up to 2GB. No config file should be that big. */
-- bytes_sent = lxc_sendfile_nointr(memfd, fd, NULL, LXC_SENDFILE_MAX);
-- if (bytes_sent < 0) {
-- SYSERROR("Failed to sendfile \"%s\"", file);
-+ ret = fstat(fd, &st);
-+ if (ret) {
-+ SYSERROR("Failed to stat file \"%s\"", file);
-+ goto on_error;
-+ }
-+
-+ if (st.st_size > INT_MAX) {
-+ SYSERROR("Excessively large config file \"%s\"", file);
-+ goto on_error;
-+ }
-+
-+
-+ bytes = __fd_to_fd(fd, memfd);
-+ if (bytes < 0) {
-+ SYSERROR("Failed to copy config file \"%s\"", file);
- goto on_error;
- }
-
-@@ -92,7 +104,7 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- SYSERROR("Failed to append zero byte");
- goto on_error;
- }
-- bytes_sent++;
-+ bytes++;
-
- ret = lseek(memfd, 0, SEEK_SET);
- if (ret < 0) {
-@@ -101,8 +113,7 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- }
-
- ret = -1;
-- buf = mmap(NULL, bytes_sent, PROT_READ | PROT_WRITE,
-- MAP_SHARED | MAP_POPULATE, memfd, 0);
-+ buf = mmap(NULL, bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_POPULATE, memfd, 0);
- if (buf == MAP_FAILED) {
- buf = NULL;
- SYSERROR("Failed to mmap");
-@@ -117,24 +128,18 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
- * error.
- */
- if (ret < 0)
-- ERROR("Failed to parse config file \"%s\" at "
-- "line \"%s\"", file, line);
-+ ERROR("Failed to parse config file \"%s\" at line \"%s\"",
-+ file, line);
- break;
- }
- }
-
- on_error:
-- saved_errno = errno;
-- if (fd >= 0)
-- close(fd);
-- if (memfd >= 0)
-- close(memfd);
-- if (buf && munmap(buf, bytes_sent)) {
-+ if (buf && munmap(buf, bytes)) {
- SYSERROR("Failed to unmap");
- if (ret == 0)
- ret = -1;
- }
-- errno = saved_errno;
-
- return ret;
- }
diff --git a/srcpkgs/lxc/patches/fix-rootfs-mount.patch b/srcpkgs/lxc/patches/fix-rootfs-mount.patch
deleted file mode 100644
index f4465b6277e..00000000000
--- a/srcpkgs/lxc/patches/fix-rootfs-mount.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 26ea5533c941baee14923dfc3edfb9c91666d245 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Mon, 14 Dec 2020 17:52:44 +0100
-Subject: [PATCH] conf: fix block-device based rootfs mounting
-
-Fixes: #3598
-Cc: stable-4.0
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- src/lxc/conf.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git src/lxc/conf.c src/lxc/conf.c
-index 9f631e0c23..27f9706687 100644
---- src/lxc/conf.c
-+++ src/lxc/conf.c
-@@ -3135,6 +3135,10 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
- if (ret < 0)
- return log_error(-1, "Failed to bind mount container / onto itself");
-
-+ conf->rootfs.mntpt_fd = openat(-EBADF, path, O_RDONLY | O_CLOEXEC | O_DIRECTORY | O_PATH | O_NOCTTY);
-+ if (conf->rootfs.mntpt_fd < 0)
-+ return log_error_errno(-errno, errno, "Failed to open file descriptor for container rootfs");
-+
- return log_trace(0, "Bind mounted container / onto itself");
- }
-
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 03fbeb400f5..4e74c364b8d 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,9 +1,7 @@
# Template file for 'lxc'
-_desc="Linux Containers"
-
pkgname=lxc
-version=4.0.5
-revision=3
+version=4.0.6
+revision=1
build_style=gnu-configure
configure_args="--enable-doc --enable-seccomp
--enable-capabilities --enable-apparmor --with-distro=none
@@ -11,12 +9,13 @@ configure_args="--enable-doc --enable-seccomp
hostmakedepends="automake libtool pkg-config docbook2x"
makedepends="libcap-devel libseccomp-devel gnutls-devel libapparmor-devel"
depends="xz wget gnupg"
+_desc="Linux Containers"
short_desc="${_desc} - utilities"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
-homepage="https://linuxcontainers.org"
license="LGPL-2.1-or-later"
+homepage="https://linuxcontainers.org"
distfiles="https://linuxcontainers.org/downloads/lxc-${version}.tar.gz"
-checksum=af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4
+checksum=9165dabc0bb6ef7f2fda2009aee90b20fbefe77ed8008347e9f06048eba1e463
conf_files="/etc/lxc/default.conf"
make_dirs="
From 45bfca29fdf3ef7c7b363b03a834c8afd9492ef0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 00:42:31 +0100
Subject: [PATCH 396/634] hooks/pre-pkg/03-rewrite-python-shebang.sh: use grep
-r instead of find.
This saves us one sed execution per file in the destdir, resulting
in a major speedup.
Grep will only consider text files and only look at the first line.
---
common/hooks/pre-pkg/03-rewrite-python-shebang.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index 22f506155a0..60e7f61975b 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -16,7 +16,7 @@ hook() {
default_shebang="#!/usr/bin/python${pyver%.*}"
fi
- find "${PKGDESTDIR}" -type f -print0 | \
+ grep -rlIZ -m1 '^#!.*python' "${PKGDESTDIR}" |
while IFS= read -r -d '' file; do
[ ! -s "$file" ] && continue
From ae5702539f22d533b09528a6d54b4b980f86ea79 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 01:18:07 +0100
Subject: [PATCH 397/634] hooks/post-install/06-strip-and-debug-pkgs.sh: speed
up.
Only run file once for each file in the destdir, only double-check
when we are about to strip the ELF files.
---
.../hooks/post-install/06-strip-and-debug-pkgs.sh | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index b59dde5ab3c..52591c38b31 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -70,10 +70,6 @@ hook() {
continue
fi
- if [[ $(file -b "$f") =~ "no machine" ]]; then
- continue
- fi
-
fname=${f##*/}
for x in ${nostrip_files}; do
if [ "$x" = "$fname" ]; then
@@ -119,6 +115,13 @@ hook() {
fi
;;
application/x-sharedlib*|application/x-pie-executable*)
+ local type="$(file -b "$f")"
+ if [[ $type =~ "no machine" ]]; then
+ # using ELF as a container format (e.g. guile)
+ echo " Ignoring ELF file without machine set: ${f#$PKGDESTDIR}"
+ continue
+ fi
+
chmod +w "$f"
# shared library
make_debug "$f"
@@ -127,7 +130,7 @@ hook() {
msg_red "$pkgver: failed to strip ${f#$PKGDESTDIR}\n"
return 1
fi
- if [[ $(file $f) =~ "interpreter " ]]; then
+ if [[ $type =~ "interpreter " ]]; then
echo " Stripped position-independent executable: ${f#$PKGDESTDIR}"
else
echo " Stripped library: ${f#$PKGDESTDIR}"
From a6688d874587db1191572b6eba88fd792205ff31 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Jan 2021 15:19:31 +0100
Subject: [PATCH 398/634] linux5.10: update to 5.10.12.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index e5930f6f0bb..ecf5eeed701 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.11
+version=5.10.12
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=02ef2b56b00fc5145701c603a5235e1265772e40d488a936b27ba65fe78e710f
+checksum=1d454f2817ab4f34cf313ea680ab75e20f79c6431b3bd3ea3bcd39353030c4aa
python_version=3
patch_args="-Np1"
From bf612a7980d70c2351f99097b82fa298a74a57c5 Mon Sep 17 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, 30 Jan 2021 22:16:32 +0700
Subject: [PATCH 399/634] qmltermwidget: fix ftbfs
---
srcpkgs/qmltermwidget/patches/iswspace.patch | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/qmltermwidget/patches/iswspace.patch
diff --git a/srcpkgs/qmltermwidget/patches/iswspace.patch b/srcpkgs/qmltermwidget/patches/iswspace.patch
new file mode 100644
index 00000000000..89695c53b52
--- /dev/null
+++ b/srcpkgs/qmltermwidget/patches/iswspace.patch
@@ -0,0 +1,13 @@
+Index: lib/TerminalCharacterDecoder.cpp
+===================================================================
+--- lib/TerminalCharacterDecoder.cpp.orig
++++ lib/TerminalCharacterDecoder.cpp
+@@ -22,6 +22,8 @@
+ // Own
+ #include "TerminalCharacterDecoder.h"
+
++#include <cwctype>
++
+ // Qt
+ #include <QTextStream>
+
From 3e7f935b742953b387c733270f8856aaa814f38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 30 Jan 2021 19:00:04 +0100
Subject: [PATCH 400/634] qmltermwidget: enable cross
There is no problem with wrong install paths (anymore).
---
srcpkgs/qmltermwidget/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/qmltermwidget/template b/srcpkgs/qmltermwidget/template
index 734f812435f..60de10dfef8 100644
--- a/srcpkgs/qmltermwidget/template
+++ b/srcpkgs/qmltermwidget/template
@@ -11,5 +11,3 @@ license="GPL-2.0-or-later"
homepage="https://github.com/Swordfish90/qmltermwidget"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=23e19eedb59d6fe3e37ecc06872f54befd94384946926e009c42c4b39914cfe2
-nocross=yes
-# some things do get wrongly installed into $DESTDOR/$XBPS_CROSS_BASE
From 36e530d126bbac464fae8979621cf0e6cb2bb74d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 19:39:42 +0100
Subject: [PATCH 401/634] linux5.10: fix dcn30 ppc64 patch on musl
since musl uses 64-bit ldbl, this will trigger the soft vs hard
float linker nonsense, so apply the same hack as for renoir
---
.../patches/amdgpu-dcn30-ppc64.patch | 30 ++++++++++++++++---
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
index a72cdfea781..6f5688d7530 100644
--- a/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
+++ b/srcpkgs/linux5.10/patches/amdgpu-dcn30-ppc64.patch
@@ -1,12 +1,13 @@
-From 3a75ebe236580073d77ad69730fc1d8980e130c2 Mon Sep 17 00:00:00 2001
+From 295ba06fc80af54595c604ca6bab5f3e9c9ef154 Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 22:25:29 +0100
Subject: [PATCH] amd/display: enable dcn30 for ppc64
---
- drivers/gpu/drm/amd/display/Kconfig | 2 +-
- drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ drivers/gpu/drm/amd/display/Kconfig | 2 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 ++++++++++
+ drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 ++
+ 3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
index 3c410d2..a749cc7 100644
@@ -21,6 +22,27 @@ index 3c410d2..a749cc7 100644
depends on DRM_AMD_DC_DCN
help
Choose this option if you want to have
+diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
+index 52b1ce7..adf3919 100644
+--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
+@@ -114,6 +114,16 @@ ifdef CONFIG_DRM_AMD_DC_DCN3_0
+ ###############################################################################
+ CLK_MGR_DCN30 = dcn30_clk_mgr.o dcn30_clk_mgr_smu_msg.o
+
++# see above
++# technically it should not matter that this file is soft-float since all it
++# does is read doubles from a struct and write them somewhere else; this is not
++# passing between hard-float and soft-float APIs via registers (which would be
++# problematic because of different calling convention), and the memory layout
++# is always the same (IEEE double precision) so the error is probably harmless
++ifdef CONFIG_PPC64
++CFLAGS_$(AMDDALPATH)/dc/clk_mgr/dcn30/dcn30_clk_mgr.o := $(call cc-option,-mno-gnu-attribute)
++endif
++
+ AMD_DAL_CLK_MGR_DCN30 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn30/,$(CLK_MGR_DCN30))
+
+ AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN30)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile b/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
index bd2a068..248c271 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn30/Makefile
From 6bb0ca86cfa5b42d3c286b8b7173c47864044754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 08:34:46 +0100
Subject: [PATCH 402/634] librpcsecgss: remove package
broke with glibc-2.32
does not compile with libtirpc
---
common/shlibs | 1 -
srcpkgs/librpcsecgss-devel | 1 -
srcpkgs/librpcsecgss/template | 32 -------------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 34 deletions(-)
delete mode 120000 srcpkgs/librpcsecgss-devel
delete mode 100644 srcpkgs/librpcsecgss/template
diff --git a/common/shlibs b/common/shlibs
index 75075c2d259..2f298ff9ad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1033,7 +1033,6 @@ libobt.so.2 libopenbox-3.5.2_1
libobrender.so.32 libopenbox-3.6.1_1
libgssglue.so.1 libgssglue-0.3_1
libtirpc.so.3 libtirpc-1.0.2_1
-librpcsecgss.so.3 librpcsecgss-0.19_1
libnfsidmap.so.1 libnfsidmap-2.4.3_2
libbind9.so.1600 bind-libs-9.16.2_1
libdns.so.1607 bind-libs-9.16.7_1
diff --git a/srcpkgs/librpcsecgss-devel b/srcpkgs/librpcsecgss-devel
deleted file mode 120000
index 328b419146d..00000000000
--- a/srcpkgs/librpcsecgss-devel
+++ /dev/null
@@ -1 +0,0 @@
-librpcsecgss
\ No newline at end of file
diff --git a/srcpkgs/librpcsecgss/template b/srcpkgs/librpcsecgss/template
deleted file mode 100644
index d20446cb3ce..00000000000
--- a/srcpkgs/librpcsecgss/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'librpcsecgss'
-pkgname=librpcsecgss
-version=0.19
-revision=5
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libgssglue-devel"
-short_desc="Library for RPCSECGSS support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.citi.umich.edu/projects/nfsv4/linux/"
-distfiles="$homepage/$pkgname/$pkgname-$version.tar.gz"
-checksum=0cafb86b67e5eb4c89e8abaaad9165298946bc164d258e8925fc6dc1fa913abd
-
-case "$XBPS_TARGET_LIBC" in
- musl) broken="rpc/rpc.h header is not available on musl"
-esac
-
-post_install() {
- vlicense COPYING
-}
-
-librpcsecgss-devel_package() {
- depends="libgssglue-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30b4ac8b2bd..0a16d53a3c0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -140,6 +140,8 @@ replaces="
libdbusmenu-qt<=0.9.2_4
libgksu<=2.0.12_5
libqzeitgeist<=0.8.0_6
+ librpcsecgss<=0.19_6
+ librpcsecgss-devel<=0.19_6
livewallpaper<=0.5.0_2
llvm3.9<=3.9.1_5
ls++-git<=20140919_3
From 6410d1f3d43c41b57a7d6c3c733625e8d9fe622d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 20:10:08 +0100
Subject: [PATCH 403/634] rtmpdump: add gnutls build_option
rtmpdump doesn't build with OpenSSL-1.1
---
srcpkgs/rtmpdump/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index eeeff44012e..f98160d7f18 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -4,7 +4,7 @@ version=2.4.20161210
revision=8
_patchlevel=${version##*.}
create_wrksrc=yes
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
short_desc="Toolkit for RTMP streams"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2, LGPL-2.1"
@@ -17,8 +17,10 @@ case "$XBPS_TARGET_MACHINE" in
*-musl) CFLAGS+=" -D__LINUX_NETFILTER_H"
esac
+build_options="gnutls"
+
do_build() {
- make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs}
+ make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}
}
do_install() {
vmkdir usr/lib
From ffa6664dc7edaae636eab61572b76a1fe2d94c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 30 Jan 2021 22:42:19 +0100
Subject: [PATCH 404/634] openbazaar: fix ftbfs
Move binaries to usr/lib/openbazaar and create symlinks in usr/bin
---
srcpkgs/openbazaar/template | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/openbazaar/template b/srcpkgs/openbazaar/template
index 79df50f88fa..00103d221bf 100644
--- a/srcpkgs/openbazaar/template
+++ b/srcpkgs/openbazaar/template
@@ -1,32 +1,42 @@
# Template file for 'openbazaar'
pkgname=openbazaar
version=1.1.13
-revision=1
+revision=2
+archs="i686 x86_64"
build_style=fetch
+depends="nodejs"
short_desc="P2P Distributed marketplace"
maintainer="ananteris <ananteris@protonmail.ch>"
-archs="i686 x86_64"
-depends="nodejs"
license="MIT"
-nostrip=yes
homepage="http://openbazaar.org"
+python_version=3
+nostrip=yes
repository="nonfree"
-if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then
- _debarch=amd64
- checksum=34118eecedd15d89052b8cc6d08fb789adba5788d43019ea5c89e52f1f07064a
-else
- _debarch=i386
- checksum=87c73589aebdb78455e69fe1ccc058440d0ae662404e9ef7d4988e6c574e2add
-fi
+case "${XBPS_TARGET_MACHINE}" in
+ x86_64) _debarch=amd64
+ checksum=34118eecedd15d89052b8cc6d08fb789adba5788d43019ea5c89e52f1f07064a
+ ;;
+ i686) _debarch=i386
+ checksum=87c73589aebdb78455e69fe1ccc058440d0ae662404e9ef7d4988e6c574e2add
+ ;;
+esac
distfiles="https://github.com/OpenBazaar/OpenBazaar-Installer/releases/download/v${version}/${pkgname}_${version}_${_debarch}.deb"
do_install() {
ar p ${pkgname}_${version}_${_debarch}.deb data.tar.xz | bsdtar xvf - -C ${DESTDIR}
vlicense ${DESTDIR}/usr/share/openbazaar/LICENSE
- vbin ${DESTDIR}/usr/share/openbazaar/resources/OpenBazaar-Server/openbazaard
- vconf ${DESTDIR}/usr/share/openbazaar/resources/OpenBazaar-Server/ob.cfg
+ vmkdir usr/lib/openbazaar/resources
+ mv -v ${DESTDIR}/usr/share/openbazaar/resources/OpenBazaar-Server \
+ ${DESTDIR}/usr/lib/openbazaar/resources
+ ln -frsv ${DESTDIR}/usr/lib/openbazaar/resources/OpenBazaar-Server/openbazaard \
+ ${DESTDIR}/usr/bin/
+ vconf ${DESTDIR}/usr/lib/openbazaar/resources/OpenBazaar-Server/ob.cfg
+ mv -v ${DESTDIR}/usr/share/openbazaar/openbazaar \
+ ${DESTDIR}/usr/lib/openbazaar
+ ln -frsv ${DESTDIR}/usr/lib/openbazaar/openbazaar \
+ ${DESTDIR}/usr/bin/
vdoc ${FILESDIR}/void_service.EXAMPLE
find ${DESTDIR}/usr/share/openbazaar -iname "*.so" -print0 | while read -d "" lib; do
From 257db74010f57fa762e1f4adba3ea4446e52a6c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 30 Jan 2021 17:54:15 -0500
Subject: [PATCH 405/634] python-pip: split package
New package: python3-pip-21.0.1
---
srcpkgs/python-pip/template | 20 ++++------------
srcpkgs/python-pip/update | 3 ++-
srcpkgs/python3-pip | 1 -
.../patches/no-versioned-pip.patch | 13 +++++++++++
srcpkgs/python3-pip/template | 23 +++++++++++++++++++
5 files changed, 43 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-pip
create mode 100644 srcpkgs/python3-pip/patches/no-versioned-pip.patch
create mode 100644 srcpkgs/python3-pip/template
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index 1fd9fce6e69..096aa7b63b2 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -1,10 +1,10 @@
# Template file for 'python-pip'
pkgname=python-pip
-version=20.3.3
+version=20.3.4
revision=1
wrksrc="pip-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-setuptools"
short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -12,19 +12,9 @@ license="MIT"
homepage="https://pip.pypa.io/"
changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=79c1ac8a9dccbec8752761cb5a2df833224263ca661477a2a9ed03ddf4e0e3ba
+checksum=6773934e5f5fc3eaa8c5a44949b5b924fc122daa0a8aa9f80c835b4ca2a543fc
post_install() {
vlicense LICENSE.txt
-}
-
-python3-pip_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/pip3
- mv ${PKGDESTDIR}/usr/bin/pip{3,}
- vmove ${py3_lib}
- vlicense LICENSE.txt
- }
+ mv ${DESTDIR}/usr/bin/pip{,2}
}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python-pip/update
index 724819677ce..88ebcc780cf 100644
--- a/srcpkgs/python-pip/update
+++ b/srcpkgs/python-pip/update
@@ -1 +1,2 @@
-pattern='pip-\K[0-9.]+(?=.tar.gz)'
+# Support for Python 2 was dropped in pip >= 21
+pattern='pip-\K20\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
deleted file mode 120000
index 9de2412ef67..00000000000
--- a/srcpkgs/python3-pip
+++ /dev/null
@@ -1 +0,0 @@
-python-pip
\ No newline at end of file
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
new file mode 100644
index 00000000000..b3a50bb2c13
--- /dev/null
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -0,0 +1,13 @@
+--- setup.py.orig 2021-01-30 17:47:39.874134606 -0500
++++ setup.py 2021-01-30 17:47:54.435139352 -0500
+@@ -74,10 +74,6 @@
+ entry_points={
+ "console_scripts": [
+ "pip=pip._internal.cli.main:main",
+- "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+- "pip{}.{}=pip._internal.cli.main:main".format(
+- *sys.version_info[:2]
+- ),
+ ],
+ },
+
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
new file mode 100644
index 00000000000..d0a3a1d7516
--- /dev/null
+++ b/srcpkgs/python3-pip/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pip'
+pkgname=python3-pip
+version=21.0.1
+revision=1
+wrksrc="pip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=99bbde183ec5ec037318e774b0d8ae0a64352fe53b2c7fd630be1d07e94f41e5
+
+do_check() {
+ : tests have unpackaged dependencies
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 460049a95735560acde1d417c74f08c6c5d8e526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 22:37:03 -0300
Subject: [PATCH 406/634] hooktftp: remove bzr from hostmakedepends.
Build system doesn't use it.
---
srcpkgs/hooktftp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index e1e669154b4..2cba14aec60 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -5,7 +5,7 @@ revision=1
build_style=go
go_import_path="github.com/tftp-go-team/hooktftp"
go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"
-hostmakedepends="bzr git"
+hostmakedepends="git"
short_desc="Hook based tftp server"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
From 9ddc5d76977bc32843f17323a5bc036cdac5c2a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 22:35:05 -0300
Subject: [PATCH 407/634] brz: remove package.
No longer works with python 2.7. Has been replaced by breezy on all
distros.
---
srcpkgs/bzr/template | 19 -------------------
srcpkgs/bzr/update | 1 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/bzr/template
delete mode 100644 srcpkgs/bzr/update
diff --git a/srcpkgs/bzr/template b/srcpkgs/bzr/template
deleted file mode 100644
index 72ac30eae6e..00000000000
--- a/srcpkgs/bzr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'bzr'
-pkgname=bzr
-version=2.7.0
-revision=1
-build_style=python2-module
-hostmakedepends="python-Cython"
-makedepends="zlib-devel python-devel"
-depends="ca-certificates"
-pycompile_module="bzrlib"
-short_desc="Distributed version control system that Just Works"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://bazaar.canonical.com"
-distfiles="http://launchpad.net/bzr/${version%.*}/$version/+download/bzr-$version.tar.gz"
-checksum=0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3
-
-pre_install() {
- sed -i -e "s|man/man1|share/man/man1|" setup.py
-}
diff --git a/srcpkgs/bzr/update b/srcpkgs/bzr/update
deleted file mode 100644
index e9b0a0a5ea4..00000000000
--- a/srcpkgs/bzr/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0a16d53a3c0..5f5bfe1dd9f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -14,6 +14,7 @@ replaces="
arm-mem-git<=20131108_2
arptables<=0.0.4_3
bokken<=1.8_3
+ bzr<=2.7.0_1
caja-gksu<=1.20.2_2
california<=0.4.0_4
couchdb<=1.7.1_2
From fcaa781b42f6a9688d8e55fc872280db9a97244b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 22:36:25 -0300
Subject: [PATCH 408/634] bzrtools: remove package.
bzr no longer works.
---
srcpkgs/bzrtools/template | 15 ---------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 15 deletions(-)
delete mode 100644 srcpkgs/bzrtools/template
diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template
deleted file mode 100644
index 05492b1b5e2..00000000000
--- a/srcpkgs/bzrtools/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'bzrtools'
-pkgname=bzrtools
-version=2.6.0
-revision=4
-wrksrc=bzrtools
-build_style=python2-module
-hostmakedepends="python"
-makedepends="python bzr"
-depends="${makedepends}"
-short_desc="Plugin providing a collection of utilities for bzr"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://bazaar-vcs.org/BzrTools"
-distfiles="http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"
-checksum=8b17fbba61dafc8dbefe1917a2ce084a8adc7650dee60add340615270dfb7f58
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5f5bfe1dd9f..b8a4e651ac8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -15,6 +15,7 @@ replaces="
arptables<=0.0.4_3
bokken<=1.8_3
bzr<=2.7.0_1
+ bzrtools<=2.6.0_4
caja-gksu<=1.20.2_2
california<=0.4.0_4
couchdb<=1.7.1_2
From d76bbc5557fffa9ebea5ac7d34d8f56745faac27 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 22:44:17 +0200
Subject: [PATCH 409/634] scribus: update to 1.5.5.
---
srcpkgs/scribus/patches/fix-musl.patch | 31 +++++++++++++++++---------
srcpkgs/scribus/template | 22 ++++++++----------
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/scribus/patches/fix-musl.patch b/srcpkgs/scribus/patches/fix-musl.patch
index 6df9a2da2b4..36bb71e62a9 100644
--- a/srcpkgs/scribus/patches/fix-musl.patch
+++ b/srcpkgs/scribus/patches/fix-musl.patch
@@ -1,20 +1,31 @@
---- scribus/util.cpp.orig 2016-01-11 15:35:18.171968184 +0100
-+++ scribus/util.cpp 2016-01-11 15:35:53.600967308 +0100
-@@ -37,7 +37,7 @@ for which a new license (GPL+exception)
+--- scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200
++++ - 2019-09-17 22:29:18.301884583 +0200
+@@ -40,7 +40,7 @@
- #include <signal.h>
+ #include <csignal>
--#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
-+#ifdef __GLIBC__
+-#if !defined(_WIN32) && !defined(Q_OS_MAC)
++#if defined(__GLIBC__)
#include <execinfo.h>
#include <cxxabi.h>
#endif
-@@ -947,7 +947,7 @@ void getDashArray(int dashtype, double l
+--- scribus/util_debug.cpp 2019-07-31 00:35:07.000000000 +0200
++++ - 2019-09-17 22:30:10.159216480 +0200
+@@ -24,7 +24,7 @@
+ #include <QDateTime>
+ #include <QtGlobal>
+
+-#if !defined(_WIN32) && !defined(Q_OS_MAC)
++#if defined(__GLIBC__)
+ #include <execinfo.h>
+ #include <cxxabi.h>
+ #endif
+@@ -54,7 +54,7 @@
*/
void printBacktrace ( int nFrames )
{
--#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD) && !defined(Q_OS_HAIKU)
-+#ifdef __GLIBC__
+-#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD)
++#if defined(__GLIBC__)
void ** trace = new void*[nFrames + 1];
- char **messages = ( char ** ) NULL;
+ char **messages = ( char ** ) nullptr;
int i, trace_size = 0;
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index c96ce332eb3..868ec55590f 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,26 +1,22 @@
# Template file for 'scribus'
pkgname=scribus
-version=1.4.8
+version=1.5.6.1
revision=1
build_style=cmake
-hostmakedepends="pkg-config qt-devel"
-makedepends="qt-devel zlib-devel cairo-devel lcms2-devel cups-devel libxml2-devel
- hyphen-devel ghostscript-devel boost-devel python-devel"
+configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
+makedepends="qt5-devel qt5-tools-devel zlib-devel cairo-devel lcms2-devel
+ cups-devel libxml2-devel hyphen-devel ghostscript-devel boost-devel
+ hunspell-devel poppler-cpp-devel python3-devel harfbuzz-devel"
depends="ghostscript"
short_desc="Open Source DTP (Desktop Publishing) application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://scribus.net"
-distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz"
-checksum=22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
-python_version=2 #unverified
+distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
+checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab
+python_version=3
-nocross="https://travis-ci.org/void-linux/void-packages/jobs/504239118"
-
-pre_configure() {
- sed -i 's#^Icon=scribus#^Icon=/usr/share/scribus/icons/scribus.png#' scribus.desktop
-}
post_install() {
- vinstall scribus.desktop 644 usr/share/applications
rm -rf ${DESTDIR}/usr/include
}
From 225b5668fb2838e1527b131c3020313bd06fff52 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH 410/634] snapper: update to 0.8.15
---
.../patches/0001-disable-locale-tests.patch | 31 ++++
.../snapper/patches/0001-musl-sterror_r.patch | 26 ---
.../0002-backport-equal-date-test.patch | 164 ++++++++++++++++++
.../snapper/patches/0002-musl-mktime.patch | 26 ---
.../0003-backport-fix-jsonc-linkage.patch | 19 ++
.../patches/0004-musl-stdout_stderr.patch | 26 ---
srcpkgs/snapper/patches/musl_u_int-type.patch | 27 ---
srcpkgs/snapper/template | 22 +--
8 files changed, 223 insertions(+), 118 deletions(-)
create mode 100644 srcpkgs/snapper/patches/0001-disable-locale-tests.patch
delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
create mode 100644 srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
create mode 100644 srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch
diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
new file mode 100644
index 00000000000..05e589dbfc5
--- /dev/null
+++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
@@ -0,0 +1,31 @@
+These 4 tests fail with error:
+std::runtime_error: locale::facet::_S_create_c_locale name not valid
+
+diff --git testsuite/Makefile.am testsuite/Makefile.am
+index d7e30b8..001f834 100644
+--- testsuite/Makefile.am
++++ testsuite/Makefile.am
+@@ -7,8 +7,8 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
+
+ check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \
+- equal-date.test dbus-escape.test cmp-lt.test humanstring.test \
+- table.test table-formatter.test csv-formatter.test json-formatter.test \
++ equal-date.test dbus-escape.test \
++ csv-formatter.test json-formatter.test \
+ getopts.test
+
+ if ENABLE_BTRFS_QUOTA
+@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
+
+ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+-humanstring_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+-
+-table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+-
+-table_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+-
+ csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
diff --git a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
- string
- stringerror(int errnum)
- {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- char buf1[100];
- if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- return string(buf1);
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
new file mode 100644
index 00000000000..688ab7e1f27
--- /dev/null
+++ b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
@@ -0,0 +1,164 @@
+diff --git package/snapper.changes package/snapper.changes
+index 9235de3..5570cf1 100644
+--- package/snapper.changes
++++ package/snapper.changes
+@@ -1,3 +1,8 @@
++-------------------------------------------------------------------
++Mon Jan 25 11:29:45 CET 2021 - aschnell@suse.com
++
++- fixed testsuite for equal-date (gh#openSUSE/snapper#526)
++
+ -------------------------------------------------------------------
+ Thu Dec 17 12:20:59 CET 2020 - aschnell@suse.com
+
+diff --git testsuite/Makefile.am testsuite/Makefile.am
+index d7e30b8..cfd1002 100644
+--- testsuite/Makefile.am
++++ testsuite/Makefile.am
+@@ -9,7 +9,7 @@ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
+ check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \
+ equal-date.test dbus-escape.test \
+ csv-formatter.test json-formatter.test \
+- getopts.test
++ getopts.test scan-datetime.test
+
+ if ENABLE_BTRFS_QUOTA
+ check_PROGRAMS += qgroup1.test
+@@ -27,6 +27,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
+
+ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
++scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
++
+ csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
+diff --git testsuite/equal-date.cc testsuite/equal-date.cc
+index 42e00d8..8d8eda8 100644
+--- testsuite/equal-date.cc
++++ testsuite/equal-date.cc
+@@ -5,18 +5,25 @@
+ #include <boost/test/unit_test.hpp>
+
+ #include "../client/utils/equal-date.h"
++#include "../snapper/AppUtil.h"
++
++using namespace snapper;
+
+
+ bool
+ equal_week(const char* s1, const char* s2)
+ {
++ // use interim time_t since strptime on musl does not set tm_yday
++
++ time_t t1 = scan_datetime(s1, true);
+ struct tm tmp1;
+ memset(&tmp1, 0, sizeof(tmp1));
+- strptime(s1, "%Y-%m-%d", &tmp1);
++ gmtime_r(&t1, &tmp1);
+
++ time_t t2 = scan_datetime(s2, true);
+ struct tm tmp2;
+ memset(&tmp2, 0, sizeof(tmp2));
+- strptime(s2, "%Y-%m-%d", &tmp2);
++ gmtime_r(&t2, &tmp2);
+
+ return equal_week(tmp1, tmp2);
+ }
+@@ -25,46 +32,46 @@ equal_week(const char* s1, const char* s2)
+ BOOST_AUTO_TEST_CASE(test1)
+ {
+ // 2012 is a leap year
+- BOOST_CHECK(equal_week("2011-12-31", "2012-01-01"));
+- BOOST_CHECK(equal_week("2012-01-01", "2011-12-31"));
++ BOOST_CHECK(equal_week("2011-12-31 00:00:00", "2012-01-01 00:00:00"));
++ BOOST_CHECK(equal_week("2012-01-01 00:00:00", "2011-12-31 00:00:00"));
+ }
+
+
+ BOOST_AUTO_TEST_CASE(test2)
+ {
+ // 2012 is a leap year
+- BOOST_CHECK(equal_week("2012-12-31", "2013-01-01"));
+- BOOST_CHECK(equal_week("2013-01-01", "2012-12-31"));
++ BOOST_CHECK(equal_week("2012-12-31 00:00:00", "2013-01-01 00:00:00"));
++ BOOST_CHECK(equal_week("2013-01-01 00:00:00", "2012-12-31 00:00:00"));
+ }
+
+
+ BOOST_AUTO_TEST_CASE(test3)
+ {
+ // Saturday and Sunday
+- BOOST_CHECK(equal_week("2014-01-04", "2014-01-05"));
+- BOOST_CHECK(equal_week("2014-01-05", "2014-01-04"));
++ BOOST_CHECK(equal_week("2014-01-04 00:00:00", "2014-01-05 00:00:00"));
++ BOOST_CHECK(equal_week("2014-01-05 00:00:00", "2014-01-04 00:00:00"));
+
+ // Sunday and Monday
+- BOOST_CHECK(!equal_week("2014-01-05", "2014-01-06"));
+- BOOST_CHECK(!equal_week("2014-01-06", "2014-01-05"));
++ BOOST_CHECK(!equal_week("2014-01-05 00:00:00", "2014-01-06 00:00:00"));
++ BOOST_CHECK(!equal_week("2014-01-06 00:00:00", "2014-01-05 00:00:00"));
+
+ // Monday and Tuesday
+- BOOST_CHECK(equal_week("2014-01-06", "2014-01-07"));
+- BOOST_CHECK(equal_week("2014-01-07", "2014-01-06"));
++ BOOST_CHECK(equal_week("2014-01-06 00:00:00", "2014-01-07 00:00:00"));
++ BOOST_CHECK(equal_week("2014-01-07 00:00:00", "2014-01-06 00:00:00"));
+ }
+
+
+ BOOST_AUTO_TEST_CASE(test4)
+ {
+ // 2014-12-31 is a Wednesday, 2015-01-01 is a Thursday
+- BOOST_CHECK(equal_week("2014-12-31", "2015-01-01"));
+- BOOST_CHECK(equal_week("2015-01-01", "2014-12-31"));
++ BOOST_CHECK(equal_week("2014-12-31 00:00:00", "2015-01-01 00:00:00"));
++ BOOST_CHECK(equal_week("2015-01-01 00:00:00", "2014-12-31 00:00:00"));
+ }
+
+
+ BOOST_AUTO_TEST_CASE(test5)
+ {
+ // 2017-12-31 is a Sunday, 2018-01-01 is a Monday
+- BOOST_CHECK(!equal_week("2017-12-31", "2018-01-01"));
+- BOOST_CHECK(!equal_week("2018-01-01", "2017-12-31"));
++ BOOST_CHECK(!equal_week("2017-12-31 00:00:00", "2018-01-01 00:00:00"));
++ BOOST_CHECK(!equal_week("2018-01-01 00:00:00", "2017-12-31 00:00:00"));
+ }
+diff --git testsuite/scan-datetime.cc testsuite/scan-datetime.cc
+new file mode 100644
+index 0000000..8f0d1c0
+--- /dev/null
++++ testsuite/scan-datetime.cc
+@@ -0,0 +1,30 @@
++
++#define BOOST_TEST_DYN_LINK
++#define BOOST_TEST_MODULE snapper
++
++#include <boost/test/unit_test.hpp>
++
++#include "../snapper/AppUtil.h"
++
++using namespace snapper;
++
++
++BOOST_AUTO_TEST_CASE(test1)
++{
++ time_t t1 = scan_datetime("2020-03-04 12:34:56", true);
++
++ struct tm tmp1;
++ memset(&tmp1, 0, sizeof(tmp1));
++ gmtime_r(&t1, &tmp1);
++
++ BOOST_CHECK_EQUAL(tmp1.tm_year, 2020 - 1900);
++ BOOST_CHECK_EQUAL(tmp1.tm_mon, 3 - 1);
++ BOOST_CHECK_EQUAL(tmp1.tm_mday, 4);
++
++ BOOST_CHECK_EQUAL(tmp1.tm_yday, 31 + 28 + 4);
++ BOOST_CHECK_EQUAL(tmp1.tm_wday, 3);
++
++ BOOST_CHECK_EQUAL(tmp1.tm_hour, 12);
++ BOOST_CHECK_EQUAL(tmp1.tm_min, 34);
++ BOOST_CHECK_EQUAL(tmp1.tm_sec, 56);
++}
diff --git a/srcpkgs/snapper/patches/0002-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- const char* p = strptime(str.c_str(), "%F %T", &s);
- if (!p || *p != '\0')
- return (time_t)(-1);
-- return utc ? timegm(&s) : timelocal(&s);
-+ return utc ? timegm(&s) : mktime(&s);
- }
-
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch b/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
new file mode 100644
index 00000000000..2582dfb1d87
--- /dev/null
+++ b/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
@@ -0,0 +1,19 @@
+This patch fixes the issue, that the build doesn't link against json-c
+when --disable-zypp flag is enabled.
+See openSUSE/snapper#617
+
+diff --git configure.ac configure.ac
+index 839d012..06e4721 100644
+--- configure.ac
++++ configure.ac
+@@ -194,9 +194,7 @@ fi
+
+ PKG_CHECK_MODULES(DBUS, dbus-1)
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+-if test "x$with_zypp" = "xyes"; then
+- PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
+-fi
++PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
+
+ AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers. Please install libacl-devel])])
+
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
-
-+#undef stdout
-+#undef stderr
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..481f94c13c5 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,32 +1,30 @@
# Template file for 'snapper'
pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
build_style=gnu-configure
-configure_args="--disable-zypp --with-conf=/etc/conf.d"
+configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
make_dirs="/etc/snapper/configs 0755 root root"
hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
gettext pkg-config"
makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel
+ json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
lib32disabled=yes
-case "$XBPS_TARGET_MACHINE" in
- *-musl) # We define MUSL_LIBC to pick the correct return type
- # for strerror_r(2) which is int (XSI-compliant)
- CXXFLAGS="-DMUSL_LIBC=1"
- # We also link against libintl
+if [ "$XBPS_TARGET_LIBC" = musl ]
+then
makedepends+=" gettext-devel"
LDFLAGS="-lintl"
-esac
+fi
pre_configure() {
# rename cron scripts
@@ -43,8 +41,6 @@ pre_configure() {
post_install() {
vinstall data/sysconfig.snapper 644 etc/conf.d snapper
vsv snapperd
-
- rm -rf -- "${DESTDIR}"/usr/lib/systemd
}
libsnapper_package() {
From 62efd1ba61904668ca338324bef04643466c27de Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 15:59:57 +0100
Subject: [PATCH 411/634] libdatrie: update to 0.2.13
Closes: #28331 [via git-merge-pr]
---
srcpkgs/libdatrie/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libdatrie/template b/srcpkgs/libdatrie/template
index 56fae586b9c..c5e846fae99 100644
--- a/srcpkgs/libdatrie/template
+++ b/srcpkgs/libdatrie/template
@@ -1,6 +1,6 @@
# Template file for 'libdatrie'
pkgname=libdatrie
-version=0.2.12
+version=0.2.13
revision=1
build_style=gnu-configure
short_desc="Implementation of double-array structure for representing trie"
@@ -8,7 +8,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="LGPL-2.1-or-later"
homepage="https://linux.thai.net/projects/datrie"
distfiles="https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${version}.tar.xz"
-checksum=452dcc4d3a96c01f80f7c291b42be11863cd1554ff78b93e110becce6e00b149
+checksum=12231bb2be2581a7f0fb9904092d24b0ed2a271a16835071ed97bed65267f4be
libdatrie-devel_package() {
short_desc+=" - development files"
From c5517806997b08ea23ee78219d63625a973277eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 30 Jan 2021 23:20:05 -0300
Subject: [PATCH 412/634] libdatrie: add changelog entry.
---
srcpkgs/libdatrie/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libdatrie/template b/srcpkgs/libdatrie/template
index c5e846fae99..7f81aed9cc7 100644
--- a/srcpkgs/libdatrie/template
+++ b/srcpkgs/libdatrie/template
@@ -7,6 +7,7 @@ short_desc="Implementation of double-array structure for representing trie"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="LGPL-2.1-or-later"
homepage="https://linux.thai.net/projects/datrie"
+changelog="https://raw.githubusercontent.com/tlwg/libdatrie/master/NEWS"
distfiles="https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${version}.tar.xz"
checksum=12231bb2be2581a7f0fb9904092d24b0ed2a271a16835071ed97bed65267f4be
From 2f286b1bdcdca9a9e4271c0ded46d967e5c9f701 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 15:54:48 -0700
Subject: [PATCH 413/634] mesa: update to 20.3.4.
---
srcpkgs/mesa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 614f17e76d0..1e622adebf9 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=20.3.3
+version=20.3.4
revision=1
wrksrc="mesa-${version}"
build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=f74e212d4838e982a10c203ffa998817d1855c5cf448ae87b58f96edea61d156
+checksum=dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false"
From ed544d79520a472589ecabdf12d09523134a1353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 31 Jan 2021 03:43:38 +0100
Subject: [PATCH 414/634] liteide: update to 37.3
---
srcpkgs/liteide/template | 41 +++++++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/liteide/template b/srcpkgs/liteide/template
index d2e9aa44ac0..a3bae429b88 100644
--- a/srcpkgs/liteide/template
+++ b/srcpkgs/liteide/template
@@ -1,24 +1,43 @@
# Template file for 'liteide'
pkgname=liteide
-version=36.3
+version=37.3
revision=1
wrksrc="liteide-x${version}"
build_wrksrc=liteidex
build_style=qmake
-hostmakedepends="qt5-qmake"
-makedepends="qt5-tools-devel"
+hostmakedepends="go qt5-qmake qt5-host-tools"
+makedepends="libglvnd-devel libvterm-devel qt5-tools-devel qt5-webkit-devel"
depends="go"
short_desc="Simple, open source, cross-platform Go IDE"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://liteide.org/"
distfiles="https://github.com/visualfc/liteide/archive/x${version}.tar.gz"
-checksum=d1b2b6a7994b764f7b12550e4759c90da18de574eb8544eebbcee98d7741c801
+checksum=e91e52ae7f9fdb8c904ef0f11f462b48eff6550b97c58928e848b5fe1f0bc198
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools"
- CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5"
- for i in ${XBPS_CROSS_BASE}/usr/include/qt5/*; do
- CXXFLAGS+=" -I$i"
- done
-fi
+pre_configure() {
+ # Use system libvterm instead of the one shipped
+ vsed -i -e 's;libvterm;;' src/3rdparty/3rdparty.pro
+ # Remove wrong extra 'lib' prefix
+ vsed -i -e 's;libvterm;vterm;' src/utils/vterm/vterm.pri
+}
+
+post_install() {
+ ln -frs ${DESTDIR}/usr/bin/{liteide,golangide}
+
+ # Package resources
+ vmkdir usr/share/liteide
+ cp -ar deploy/* os_deploy/* ${DESTDIR}/usr/share/liteide
+
+ # Package license files
+ vlicense LICENSE.LGPL LICENSE
+ vlicense LGPL_EXCEPTION.TXT LGPL_EXCEPTION
+
+ # Package desktop shortcut
+ vinstall liteide.desktop 644 usr/share/applications
+ vmkdir usr/share/pixmaps
+ vinstall deploy/welcome/images/liteide400.png 644 usr/share/pixmaps liteide.png
+
+ # Fix for FS#38781
+ mv ${DESTDIR}/usr/share/liteide/{linux/,}liteenv
+}
From d5194c9b4c6e698d7f75f78e77dca35828a9c2e1 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 15:41:59 -0700
Subject: [PATCH 415/634] scdoc: update to 1.11.1.
---
srcpkgs/scdoc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template
index ef4168086d0..f7f4b7c4367 100644
--- a/srcpkgs/scdoc/template
+++ b/srcpkgs/scdoc/template
@@ -1,6 +1,6 @@
# Template file for 'scdoc'
pkgname=scdoc
-version=1.11.0
+version=1.11.1
revision=1
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -9,7 +9,7 @@ maintainer="Julio Galvan <juliogalvan@protonmail.com>"
license="MIT"
homepage="https://git.sr.ht/~sircmpwn/scdoc"
distfiles="https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"
-checksum=8ac3e7e08fdfab0d75a312b1abcb6eafbd9114a5deaafbaba0fe5ec7e880929d
+checksum=e529fcb00508e7e4c5025a745591b805b754b3bd5c84c5192acaefabdfa8f700
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" scdoc"
From f50f88f5c3e79e1e12cfd2add13474af6e3d06f0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 17:37:39 +0100
Subject: [PATCH 416/634] lilypond: update to 2.23.0
---
srcpkgs/lilypond/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index c3be0ae65c0..f4ae908d511 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
# Template file for 'lilypond'
pkgname=lilypond
-version=2.22.0
+version=2.23.0
revision=1
build_wrksrc="build"
build_style="gnu-configure"
@@ -16,8 +16,8 @@ short_desc="Music engraving program"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="https://lilypond.org/"
-distfiles="https://lilypond.org/downloads/sources/v2.22/lilypond-${version}.tar.gz"
-checksum=64ddd03171d247adc243e01a3be3ec2610d97c62b893c253ad02ac50694b0f4e
+distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
+checksum=b2c795278ecef7e7b4383be6d9ad64b735dd826e790ccf791e656fa16a135fd3
python_version=3
if [ -n "${CROSS_BUILD}" ]; then
From cdb11d0ce180dc380b6796d256ca22f0ba0dfd41 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 17:38:01 +0100
Subject: [PATCH 417/634] lilypond-doc: update to 2.23.0
---
srcpkgs/lilypond-doc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index 3d5a809a961..7b9211f312b 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,6 +1,6 @@
# Template file for 'lilypond-doc'
pkgname=lilypond-doc
-version=2.22.0
+version=2.23.0
revision=1
create_wrksrc=yes
short_desc="Documentation for the lilypond music engraving program"
@@ -8,7 +8,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="http://lilypond.org/"
distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=2698a407424e29abf834d12376fb33aa1bfa2afa8b7f3537120b0817b982bd8f
+checksum=1b7f10a0a03923ab7e944916cdb1532312afe91d97272c3c0e0a547fe7161e88
do_install() {
vmkdir usr
From ef4aed69e8c9f2f0a92687bfb8b07682c825d0f3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 18:14:13 +0100
Subject: [PATCH 418/634] foot: update to 1.6.3.
---
srcpkgs/foot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index 544ef9187c1..3782240fead 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
# Template file for 'foot'
pkgname=foot
-version=1.6.2
+version=1.6.3
revision=1
wrksrc=$pkgname
build_style=meson
@@ -14,7 +14,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://codeberg.org/dnkl/foot"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dee10d8153a3ed57e21f5d8c0ed4121ddf83eeb33655728e5b8c46dfa3566a45
+checksum=0340df647d3baae5bcafe6b081173d1850d3f92452d0d0b68d3edf0ef6eb1819
post_install() {
vlicense LICENSE
From ac40d338eff9cb7aec88551b8f2882d96eaa2aa2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Jan 2021 23:54:41 +0200
Subject: [PATCH 419/634] fluidsynth: update to 2.1.7.
---
srcpkgs/fluidsynth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 53e299a1d66..581568a6981 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
# Template file for 'fluidsynth'
pkgname=fluidsynth
-version=2.1.6
+version=2.1.7
revision=1
build_style=cmake
configure_args="-DLIB_SUFFIX=
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://www.fluidsynth.org/"
distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=328fc290b5358544d8dea573f81cb1e97806bdf49e8507db067621242f3f0b8a
+checksum=365a1c0982efcaff724a7b05d26ce1db76bc7435aa4c239df61cbc87f04b6c90
do_check() {
cd build
From e2f2e886b8483fe0020159c576b4b2eaaa616822 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 30 Jan 2021 23:59:42 +0300
Subject: [PATCH 420/634] lf: update to r20.
---
srcpkgs/lf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 1b4fc94cfc4..721a33cbf58 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
# Template file for 'lf'
pkgname=lf
-version=r19
+version=r20
revision=1
build_style=go
go_import_path="github.com/gokcehan/${pkgname}"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/gokcehan/lf"
distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=8808069021ee1c0012440edabdc239b9f58f36bdd44d27b07eae7c91b97afdef
+checksum=b0d755e255d48229c14b7ec5f86788c6fc96df1f6859f677b313fd9deb856398
post_install() {
vlicense LICENSE
From 3377d1f5140237053879ea112d8d4c417ebe312a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 22:16:17 -0300
Subject: [PATCH 421/634] bind: clean up outdated seccomp build option.
Revbump to show updated options in package.
---
srcpkgs/bind/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 4e35aafb00a..f0744606e44 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
# Template file for 'bind'
pkgname=bind
version=9.16.7
-revision=1
+revision=2
_fullver="${version}${_patchver:+-${_patchver}}"
wrksrc="${pkgname}-${_fullver}"
build_style=gnu-configure
@@ -11,12 +11,11 @@ configure_args="--disable-static --enable-threads --enable-largefile
--with-libtool --with-openssl=${XBPS_CROSS_BASE}/usr --with-gssapi=/usr/bin
--without-gost --enable-openssl-hash --with-readline --with-tuning=default
--without-python --enable-fetchlimit --enable-sit
- --with-libidn2 $(vopt_enable seccomp)
+ --with-libidn2
$(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
hostmakedepends="automake libtool perl pkg-config"
makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
- libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)
- $(vopt_if seccomp libseccomp-devel)"
+ libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
short_desc="Berkeley Internet Name Domain server"
maintainer="Randy McCaskill <randy@mccaskill.us>"
license="MPL-2.0"
@@ -31,13 +30,9 @@ named_descr="BIND DNS server"
named_homedir="/var/named"
make_dirs="/var/named 0770 root named"
-build_options="geoip seccomp"
+build_options="geoip"
build_options_default="geoip"
-case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) build_options_default+=" seccomp";;
-esac
-
do_check() {
# requires special network setup
:
From 0ac8622facd0212f32a09598bc4d3fdbce1aab60 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sat, 30 Jan 2021 06:02:56 +0000
Subject: [PATCH 422/634] golangci-lint: update to 1.36.0
---
srcpkgs/golangci-lint/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index de9cc114e16..169680cf579 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
# Template file for 'golangci-lint'
pkgname=golangci-lint
-version=1.35.2
+version=1.36.0
revision=1
build_style=go
go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=31f245cb78a4f79d666a9357d5ea1f6ce30e15ea37d5c10c3ffb6765a158dc9d
+checksum=3476288341b2c6e2b5a426334ec982769a9ea5341e0336198fd33c7250b4928b
# fix: collect2: fatal error: cannot find 'ld'
export LDFLAGS="-fuse-ld=bfd"
From de85359de3c55cbed7cded85948d29000e9f0127 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 17:49:03 +0100
Subject: [PATCH 423/634] p11-kit: update to 0.23.22.
---
srcpkgs/p11-kit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index 290c4620a03..85ca651456e 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -1,6 +1,6 @@
# Template file for 'p11-kit'
pkgname=p11-kit
-version=0.23.21
+version=0.23.22
revision=1
build_style=gnu-configure
configure_args="--with-module-path=/usr/lib/pkcs11"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/p11-glue/p11-kit"
distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.xz"
-checksum=f1baa493f05ca0d867f06bcb54cbb5cdb28c756db07207b6e18de18a87b10627
+checksum=8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6
conf_files="/etc/pkcs11/pkcs11.conf"
if [ "$CROSS_BUILD" ]; then
From 0ac8f19c3194fce0433018d001f70ad5a1dda856 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:02:46 +0100
Subject: [PATCH 424/634] linux5.4: update to 5.4.94.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 60f097ab3da..dc289a313bb 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.92
+version=5.4.94
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=c0937ff98824c4b14cfea68a04340e0beb3c00f1cc02984daf2f3bdf542394fd
+checksum=c23df57db7312e9afa5ce477046e227a3c2153efbe1f29045ad23c820aad2b39
python_version=3
patch_args="-Np1"
From 4bee1b3dae57d7e252fcfc2a60c3e804fab2d5d6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:05:25 +0100
Subject: [PATCH 425/634] linux4.19: update to 4.19.172.
---
srcpkgs/linux4.19/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 1f109e47a20..359cf7d7cc1 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.19'
pkgname=linux4.19
-version=4.19.170
+version=4.19.172
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=dd0d0264f8ef4363d0080054fd344470a73f07aca2cd673e91bf6e77fbe25b4a
+checksum=4f34cceb0558640ce04fa1929b99110282ba285c1655fbd4b72f985cf83e1422
python_version=2 #unverified
patch_args="-Np1"
From dee6dc55a6783328ca99b475c909a20ae900faad Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:27:42 +0100
Subject: [PATCH 426/634] autofs: update to 5.1.7.
---
srcpkgs/autofs/patches/musl.patch | 14 ++++++++++++++
srcpkgs/autofs/template | 6 +++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/autofs/patches/musl.patch b/srcpkgs/autofs/patches/musl.patch
index 870731b7078..5825d646a84 100644
--- a/srcpkgs/autofs/patches/musl.patch
+++ b/srcpkgs/autofs/patches/musl.patch
@@ -43,3 +43,17 @@
if (attempt_id) {
int len = sizeof(buffer) + 1 + strlen(msg) + 1;
+--- include/hash.h.orig 2021-01-31 09:22:19.668222263 +0100
++++ include/hash.h 2021-01-31 09:22:41.390327622 +0100
+@@ -5,6 +5,11 @@
+
+ #include <sys/types.h>
+ #include <stdint.h>
++#include <linux/stddef.h>
++
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+
+ /*
+ * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index d84e1b8da4b..b306368242d 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
# Template file for 'autofs'
pkgname=autofs
-version=5.1.6
-revision=3
+version=5.1.7
+revision=1
build_style=gnu-configure
make_build_args="DONTSTRIP=1"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later"
homepage="https://www.kernel.org/pub/linux/daemons/autofs"
distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
-checksum=dddee3d9b7388ce6cb7432832dfade25b07ef68ad48dcce01cf247b26a10caef
+checksum=a36b268611b79b07051749870ba540b139938efc84bc0293244c483e94f9ced7
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc"
From 383bcc928e0e043d645d760a8953141130e9af82 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 12:20:52 +0100
Subject: [PATCH 427/634] wine: update to 6.1.
---
srcpkgs/wine/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 3694984c42d..b80e73bbdc9 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
-version=6.0
-revision=2
+version=6.1
+revision=1
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -11,10 +11,10 @@ short_desc="Run Microsoft Windows applications"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
+distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="b493065f2f83ee429c62e2ec58698a3cf63ef78722e1b20765823152e8582c56
- 194902cb880a657de386e0789f8ce1f369fb896468ca299fd5abbe921fee043c"
+checksum="a92c24308c48b851b5dc22a1d35696a57311c447b31ec9fa543ec5b0aa73a149
+ f4de54fe026b920191db6c5001cfd563503d0fa3e2b191315311285019afddf4"
build_options="mingw staging"
build_options_default="mingw"
From 9551abe795df437dca55ca2b2249f5547ae11440 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 15:52:16 +0100
Subject: [PATCH 428/634] ugrep: update to 3.1.6.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 188a499d165..ca570f52187 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.1.5
+version=3.1.6
revision=1
build_style=gnu-configure
configure_args="--disable-avx"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=f9efdc95c77e7c2651b614f7dc525db31c8e4809e70af4a9f2e33035859f7278
+checksum=5e494bccabebfa91b4ac34b0c44ac6e36fe8604e78ef4b22c099f68e82e32e35
From c5967dd0843fe67d47570ee40c7b3a7ff5bc0a8a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 15:54:42 +0100
Subject: [PATCH 429/634] rlwrap: update to 0.44.
---
srcpkgs/rlwrap/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/rlwrap/template b/srcpkgs/rlwrap/template
index 6f120a6f29f..22787a1bfc7 100644
--- a/srcpkgs/rlwrap/template
+++ b/srcpkgs/rlwrap/template
@@ -1,13 +1,13 @@
# Template file for 'rlwrap'
pkgname=rlwrap
-version=0.43
-revision=2
+version=0.44
+revision=1
build_style=gnu-configure
makedepends="readline-devel"
depends="perl"
short_desc="Adds readline-style editing and history to programs"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="https://github.com/hanslub42/rlwrap"
-distfiles="https://github.com/hanslub42/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=8e86d0b7882d9b8a73d229897a90edc207b1ae7fa0899dca8ee01c31a93feb2f
+distfiles="https://github.com/hanslub42/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
+checksum=cd7ff50cde66e443cbea0049b4abf1cca64a74948371fa4f1b5d9a5bbce1e13c
From 368a56ad3e7d71360a4df87b4587aa9dd58f92b4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 16:28:39 +0100
Subject: [PATCH 430/634] sbcl: update to 2.1.1.
---
srcpkgs/sbcl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 5e57358bd65..0a1afbeb9a2 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
# Template file for 'sbcl'
pkgname=sbcl
-version=2.1.0
+version=2.1.1
revision=1
archs="i686 x86_64* armv7l aarch64 ppc64le*"
hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
homepage="http://www.sbcl.org/"
changelog="http://www.sbcl.org/news.html"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=05ee56bd66f9ce2f4fff3716766eb53aef2a74be3bbe862a31d83a60bea8224c
+checksum=a9ad892ea038b7155a60c1144801084fab3b2b8cbb0c5bde7e1f42a6b4318a97
nocross=yes
nopie=yes
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
case "$XBPS_TARGET_MACHINE" in
x86_64)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
- checksum+=" 4ab9a3dd8989427f7a27762ab7e0488e21603bd45aeac593d1667ad672e7fa35"
+ checksum+=" d7935c116af2ecd7485eae54d29491964b1f3ed97068f3127bd8871e120611a4"
;;
i686)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
From 3be7a523f767bbc821f2e79d62ff69bb00bee2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 31 Jan 2021 16:35:02 +0100
Subject: [PATCH 431/634] squashfs-tools: enable zstd compression
---
srcpkgs/squashfs-tools/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 7692eb01761..d49d6c5602a 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,11 +1,11 @@
# Template file for 'squashfs-tools'
pkgname=squashfs-tools
version=4.4
-revision=1
+revision=2
wrksrc="squashfs${version}"
build_wrksrc="squashfs-tools"
build_style=gnu-makefile
-makedepends="zlib-devel lzo-devel liblzma-devel liblz4-devel"
+makedepends="zlib-devel lzo-devel liblzma-devel liblz4-devel libzstd-devel"
license="GPL-2.0-or-later"
homepage="http://squashfs.sf.net/"
short_desc="Tool to create and append to squashfs filesystems"
@@ -16,7 +16,7 @@ checksum=a981b3f3f2054b5a2e658851a3c06a2460ad04a9a8a645e0afe063a63fdbb07e
CFLAGS="-fcommon"
do_build() {
- make ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
+ make ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1
}
do_install() {
From 1be29c8e1d3668f992361b7b28f589d753c60861 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:04:58 +0100
Subject: [PATCH 432/634] fcitx: drop qt4 support
---
srcpkgs/fcitx/template | 27 +++++----------------------
srcpkgs/libfcitx-qt | 1 -
srcpkgs/libfcitx-qt-devel | 1 -
3 files changed, 5 insertions(+), 24 deletions(-)
delete mode 120000 srcpkgs/libfcitx-qt
delete mode 120000 srcpkgs/libfcitx-qt-devel
diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 0f810fe19b5..8373cf9ff97 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx'
pkgname=fcitx
version=4.2.9.8
-revision=1
+revision=2
build_style=cmake
short_desc="Flexible Context-aware Input Tool with eXtension"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -10,13 +10,13 @@ homepage="https://fcitx-im.org/"
distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz"
checksum=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6
-hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules qt-qmake"
+hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules"
makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
json-c-devel opencc-devel
- libxkbfile-devel icu-devel qt-devel dbus-devel gtk+-devel gtk+3-devel"
+ libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
lib32disabled=yes
configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
- -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT_IM_MODULE=ON
+ -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF
-DFORCE_ENCHANT=ON -DENABLE_TEST=ON"
# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
@@ -26,7 +26,7 @@ esac
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DENABLE_GIR=OFF"
- hostmakedepends+=" glib-devel qt-host-tools fcitx"
+ hostmakedepends+=" glib-devel fcitx"
fi
pre_configure() {
@@ -94,20 +94,3 @@ libfcitx-gtk3_package() {
vmove usr/lib/gtk-3.0
}
}
-libfcitx-qt_package() {
- short_desc+=" - Qt4 IM module"
- pkg_install() {
- vmove "usr/lib/libfcitx-qt.so.*"
- vmove usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper
- vmove usr/lib/qt
- }
-}
-libfcitx-qt-devel_package() {
- short_desc+=" - Qt4 IM module development files"
- depends="fcitx-${version}_${revision} qt-devel"
- pkg_install() {
- vmove usr/include/fcitx-qt
- vmove usr/lib/libfcitx-qt.so
- vmove usr/lib/pkgconfig/fcitx-qt.pc
- }
-}
diff --git a/srcpkgs/libfcitx-qt b/srcpkgs/libfcitx-qt
deleted file mode 120000
index 421114c67a2..00000000000
--- a/srcpkgs/libfcitx-qt
+++ /dev/null
@@ -1 +0,0 @@
-fcitx
\ No newline at end of file
diff --git a/srcpkgs/libfcitx-qt-devel b/srcpkgs/libfcitx-qt-devel
deleted file mode 120000
index 421114c67a2..00000000000
--- a/srcpkgs/libfcitx-qt-devel
+++ /dev/null
@@ -1 +0,0 @@
-fcitx
\ No newline at end of file
From b9b05fb214493f91858dba66ee6a96ad750e8a85 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:06:37 +0100
Subject: [PATCH 433/634] removed-packages: add fcitx-qt
---
srcpkgs/removed-packages/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index b8a4e651ac8..a82cd326b0a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -140,6 +140,8 @@ replaces="
keepassx<=0.4.4_2
libapp<=20140527_2
libdbusmenu-qt<=0.9.2_4
+ libfcitx-qt<=4.2.9.8_1
+ libfcitx-qt-devel<=4.2.9.8_1
libgksu<=2.0.12_5
libqzeitgeist<=0.8.0_6
librpcsecgss<=0.19_6
From bd466bc696e75522842986247d8bd953c6b7a344 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:10:06 +0100
Subject: [PATCH 434/634] tagainijisho: remove
depends on qt4, added in 2016 and never really updated since;
upstream seems dormant at best, and while git version has qt5
support, release does not
---
srcpkgs/tagainijisho/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/tagainijisho/template
diff --git a/srcpkgs/tagainijisho/template b/srcpkgs/tagainijisho/template
deleted file mode 100644
index 30cc4ad91d4..00000000000
--- a/srcpkgs/tagainijisho/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'tagainijisho'
-
-pkgname="tagainijisho"
-version="1.0.3"
-revision=1
-build_style=cmake
-makedepends="qt-devel"
-short_desc="A free software Japanese dictionary and learning assistant"
-maintainer="Salih Gerdan <msalih45@gmail.com>"
-license="GPL-3"
-homepage="http://www.tagaini.net"
-distfiles="https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"
-checksum="6fe3c579ec1cea6c41393ac9a82dd12d0e240032d2bb7837a90e470f480aaf4e"
-nocross="Found unsuitable Qt version, this code requires Qt 4.x"
-
-case "$XBPS_TARGET_MACHINE" in
- ppc*) broken="other dicts are not built";;
-esac
From 01407c06805beb353a6e7ec00f7acf59c28dc9d3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:11:39 +0100
Subject: [PATCH 435/634] removed-packages: add tagainijisho
---
srcpkgs/removed-packages/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a82cd326b0a..14a3be7f92e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -182,6 +182,7 @@ replaces="
soulseekqt<=20160117_2
spacefm-ng<=1.0.6_3
sqlite-replication<=3.32.3_2
+ tagainijisho<=1.0.3_1
ttyload-git<=20141117_4
tuxc<=1.1_3
urlmatch-git<=20141116_2
From b1d07da5e28ddabd52db9047eab9cabf909d512a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:13:01 +0100
Subject: [PATCH 436/634] scantailor: remove
depends on qt4, and declared dead by upstream
---
srcpkgs/scantailor/files/scantailor.desktop | 51 -------------------
.../patches/fix-pthread_check.patch | 31 -----------
srcpkgs/scantailor/template | 24 ---------
srcpkgs/scantailor/update | 2 -
4 files changed, 108 deletions(-)
delete mode 100644 srcpkgs/scantailor/files/scantailor.desktop
delete mode 100644 srcpkgs/scantailor/patches/fix-pthread_check.patch
delete mode 100644 srcpkgs/scantailor/template
delete mode 100644 srcpkgs/scantailor/update
diff --git a/srcpkgs/scantailor/files/scantailor.desktop b/srcpkgs/scantailor/files/scantailor.desktop
deleted file mode 100644
index e51d881748b..00000000000
--- a/srcpkgs/scantailor/files/scantailor.desktop
+++ /dev/null
@@ -1,51 +0,0 @@
-[Desktop Entry]
-Name=ScanTailor
-GenericName=Scan processing software
-GenericName[ru]=Постобработка отсканированных страниц
-Comment=Interactive post-processing tool for scanned pages
-Comment[af]=Interaktiewe post-verwerkings hulpmiddel vir geskandeerde bladsye
-Comment[sq]=Mjet interaktiv pas përpunimi për faqet e skanuara
-Comment[ast]=Ferramienta interactiva de postprocesamientu pa páxines escaneaes
-Comment[bn]=স্ক্যানকৃত পৃষ্ঠার জন্য মিথস্ক্রিয় পোস্ট-প্রসেসিং টুল
-Comment[bs]=Interaktivni alat za naknadnu obradu optički skeniranih stranica
-Comment[pt_BR]=Ferramenta interativa de pós processamento para páginas digitalizadas
-Comment[bg]=Инструмент за интерактивна пост обработка на сканирани страници
-Comment[ca]=Eina interactiva de postprocessament de pàgines escanejades
-Comment[ca@valencia]=Eina interactiva de postprocessament de pàgines escanejades
-Comment[zh_HK]=掃描紙張的互動式後製工具
-Comment[zh_TW]=掃描紙張的互動式後製工具
-Comment[zh_CN]=用于扫描页面的交互式后期处理工具
-Comment[crh]=Taranmış sayfalar için etkileşimli son işlem aracı
-Comment[cs]=Interaktivní nástroj pro zpracování naskenovaných stránek
-Comment[et]=Skaneeritud lehekülgede interaktiivne järeltöötlus vahend
-Comment[da]=Interaktivt efterbehandlingsværktøj til skannede sider
-Comment[nl]=Interactief, post-processing hulpmiddel voor gescande pagina"s
-Comment[fi]=Interaktiivinen jälkikäsittelytyökalu skannatuille sivuille
-Comment[fr]=Interactive outil de post-traitement pour des pages numérisées
-Comment[gl]=Ferramenta interactiva de postprocesamento de imaxes dixitalizadas
-Comment[el]=Διαδραστικό εργαλείο post-processing για σελίδες που έχουν σαρωθεί
-Comment[de]=Interaktives Nachbearbeitungswerkzeug für gescannte Seiten
-Comment[hu]=Beolvasott képek interaktív utófeldolgozása
-Comment[ja]=スキャンされたページを対話式に後処理するツール
-Comment[it]=Strumento interattivo per il post processamento di pagine acquisite con lo scanner
-Comment[ky]=Сканерленген баракчаларды кайра иштетүү үчүн интерактивдүү шайман
-Comment[ms]=Alat post-pemprosesan berinteraktif untuk halaman terimbas
-Comment[nb]=Interaktivt verktøy for etterbehandling av skannede sider
-Comment[oc]=Aisina interactiva de tractament de document aprèp numerizacion
-Comment[pl]=Program do obróbki i przetwarzana zeskanowanych dokumentów tekstowych
-Comment[pt]=Ferramenta de pós-processamento interactivo de páginas scaneadas
-Comment[ro]=Utilitar interactiv pentru post-procesare pagini scanate
-Comment[ru]=Интерактивный инструмент постобработки для отсканированных страниц
-Comment[sl]=Vzajemno orodje za poopravilo optično prebranih strani
-Comment[es]=Herramienta interactiva de postprocesamiento para páginas escaneadas
-Comment[sv]=Interaktivt vektyg för efterbearbetning av inlästa sidor
-Comment[vi]=Công cụ tương tác xử lý trước các trang được quét
-Comment[uk]=Інтерактивний інструмент пост-обробки відсканованих сторінок
-Comment[tr]=Taranmış sayfalar için etkileşimli son işlem aracı
-TryExec=/usr/bin/scantailor
-Exec=/usr/bin/scantailor %f
-Type=Application
-Icon=scantailor
-Terminal=false
-MimeType=application/x-scantailor;
-Categories=Graphics;2DGraphics;RasterGraphics;
diff --git a/srcpkgs/scantailor/patches/fix-pthread_check.patch b/srcpkgs/scantailor/patches/fix-pthread_check.patch
deleted file mode 100644
index 370774eb565..00000000000
--- a/srcpkgs/scantailor/patches/fix-pthread_check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cmake/FindPthreads.cmake 2012-02-27 21:11:05.000000000 +0100
-+++ cmake/FindPthreads.cmake 2016-03-08 04:46:38.516378187 +0100
-@@ -27,7 +27,7 @@
- SET(_aix_flags "-D_THREAD_SAFE:-lpthreads")
-
- # gcc on various OSes
-- SET(_other_flags "-pthread:-pthread")
-+ SET(_other_flags "-pthread -fPIC:-pthread")
-
- IF(CMAKE_SYSTEM_NAME MATCHES "AIX.*")
- LIST(APPEND _available_flags ${_aix_flags})
-@@ -59,14 +59,17 @@
-
- FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/TestPthreads.c
- "#include <pthread.h>\n"
-+ "void* start_routine(void* arg) { return arg; }\n"
- "int main()\n"
- "{\n"
- " pthread_t th;\n"
-- " pthread_create(&th, 0, 0, 0);\n"
-+ " pthread_attr_t att;\n"
-+ " pthread_attr_init(&att);\n"
-+ " pthread_create(&th, &att, start_routine, 0);\n"
- " pthread_join(th, 0);\n"
-- " pthread_attr_init(0);\n"
- " pthread_cleanup_push(0, 0);\n"
- " pthread_cleanup_pop(0);\n"
-+ " return 0;\n"
- "}\n"
- )
-
diff --git a/srcpkgs/scantailor/template b/srcpkgs/scantailor/template
deleted file mode 100644
index 68af70833b2..00000000000
--- a/srcpkgs/scantailor/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'scantailor'
-pkgname=scantailor
-version=0.9.12.1
-revision=2
-wrksrc=${pkgname}-RELEASE_${version//./_}
-build_style=cmake
-#configure_args="-DPTHREADS_CFLAGS=-pthread -DPTHREADS_LIBS=-pthread"
-hostmakedepends="qt-devel qt-qmake pkg-config"
-makedepends="libpng-devel tiff-devel boost-devel qt-devel libXrender-devel"
-short_desc="Interactive post-processing for scans"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-3"
-homepage="http://scantailor.org/"
-distfiles="http://github.com/${pkgname}/${pkgname}/archive/RELEASE_${version//./_}.tar.gz"
-checksum=ef5d5bdca207ab00701121a32e9b95c7c7353c642b9538b3f9ca040d8d1a5dde
-
-CFLAGS="-fPIC"
-
-post_install() {
- vinstall resources/icons/appicon-about.png 644 \
- usr/share/pixmaps ${pkgname}.png
- vinstall ${FILESDIR}/${pkgname}.desktop 644 \
- usr/share/applications
-}
diff --git a/srcpkgs/scantailor/update b/srcpkgs/scantailor/update
deleted file mode 100644
index e7abd4e82b6..00000000000
--- a/srcpkgs/scantailor/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://github.com/scantailor/scantailor/releases
-pattern='RELEASE_.*">\K[\d.]+'
From d38c44701a3ed1bc18a865c9911b3398431d7544 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:13:53 +0100
Subject: [PATCH 437/634] removed-packages: add scantailor
---
srcpkgs/removed-packages/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 14a3be7f92e..66ea2e44f46 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -176,6 +176,7 @@ replaces="
qimageblitz<=0.0.6_4
r2-bindings<=1.0.1_2
reminiscence<=0.4.6_1
+ scantailor<=0.9.12.1_2
seriespl<=2.3.5_2
simple-obfs<=0.0.5_2
skypetab-ng<=20150201_3
From 616298ae4a5755c527e548263d0c9c2e7dbd6c6c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:38:16 +0100
Subject: [PATCH 438/634] keepassx2: remove
---
srcpkgs/keepassx2/patches/musl.patch | 10 ----------
srcpkgs/keepassx2/template | 29 ----------------------------
srcpkgs/keepassx2/update | 3 ---
3 files changed, 42 deletions(-)
delete mode 100644 srcpkgs/keepassx2/patches/musl.patch
delete mode 100644 srcpkgs/keepassx2/template
delete mode 100644 srcpkgs/keepassx2/update
diff --git a/srcpkgs/keepassx2/patches/musl.patch b/srcpkgs/keepassx2/patches/musl.patch
deleted file mode 100644
index 7f7bd27ac8d..00000000000
--- a/srcpkgs/keepassx2/patches/musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/qlockfile_unix.cpp.orig 2015-07-19 00:41:35.000000000 +0200
-+++ src/core/qlockfile_unix.cpp 2015-07-21 20:01:02.607722077 +0200
-@@ -39,6 +39,7 @@
- #include <QDebug>
- #include <QDateTime>
-
-+#include <fcntl.h>
- #include <sys/file.h> // flock
- #include <sys/types.h> // kill
- #include <signal.h> // kill
diff --git a/srcpkgs/keepassx2/template b/srcpkgs/keepassx2/template
deleted file mode 100644
index d643ebf182a..00000000000
--- a/srcpkgs/keepassx2/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'keepassx2'
-_realname="keepassx"
-pkgname="${_realname}2"
-version="2.0.3"
-revision=2
-build_style=cmake
-hostmakedepends="pkg-config qt-devel"
-makedepends="qt-devel libgcrypt-devel zlib-devel libXi-devel libXtst-devel"
-short_desc="A password manager to secure personal data"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="GPL-2"
-homepage="https://www.keepassx.org/"
-distfiles="${homepage}/releases/${version}/${_realname}-${version}.tar.gz"
-checksum=23ffb4ae360c58aa139943442d175bc6b8f08e6a876ae76c4543ab983a6647c5
-wrksrc="${_realname}-${version}"
-
-pre_configure() {
- sed -i CMakeLists.txt \
- -e "s/set(PROGNAME.*/set(PROGNAME keepassx2)/"
-}
-
-post_install() {
- sed -i $DESTDIR/usr/share/applications/keepassx.desktop \
- -e "s/^Exec=.*/Exec=keepassx2/"
- mv $DESTDIR/usr/share/applications/keepassx.desktop \
- $DESTDIR/usr/share/applications/keepassx2.desktop
- mv $DESTDIR/usr/share/mime/packages/keepassx.xml \
- $DESTDIR/usr/share/mime/packages/keepassx2.xml
-}
diff --git a/srcpkgs/keepassx2/update b/srcpkgs/keepassx2/update
deleted file mode 100644
index e21b8c6880e..00000000000
--- a/srcpkgs/keepassx2/update
+++ /dev/null
@@ -1,3 +0,0 @@
-pkgname=keepassx
-site=https://www.keepassx.org/downloads
-
From 4a347c616884884c261f70f91de3a31d46742137 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:39:32 +0100
Subject: [PATCH 439/634] removed-packages: add keepassx2
---
srcpkgs/removed-packages/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 66ea2e44f46..3fa87ecb866 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -138,6 +138,7 @@ replaces="
js<=1.8.5_11
kadu<=4.3_6
keepassx<=0.4.4_2
+ keepassx2<=2.0.3_2
libapp<=20140527_2
libdbusmenu-qt<=0.9.2_4
libfcitx-qt<=4.2.9.8_1
From e3739da7bad9908e0b3330af86679e651ca14ce5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:01:58 +0100
Subject: [PATCH 440/634] avogadro: remove
---
srcpkgs/avogadro-devel | 1 -
srcpkgs/avogadro/patches/glibc.patch | 18 --------------
srcpkgs/avogadro/template | 37 ----------------------------
3 files changed, 56 deletions(-)
delete mode 120000 srcpkgs/avogadro-devel
delete mode 100644 srcpkgs/avogadro/patches/glibc.patch
delete mode 100644 srcpkgs/avogadro/template
diff --git a/srcpkgs/avogadro-devel b/srcpkgs/avogadro-devel
deleted file mode 120000
index 9ed7d75d9d2..00000000000
--- a/srcpkgs/avogadro-devel
+++ /dev/null
@@ -1 +0,0 @@
-avogadro
\ No newline at end of file
diff --git a/srcpkgs/avogadro/patches/glibc.patch b/srcpkgs/avogadro/patches/glibc.patch
deleted file mode 100644
index 4d652af22c6..00000000000
--- a/srcpkgs/avogadro/patches/glibc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig
-+++ libavogadro/src/extensions/symmetry/libmsym/src/orbital.c
-@@ -67,13 +67,13 @@
- }
- case 2 : {
- //o->v = dpolynomial[m+l];
-- char *d = (signbit(m) == 1 ? "-" : "+");
-+ char *d = (signbit(m*1.0) == 1 ? "-" : "+");
- snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d);
- break;
- }
- default : {
- char t = 'f' - 3 + l;
-- char *d = (signbit(m) == 1 ? "-" : "+");
-+ char *d = (signbit(m*1.0) == 1 ? "-" : "+");
- snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d);
- }
- }
diff --git a/srcpkgs/avogadro/template b/srcpkgs/avogadro/template
deleted file mode 100644
index 03b886f1e0d..00000000000
--- a/srcpkgs/avogadro/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'avogadro'
-pkgname=avogadro
-version=1.2.0
-revision=8
-build_style=cmake
-configure_args="-DENABLE_TESTING:BOOL=OFF"
-hostmakedepends="pkg-config doxygen"
-makedepends="openbabel-devel qt-devel glew-devel zlib-devel boost-devel
- python-devel hdf5-devel eigen3.2"
-short_desc="An intuitive molecular editor and visualization tool"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
-homepage="http://avogadro.cc"
-distfiles="https://github.com/cryos/avogadro/archive/${version}.tar.gz"
-checksum=6453e36e8ae3e61655cbe062df6d6fa6b2409122c7b5abc0a6f1d410a181640b
-
-pre_build() {
- sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' CMakeLists.txt
-}
-post_install() {
- rm -rf ${DESTDIR}/usr/features
-}
-
-avogadro-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.a
- vmove usr/lib/*.so
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove usr/lib/avogadro/*.cmake
- subver=${version%.*}
- vmove usr/lib/avogadro/${subver%.*}_${subver#*.}/*cmake
- }
-}
From e4024e13ba5498bc46797c5499688e733d222de2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:02:45 +0100
Subject: [PATCH 441/634] luxmark: remove
---
srcpkgs/luxmark/patches/openexr-2_4.patch | 11 ----------
srcpkgs/luxmark/template | 26 -----------------------
srcpkgs/luxmark/update | 2 --
3 files changed, 39 deletions(-)
delete mode 100644 srcpkgs/luxmark/patches/openexr-2_4.patch
delete mode 100644 srcpkgs/luxmark/template
delete mode 100644 srcpkgs/luxmark/update
diff --git a/srcpkgs/luxmark/patches/openexr-2_4.patch b/srcpkgs/luxmark/patches/openexr-2_4.patch
deleted file mode 100644
index 5dd88f3093e..00000000000
--- a/srcpkgs/luxmark/patches/openexr-2_4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Packages/FindOpenEXR.cmake 2015-09-01 12:07:29.000000000 +0200
-+++ cmake/Packages/FindOpenEXR.cmake 2019-12-06 18:58:06.185329837 +0100
-@@ -68,7 +68,7 @@
- ENDFOREACH(i)
- ENDIF(OPENEXR_INCLUDE_DIRS)
-
--SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
-+SET(OpenEXR_LIBRARY_MODULES Iex-2_4 IlmImf-2_4 Half-2_4 Imath-2_4 IlmThread-2_4)
- SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs)
- SET(OpenEXR_LIB_SUFFIXES_REL)
- SET(OpenEXR_LIB_SUFFIXES_DBG)
diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
deleted file mode 100644
index 68a7a7ab86c..00000000000
--- a/srcpkgs/luxmark/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'luxmark'
-pkgname=luxmark
-version=3.1
-revision=9
-build_style=cmake
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- libopenexr-devel MesaLib-devel ocl-icd-devel opencl2-headers boost-devel
- python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
-short_desc="OpenCL benchmark based on LuxCore"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="http://www.luxrender.net/wiki/LuxMark"
-distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz"
-checksum=175cc38f8a3cb73cf2ef25d6e99981456d66e1f9c7fb362522e7e58319c026e6
-
-configure_args=" -DCMAKE_SKIP_RPATH=ON"
-
-post_extract() {
- mv $XBPS_BUILDDIR/luxrender-luxmark* $wrksrc
-}
-
-do_install() {
- vbin build/bin/luxmark
- vmkdir usr/share/luxmark
- vcopy scenes usr/share/luxmark
-}
diff --git a/srcpkgs/luxmark/update b/srcpkgs/luxmark/update
deleted file mode 100644
index 24c7a3b659e..00000000000
--- a/srcpkgs/luxmark/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/api/1.0/repositories/luxrender/luxmark/tags"
-pattern='luxmark_v\K([\d.]+)(?=")'
From 6984b5a3e9d38419707cffb7f78012783215a87f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:03:10 +0100
Subject: [PATCH 442/634] luxrays: remove
---
srcpkgs/luxrays-devel | 1 -
srcpkgs/luxrays/patches/boost.patch | 11 ------
srcpkgs/luxrays/patches/openexr-2_4.patch | 11 ------
srcpkgs/luxrays/template | 45 -----------------------
srcpkgs/luxrays/update | 2 -
5 files changed, 70 deletions(-)
delete mode 120000 srcpkgs/luxrays-devel
delete mode 100644 srcpkgs/luxrays/patches/boost.patch
delete mode 100644 srcpkgs/luxrays/patches/openexr-2_4.patch
delete mode 100644 srcpkgs/luxrays/template
delete mode 100644 srcpkgs/luxrays/update
diff --git a/srcpkgs/luxrays-devel b/srcpkgs/luxrays-devel
deleted file mode 120000
index 7c814520288..00000000000
--- a/srcpkgs/luxrays-devel
+++ /dev/null
@@ -1 +0,0 @@
-luxrays
\ No newline at end of file
diff --git a/srcpkgs/luxrays/patches/boost.patch b/srcpkgs/luxrays/patches/boost.patch
deleted file mode 100644
index dbbf94d3cd0..00000000000
--- a/srcpkgs/luxrays/patches/boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Dependencies.cmake 2015-08-29 23:34:01.000000000 +0200
-+++ - 2018-10-05 21:42:24.139024667 +0200
-@@ -58,7 +58,7 @@
-
- set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0")
-
--set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python)
-+set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python27)
- find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS})
- if (NOT Boost_FOUND)
- # Try again with the other type of libs
diff --git a/srcpkgs/luxrays/patches/openexr-2_4.patch b/srcpkgs/luxrays/patches/openexr-2_4.patch
deleted file mode 100644
index dc59111a0f6..00000000000
--- a/srcpkgs/luxrays/patches/openexr-2_4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Packages/FindOpenEXR.cmake
-+++ cmake/Packages/FindOpenEXR.cmake
-@@ -68,7 +68,7 @@
- ENDFOREACH(i)
- ENDIF(OPENEXR_INCLUDE_DIRS)
-
--SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
-+SET(OpenEXR_LIBRARY_MODULES Iex-2_4 IlmImf-2_4 Half-2_4 Imath-2_4 IlmThread-2_4)
- SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs)
- SET(OpenEXR_LIB_SUFFIXES_REL)
- SET(OpenEXR_LIB_SUFFIXES_DBG)
diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template
deleted file mode 100644
index 4ed0916d282..00000000000
--- a/srcpkgs/luxrays/template
+++ /dev/null
@@ -1,45 +0,0 @@
-# Template file for 'luxrays'
-pkgname=luxrays
-version=3.1
-revision=18
-build_style=cmake
-configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON"
-hostmakedepends="flex bison boost-devel"
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- boost-devel glew-devel opencl2-headers opencl-clhpp libopenexr-devel
- python-devel libfreeglut-devel embree-devel"
-short_desc="LuxMark renderer engine"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="http://www.luxrender.net/wiki/LuxRays"
-distfiles="https://sources.voidlinux.org/${pkgname}-${version}/luxmark_v${version}.tar.gz"
-checksum=f5b67220b72ec261ad51526d5c4550e2f95130565f3aa02a92d40f56593d8064
-
-post_extract() {
- mv $XBPS_BUILDDIR/luxrender-luxrays* $wrksrc
-}
-
-do_install() {
- for B in build/bin/*; do
- vbin $B
- done
-
- for L in build/lib/*; do
- vinstall $L 644 usr/lib
- done
-
- vmkdir usr/include
- vcopy include/* usr/include
-
- vmkdir usr/lib/python2.7
- mv ${DESTDIR}/usr/lib/pyluxcore.so ${DESTDIR}/usr/lib/python2.7
-}
-
-luxrays-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- }
-}
diff --git a/srcpkgs/luxrays/update b/srcpkgs/luxrays/update
deleted file mode 100644
index a32280ed6be..00000000000
--- a/srcpkgs/luxrays/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/api/1.0/repositories/luxrender/luxrays/tags"
-pattern='luxmark_v\K([\d.]+)(?=")'
From 3307c2548e2744246ad93444628aa651e659f316 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:04:16 +0100
Subject: [PATCH 443/634] qucs: remove
---
.../patches/qucsator-fix-list-traversion.patch | 17 -----------------
srcpkgs/qucs/template | 15 ---------------
2 files changed, 32 deletions(-)
delete mode 100644 srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
delete mode 100644 srcpkgs/qucs/template
diff --git a/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch b/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
deleted file mode 100644
index c22a608adc0..00000000000
--- a/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- qucs-core/src/net.cpp.org 2017-09-13 20:47:24.863069583 +0200
-+++ qucs-core/src/net.cpp 2017-09-10 00:16:48.863636748 +0200
-@@ -350,7 +350,13 @@
- void net::sortChildAnalyses (analysis * parent) {
- ptrlist<analysis> * alist = parent->getAnalysis ();
- if (alist != nullptr) {
-- for (auto *a: *alist) {
-+
-+ for (auto it = alist->begin(); it != alist->end(); /* empty */) {
-+ // Copy the value of the element (a pointer), and advance the
-+ // iterator prior to manipulating the list.
-+ analysis *a = *it;
-+ ++it;
-+
- if (a->getType () == ANALYSIS_DC
- || containsAnalysis (a, ANALYSIS_DC)) {
- parent->delAnalysis (a);
diff --git a/srcpkgs/qucs/template b/srcpkgs/qucs/template
deleted file mode 100644
index 4c18a3258c3..00000000000
--- a/srcpkgs/qucs/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'qucs'
-pkgname=qucs
-version=0.0.19
-revision=2
-build_style=gnu-configure
-configure_args="--disable-doc"
-hostmakedepends="ADMS-qucs gperf qt-devel"
-makedepends="qt-devel"
-short_desc="Quite Universal Circuit Simulator"
-maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
-license="GPL-2"
-homepage="http://qucs.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
-checksum="45c6434fde24c533e63550675ac21cdbd3cc6cbba29b82a1dc3f36e7dd4b3b3e"
-nocross="yes" # seems to compile all the way, but seems to link against the wrong libX11 (at least)
From 5d530c96d8ef70b14dfc4225ae9b1e1a20a79d3e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:04:46 +0100
Subject: [PATCH 444/634] removed-packages: add avogadro, luxmark/luxrays, qucs
---
srcpkgs/removed-packages/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3fa87ecb866..6486543934a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -13,6 +13,7 @@ replaces="
apg<=2.2.3_5
arm-mem-git<=20131108_2
arptables<=0.0.4_3
+ avogadro<=1.2.0_8
bokken<=1.8_3
bzr<=2.7.0_1
bzrtools<=2.6.0_4
@@ -150,6 +151,8 @@ replaces="
livewallpaper<=0.5.0_2
llvm3.9<=3.9.1_5
ls++-git<=20140919_3
+ luxmark<=3.1_9
+ luxrays<=3.1_18
mac<=3.99u4b5s7_3
mattermost-desktop<=4.6.0_1
mdds0<=0.12.1_3
@@ -175,6 +178,7 @@ replaces="
python-pyside<=1.2.2_7
python-pytest-relaxed<=1.1.2_2
qimageblitz<=0.0.6_4
+ qucs<=0.0.19_2
r2-bindings<=1.0.1_2
reminiscence<=0.4.6_1
scantailor<=0.9.12.1_2
From e79ccb33416ae50c4040365f31456864c3039e71 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:09:25 +0100
Subject: [PATCH 445/634] qt: remove
---
srcpkgs/qt-designer | 1 -
srcpkgs/qt-designer-devel | 1 -
srcpkgs/qt-designer-libs | 1 -
srcpkgs/qt-devel | 1 -
srcpkgs/qt-devel-tools | 1 -
srcpkgs/qt-doc | 1 -
srcpkgs/qt-host-tools | 1 -
srcpkgs/qt-plugin-mysql | 1 -
srcpkgs/qt-plugin-odbc | 1 -
srcpkgs/qt-plugin-pgsql | 1 -
srcpkgs/qt-plugin-sqlite | 1 -
srcpkgs/qt-qmake | 1 -
srcpkgs/qt/files/assistant.desktop | 8 -
srcpkgs/qt/files/designer.desktop | 9 -
srcpkgs/qt/files/linguist.desktop | 9 -
srcpkgs/qt/files/qtconfig.desktop | 8 -
...t-usage-that-causes-compile-failure-.patch | 34 -
srcpkgs/qt/patches/aarch64.patch | 541 -------------
srcpkgs/qt/patches/fix-alsatest.patch | 13 -
.../patches/fix-bytecompiler_narrowing.patch | 22 -
srcpkgs/qt/patches/fix-itemviews.patch | 14 -
srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch | 13 -
srcpkgs/qt/patches/fix-wtf_typetraits.patch | 25 -
srcpkgs/qt/patches/gcc-8.3.patch | 236 ------
srcpkgs/qt/patches/gcc9-qforeach.patch | 67 --
srcpkgs/qt/patches/improve-cups-support.patch | 84 --
srcpkgs/qt/patches/kde4-settings.patch | 11 -
srcpkgs/qt/patches/libressl-2.8.patch | 31 -
srcpkgs/qt/patches/mips-sgidef.patch | 11 -
srcpkgs/qt/patches/moc-boost-workaround.patch | 12 -
.../qt/patches/moc-syslib-workaround.patch | 11 -
...rc_network_ssl_qsslsocket_openssl_cpp.diff | 34 -
...rk_ssl_qsslsocket_openssl_symbols_cpp.diff | 40 -
srcpkgs/qt/patches/powerpc.patch | 754 ------------------
.../qsettings-recursive-global-mutex.patch | 17 -
srcpkgs/qt/patches/qt-clucene-timeb.patch | 17 -
srcpkgs/qt/patches/qt-gtk-theme-fix.patch | 59 --
srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch | 11 -
srcpkgs/qt/patches/qt-musl.patch | 14 -
srcpkgs/qt/template | 431 ----------
40 files changed, 2548 deletions(-)
delete mode 120000 srcpkgs/qt-designer
delete mode 120000 srcpkgs/qt-designer-devel
delete mode 120000 srcpkgs/qt-designer-libs
delete mode 120000 srcpkgs/qt-devel
delete mode 120000 srcpkgs/qt-devel-tools
delete mode 120000 srcpkgs/qt-doc
delete mode 120000 srcpkgs/qt-host-tools
delete mode 120000 srcpkgs/qt-plugin-mysql
delete mode 120000 srcpkgs/qt-plugin-odbc
delete mode 120000 srcpkgs/qt-plugin-pgsql
delete mode 120000 srcpkgs/qt-plugin-sqlite
delete mode 120000 srcpkgs/qt-qmake
delete mode 100644 srcpkgs/qt/files/assistant.desktop
delete mode 100644 srcpkgs/qt/files/designer.desktop
delete mode 100644 srcpkgs/qt/files/linguist.desktop
delete mode 100644 srcpkgs/qt/files/qtconfig.desktop
delete mode 100644 srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
delete mode 100644 srcpkgs/qt/patches/aarch64.patch
delete mode 100644 srcpkgs/qt/patches/fix-alsatest.patch
delete mode 100644 srcpkgs/qt/patches/fix-bytecompiler_narrowing.patch
delete mode 100644 srcpkgs/qt/patches/fix-itemviews.patch
delete mode 100644 srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch
delete mode 100644 srcpkgs/qt/patches/fix-wtf_typetraits.patch
delete mode 100644 srcpkgs/qt/patches/gcc-8.3.patch
delete mode 100644 srcpkgs/qt/patches/gcc9-qforeach.patch
delete mode 100644 srcpkgs/qt/patches/improve-cups-support.patch
delete mode 100644 srcpkgs/qt/patches/kde4-settings.patch
delete mode 100644 srcpkgs/qt/patches/libressl-2.8.patch
delete mode 100644 srcpkgs/qt/patches/mips-sgidef.patch
delete mode 100644 srcpkgs/qt/patches/moc-boost-workaround.patch
delete mode 100644 srcpkgs/qt/patches/moc-syslib-workaround.patch
delete mode 100644 srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_cpp.diff
delete mode 100644 srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp.diff
delete mode 100644 srcpkgs/qt/patches/powerpc.patch
delete mode 100644 srcpkgs/qt/patches/qsettings-recursive-global-mutex.patch
delete mode 100644 srcpkgs/qt/patches/qt-clucene-timeb.patch
delete mode 100644 srcpkgs/qt/patches/qt-gtk-theme-fix.patch
delete mode 100644 srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch
delete mode 100644 srcpkgs/qt/patches/qt-musl.patch
delete mode 100644 srcpkgs/qt/template
diff --git a/srcpkgs/qt-designer b/srcpkgs/qt-designer
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-designer
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-designer-devel b/srcpkgs/qt-designer-devel
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-designer-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-designer-libs b/srcpkgs/qt-designer-libs
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-designer-libs
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-devel b/srcpkgs/qt-devel
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-devel-tools b/srcpkgs/qt-devel-tools
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-devel-tools
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-doc b/srcpkgs/qt-doc
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-doc
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-host-tools b/srcpkgs/qt-host-tools
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-host-tools
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-mysql b/srcpkgs/qt-plugin-mysql
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-plugin-mysql
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-odbc b/srcpkgs/qt-plugin-odbc
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-plugin-odbc
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-pgsql b/srcpkgs/qt-plugin-pgsql
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-plugin-pgsql
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-sqlite b/srcpkgs/qt-plugin-sqlite
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-plugin-sqlite
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-qmake b/srcpkgs/qt-qmake
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-qmake
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt/files/assistant.desktop b/srcpkgs/qt/files/assistant.desktop
deleted file mode 100644
index 93c392f8a65..00000000000
--- a/srcpkgs/qt/files/assistant.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=assistant-qt4
-Name=Qt Assistant
-GenericName=Qt Document Browser
-Icon=assistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation
diff --git a/srcpkgs/qt/files/designer.desktop b/srcpkgs/qt/files/designer.desktop
deleted file mode 100644
index 4b4edce8696..00000000000
--- a/srcpkgs/qt/files/designer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=designer-qt4
-Name=Qt Designer
-GenericName=Interface Designer
-MimeType=application/x-designer
-Icon=designer
-Terminal=false
-Type=Application
-Categories=Qt;Development;GUIDesigner
diff --git a/srcpkgs/qt/files/linguist.desktop b/srcpkgs/qt/files/linguist.desktop
deleted file mode 100644
index 044a7283a4b..00000000000
--- a/srcpkgs/qt/files/linguist.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=linguist-qt4
-Name=Qt Linguist
-GenericName=Translation Tool
-MimeType=application/x-linguist
-Terminal=false
-Type=Application
-Icon=linguist
-Categories=Qt;Development;Translation
diff --git a/srcpkgs/qt/files/qtconfig.desktop b/srcpkgs/qt/files/qtconfig.desktop
deleted file mode 100644
index 357c52b7256..00000000000
--- a/srcpkgs/qt/files/qtconfig.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Qt Config
-Comment=Configure Qt behavior, styles, fonts
-Exec=qtconfig-qt4
-Icon=qtlogo.png
-Terminal=false
-Type=Application
-Categories=Qt;Settings;
diff --git a/srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
deleted file mode 100644
index 1d23c929f44..00000000000
--- a/srcpkgs/qt/patches/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001
-From: Pavel Heimlich <tropikhajma@gmail.com>
-Date: Wed, 26 Sep 2012 20:31:10 +0200
-Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure
- building nativesdk-qt4-tools
-
-Patch has apparently been rejected upstream, not because it is invalid
-but because the submitter did not submit a merge request for it, so the
-validity of the patch upstream is uncertain. For further details see:
-https://bugreports.qt-project.org/browse/QTBUG-17962
-
-Upstream-Status: Denied [possible retry]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/dbus/qdbusintegrator.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
-index 0f0b647..aa4cbab 100644
---- a/src/dbus/qdbusintegrator.cpp
-+++ b/src/dbus/qdbusintegrator.cpp
-@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
- static bool isDebugging;
- #define qDBusDebug if (!::isDebugging); else qDebug
-
--Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
-+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
-
- static inline QString dbusServiceString()
- { return *orgFreedesktopDBusString(); }
---
-1.8.0
-
diff --git a/srcpkgs/qt/patches/aarch64.patch b/srcpkgs/qt/patches/aarch64.patch
deleted file mode 100644
index b4127f0c304..00000000000
--- a/srcpkgs/qt/patches/aarch64.patch
+++ /dev/null
@@ -1,541 +0,0 @@
---- qt.orig/configure 2017-01-13 19:15:45.711744577 +0100
-+++ qt/configure 2017-01-13 19:28:48.368861990 +0100
-@@ -2812,6 +2812,9 @@
- *86_64)
- PLATFORM=qws/linux-x86_64-g++
- ;;
-+ aarch64)
-+ PLATFORM=qws/linux-aarch64-g++
-+ ;;
- *)
- PLATFORM=qws/linux-generic-g++
- ;;
-@@ -3257,6 +3260,12 @@
- fi
- CFG_HOST_ARCH=arm
- ;;
-+ *:*:aarch64*)
-+ if [ "$OPT_VERBOSE" = "yes" ]; then
-+ echo " AArch64 (aarch64)"
-+ fi
-+ CFG_HOST_ARCH=aarch64
-+ ;;
- Linux:*:sparc*)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " Linux on SPARC"
---- /dev/null
-+++ qt/mkspecs/linux-aarch64-g++/qplatformdefs.h
-@@ -0,0 +1,42 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the qmake spec of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia. For licensing terms and
-+** conditions see http://qt.digia.com/licensing. For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights. These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "../linux-g++/qplatformdefs.h"
---- /dev/null
-+++ qt/mkspecs/linux-aarch64-g++/qmake.conf
-@@ -0,0 +1,28 @@
-+#
-+# qmake configuration for linux-g++
-+#
-+# Written for GNU/Linux platforms that have both lib and lib64 directories,
-+# like the AMD Opteron.
-+#
-+
-+MAKEFILE_GENERATOR = UNIX
-+TARGET_PLATFORM = unix
-+TEMPLATE = app
-+CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-+QT += core gui
-+QMAKE_INCREMENTAL_STYLE = sublib
-+
-+QMAKE_CFLAGS = -fpermissive
-+QMAKE_LFLAGS =
-+
-+QMAKE_CFLAGS_RELEASE += -O2
-+
-+include(../common/linux.conf)
-+include(../common/gcc-base-unix.conf)
-+include(../common/g++-unix.conf)
-+
-+
-+QMAKE_LIBDIR_X11 = /usr/X11R6/lib
-+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-+
-+load(qt_config)
---- /dev/null
-+++ qt/src/corelib/arch/aarch64/qatomic_aarch64.cpp
-@@ -0,0 +1,70 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia. For licensing terms and
-+** conditions see http://qt.digia.com/licensing. For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights. These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <QtCore/qglobal.h>
-+
-+#include <unistd.h>
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+# include <sched.h>
-+#endif
-+#include <time.h>
-+
-+QT_BEGIN_NAMESPACE
-+
-+QT_USE_NAMESPACE
-+
-+Q_CORE_EXPORT void qt_atomic_yield(int *count)
-+{
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+ if((*count)++ < 50) {
-+ sched_yield();
-+ } else
-+#endif
-+ {
-+ struct timespec tm;
-+ tm.tv_sec = 0;
-+ tm.tv_nsec = 2000001;
-+ nanosleep(&tm, NULL);
-+ *count = 0;
-+ }
-+}
-+
-+QT_END_NAMESPACE
---- qt.orig/src/corelib/arch/arch.pri
-+++ qt/src/corelib/arch/arch.pri
-@@ -31,7 +31,9 @@ integrity:HEADERS += arch/qatomic_integr
- arch/qatomic_s390.h \
- arch/qatomic_x86_64.h \
- arch/qatomic_sh.h \
-- arch/qatomic_sh4a.h
-+ arch/qatomic_sh4a.h \
-+ arch/qatomic_aarch64.h \
-+
-
- QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH
- DEPENDPATH += $$QT_ARCH_CPP
---- /dev/null
-+++ qt/include/QtCore/qatomic_aarch64.h
-@@ -0,0 +1 @@
-+#include "../../src/corelib/arch/qatomic_aarch64.h"
---- /dev/null
-+++ qt/src/corelib/arch/qatomic_aarch64.h
-@@ -0,0 +1,335 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia. For licensing terms and
-+** conditions see http://qt.digia.com/licensing. For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights. These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#ifndef QATOMIC_AARCH64_H
-+#define QATOMIC_AARCH64_H
-+
-+QT_BEGIN_HEADER
-+
-+QT_BEGIN_NAMESPACE
-+
-+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isReferenceCountingNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isReferenceCountingWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isTestAndSetNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isTestAndSetWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isFetchAndStoreNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isFetchAndAddNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isFetchAndAddWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
-+{ return false; }
-+
-+#ifndef Q_DATA_MEMORY_BARRIER
-+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb sy\n":::"memory")
-+#endif
-+#ifndef Q_COMPILER_MEMORY_BARRIER
-+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")
-+#endif
-+
-+inline bool QBasicAtomicInt::ref()
-+{
-+ int newValue;
-+
-+ Q_COMPILER_MEMORY_BARRIER;
-+ newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+ Q_COMPILER_MEMORY_BARRIER;
-+
-+ return newValue != 0;
-+}
-+
-+inline bool QBasicAtomicInt::deref()
-+{
-+ int newValue;
-+
-+ Q_COMPILER_MEMORY_BARRIER;
-+ newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+ Q_COMPILER_MEMORY_BARRIER;
-+
-+ return newValue != 0;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
-+{
-+ bool val;
-+
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
-+{
-+ int val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
-+{
-+ int val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
-+{
-+ bool val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
-+{
-+ T *val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
-+{
-+ T *val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
-+{
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ return testAndSetRelaxed(expectedValue, newValue);
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
-+{
-+ int returnValue = fetchAndStoreRelaxed(newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ return fetchAndStoreRelaxed(newValue);
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ int returnValue = fetchAndStoreRelaxed(newValue);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
-+{
-+ int returnValue = fetchAndAddRelaxed(valueToAdd);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ return fetchAndAddRelaxed(valueToAdd);
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ int returnValue = fetchAndAddRelaxed(valueToAdd);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
-+{
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ return testAndSetRelaxed(expectedValue, newValue);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ bool returnValue = testAndSetAcquire(expectedValue, newValue);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
-+{
-+ T *returnValue = fetchAndStoreRelaxed(newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ return fetchAndStoreRelaxed(newValue);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ T *returnValue = fetchAndStoreRelaxed(newValue);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
-+{
-+ T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ return fetchAndAddRelaxed(valueToAdd);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
-+{
-+ Q_DATA_MEMORY_BARRIER;
-+ T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
-+}
-+
-+#undef Q_DATA_MEMORY_BARRIER
-+#undef Q_COMPILER_MEMORY_BARRIER
-+
-+QT_END_NAMESPACE
-+
-+QT_END_HEADER
-+
-+#endif // QATOMIC_AARCH64_H
---- qt.orig/src/corelib/arch/qatomic_arch.h
-+++ qt/src/corelib/arch/qatomic_arch.h
-@@ -94,6 +94,8 @@ QT_BEGIN_HEADER
- # include "QtCore/qatomic_sh4a.h"
- #elif defined(QT_ARCH_NACL)
- # include "QtCore/qatomic_generic.h"
-+#elif defined(QT_ARCH_AARCH64)
-+# include "QtCore/qatomic_aarch64.h"
- #else
- # error "Qt has not been ported to this architecture"
- #endif
-
diff --git a/srcpkgs/qt/patches/fix-alsatest.patch b/srcpkgs/qt/patches/fix-alsatest.patch
deleted file mode 100644
index 900eef2b8a5..00000000000
--- a/srcpkgs/qt/patches/fix-alsatest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Currently alsa-lib is at 1.1.2, thus accept SND_LIB_MINOR > 0 anyway.
-
---- a/config.tests/unix/alsa/alsatest.cpp 2015-05-07 16:14:42.000000000 +0200
-+++ b/config.tests/unix/alsa/alsatest.cpp 2016-09-11 22:51:18.647973737 +0200
-@@ -40,7 +40,7 @@
- ****************************************************************************/
-
- #include <alsa/asoundlib.h>
--#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || (SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))))
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
-
diff --git a/srcpkgs/qt/patches/fix-bytecompiler_narrowing.patch b/srcpkgs/qt/patches/fix-bytecompiler_narrowing.patch
deleted file mode 100644
index 7a164e8b49b..00000000000
--- a/srcpkgs/qt/patches/fix-bytecompiler_narrowing.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix gcc6 -Wnarrowing errors by casting to uint32_t
-
---- a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2015-05-07 16:14:47.000000000 +0200
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-09-11 22:26:00.614829051 +0200
-@@ -176,7 +176,7 @@
- // Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
- ASSERT(!dst || dst == ignoredResult() || !dst->isTemporary() || dst->refCount());
- if (!m_codeBlock->numberOfLineInfos() || m_codeBlock->lastLineInfo().lineNumber != n->lineNo()) {
-- LineInfo info = { instructions().size(), n->lineNo() };
-+ LineInfo info = { (uint32_t)instructions().size(), n->lineNo() };
- m_codeBlock->addLineInfo(info);
- }
- if (m_emitNodeDepth >= s_maxEmitNodeDepth)
-@@ -195,7 +195,7 @@
- void emitNodeInConditionContext(ExpressionNode* n, Label* trueTarget, Label* falseTarget, bool fallThroughMeansTrue)
- {
- if (!m_codeBlock->numberOfLineInfos() || m_codeBlock->lastLineInfo().lineNumber != n->lineNo()) {
-- LineInfo info = { instructions().size(), n->lineNo() };
-+ LineInfo info = { (uint32_t)instructions().size(), n->lineNo() };
- m_codeBlock->addLineInfo(info);
- }
- if (m_emitNodeDepth >= s_maxEmitNodeDepth)
diff --git a/srcpkgs/qt/patches/fix-itemviews.patch b/srcpkgs/qt/patches/fix-itemviews.patch
deleted file mode 100644
index 5b1d601cf44..00000000000
--- a/srcpkgs/qt/patches/fix-itemviews.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This & seems wrong, but the static_cast to QItemSelectionModel::SelectionFlags
-is required anyway to make gcc6 happy.
-
---- a/src/plugins/accessible/widgets/itemviews.cpp 2015-05-07 16:14:48.000000000 +0200
-+++ b/src/plugins/accessible/widgets/itemviews.cpp 2016-09-11 23:17:33.960195447 +0200
-@@ -393,7 +393,7 @@
- QModelIndex index = view()->model()->index(0, column, view()->rootIndex());
- if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection)
- return false;
-- view()->selectionModel()->select(index, QItemSelectionModel::Columns & QItemSelectionModel::Deselect);
-+ view()->selectionModel()->select(index, static_cast<QItemSelectionModel::SelectionFlags>(QItemSelectionModel::Columns & QItemSelectionModel::Deselect));
- return true;
- }
-
diff --git a/srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch b/srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch
deleted file mode 100644
index 2132b9d779a..00000000000
--- a/srcpkgs/qt/patches/fix-qcoloroutput_p_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/xmlpatterns/api/qcoloroutput_p.h 2015-05-07 16:14:48.000000000 +0200
-+++ b/src/xmlpatterns/api/qcoloroutput_p.h 2016-09-11 22:21:15.868628553 +0200
-@@ -70,8 +70,8 @@
- ForegroundShift = 10,
- BackgroundShift = 20,
- SpecialShift = 20,
-- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
-- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
-+ ForegroundMask = ((1 << ForegroundShift) - 1),
-+ BackgroundMask = ((1 << BackgroundShift) - 1)
- };
-
- public:
diff --git a/srcpkgs/qt/patches/fix-wtf_typetraits.patch b/srcpkgs/qt/patches/fix-wtf_typetraits.patch
deleted file mode 100644
index 27d20466c08..00000000000
--- a/srcpkgs/qt/patches/fix-wtf_typetraits.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix type_traits for newer compilers (both, gcc-4.9.4 and gcc-6.2.0)
-There is no std::tr1::has_trivial_constructor etc. anymore.
-
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h 2016-09-12 01:09:46.592885353 +0200
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h 2016-09-12 01:20:07.594161571 +0200
-@@ -166,7 +166,7 @@
- typedef T Type;
- };
-
--#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
-+#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && (__GLIBCXX__ < 20160726) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
-
- // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.
- // VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h 2015-05-07 16:14:45.000000000 +0200
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h 2016-09-12 01:36:22.347445737 +0200
-@@ -179,7 +179,7 @@
- typedef T Type;
- };
-
--#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
-+#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && (__GLIBCXX__ < 20160726) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
-
- // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.
- // VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.
diff --git a/srcpkgs/qt/patches/gcc-8.3.patch b/srcpkgs/qt/patches/gcc-8.3.patch
deleted file mode 100644
index b9b45c31396..00000000000
--- a/srcpkgs/qt/patches/gcc-8.3.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-From 97ec1d1882a83c23c91f0f7daea48e05858d8c32 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Mon, 28 Jan 2019 14:33:12 -0800
-Subject: [PATCH] Fix build with GCC 8.3
-
-Qualifiers in the asm statement are not allowed in the global scope. I
-thought they were necessary for LTO, but I the commit to this file that
-added them predates my work on setting up LTO for GCC.
-
-Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- .../JavaScriptCore/jit/JITStubs.cpp | 48 +++++++++----------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-index 1abdf8b..9f60761 100644
---- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
-@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s
- COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline);
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s
- COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline);
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
- SYMBOL_STRING(ctiTrampoline) ":" "\n"
-@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7."
- #endif
-
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
-@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
- "bx lr" "\n"
- );
-
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
-@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
- "bx lr" "\n"
- );
-
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
-@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-
- #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
- SYMBOL_STRING(ctiTrampoline) ":" "\n"
-@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
- "mov pc, lr" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_
- COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline);
- COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
- "ret" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
- HIDE_SYMBOL(ctiOpThrowNotCaught) "\n"
- SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
- #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7."
- #endif
-
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
-@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
- "bx lr" "\n"
- );
-
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
-@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
- "bx lr" "\n"
- );
-
--asm volatile (
-+asm (
- ".text" "\n"
- ".align 2" "\n"
- ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
-@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
-
- #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
-
--asm volatile (
-+asm (
- ".text\n"
- ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
- HIDE_SYMBOL(ctiTrampoline) "\n"
-@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
- "mov pc, lr" "\n"
- );
-
--asm volatile (
-+asm (
- ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
- HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
- SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
-@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD
- extern "C" { \
- rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
- }; \
-- asm volatile ( \
-+ asm ( \
- ".text" "\n" \
- ".align 2" "\n" \
- ".globl " SYMBOL_STRING(cti_##op) "\n" \
-@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR
- extern "C" { \
- rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
- }; \
-- asm volatile ( \
-+ asm ( \
- ".globl " SYMBOL_STRING(cti_##op) "\n" \
- HIDE_SYMBOL(cti_##op) "\n" \
- SYMBOL_STRING(cti_##op) ":" "\n" \
-
diff --git a/srcpkgs/qt/patches/gcc9-qforeach.patch b/srcpkgs/qt/patches/gcc9-qforeach.patch
deleted file mode 100644
index a5397c9e4fc..00000000000
--- a/srcpkgs/qt/patches/gcc9-qforeach.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# reason: FTBFS with gcc9
-# src: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925811
-
-From c35a3f519007af44c3b364b9af86f6a336f6411b Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Tue, 11 Feb 2014 16:17:46 -0800
-Subject: [PATCH] Redo the Q_FOREACH loop control without GCC statement
- expressions
-
-It's possible to do without them, which probably makes the number of
-supported compilers a lot bigger: they just need to support decltype()
-or __typeof__.
-
-That includes the Intel compiler. The old code was also apparently
-working, but no one had realized the old workaround for some old version
-was still in place.
-
-The loop overhead is more or less the same. I have not done benchmarks,
-but inspection of the generated assembly shows more or less the same
-number of instructions.
-
-Change-Id: I32d499c84a6ddd19d994b49f17a469acb5c3a3f1
-Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
-Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-
-Backported to Qt 4
-
---- a/src/corelib/global/qglobal.h
-+++ b/src/corelib/global/qglobal.h
-@@ -2482,22 +2482,32 @@ typedef uint Flags;
-
- #endif /* Q_NO_TYPESAFE_FLAGS */
-
--#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
-+#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
- /* make use of typeof-extension */
- template <typename T>
- class QForeachContainer {
- public:
-- inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
-+ inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { }
- const T c;
- int brk;
- typename T::const_iterator i, e;
-+ int control;
- };
-
-+// Explanation of the control word:
-+// - it's initialized to 1
-+// - that means both the inner and outer loops start
-+// - if there were no breaks, at the end of the inner loop, it's set to 0, which
-+// causes it to exit (the inner loop is run exactly once)
-+// - at the end of the outer loop, it's inverted, so it becomes 1 again, allowing
-+// the outer loop to continue executing
-+// - if there was a break inside the inner loop, it will exit with control still
-+// set to 1; in that case, the outer loop will invert it to 0 and will exit too
- #define Q_FOREACH(variable, container) \
- for (QForeachContainer<__typeof__(container)> _container_(container); \
-- !_container_.brk && _container_.i != _container_.e; \
-- __extension__ ({ ++_container_.brk; ++_container_.i; })) \
-- for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
-+ _container_.control && _container_.i != _container_.e; \
-+ ++_container_.i, _container_.control ^= 1) \
-+ for (variable = *_container_.i; _container_.control; _container_.control = 0)
-
- #else
-
diff --git a/srcpkgs/qt/patches/improve-cups-support.patch b/srcpkgs/qt/patches/improve-cups-support.patch
deleted file mode 100644
index e0305e11b89..00000000000
--- a/srcpkgs/qt/patches/improve-cups-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
- options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+ if (cups) {
-+ const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+ if (duplex) {
-+ // copy default ppd duplex to qt dialog
-+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+ options.duplexShort->setChecked(true);
-+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+ options.duplexLong->setChecked(true);
-+ else
-+ options.noDuplex->setChecked(true);
-+ }
-+
-+ if (cups->currentPPD()) {
-+ // set default color
-+ if (cups->currentPPD()->color_device)
-+ options.color->setChecked(true);
-+ else
-+ options.grayscale->setChecked(true);
-+ }
-+
-+ // set collation
-+ const ppd_option_t *collate = cups->ppdOption("Collate");
-+ if (collate)
-+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+ }
- }
- #endif
-
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
- && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
- setOutputFormat(QPrinter::PdfFormat);
- }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+ // fill in defaults from ppd file
-+ QCUPSSupport cups;
-+
-+ int printernum = -1;
-+ for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+ printernum = i;
-+ }
-+ if (printernum >= 0) {
-+ cups.setCurrentPrinter(printernum);
-+
-+ const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+ if (duplex) {
-+ // copy default ppd duplex to qt dialog
-+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+ setDuplex(DuplexShortSide);
-+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+ setDuplex(DuplexLongSide);
-+ else
-+ setDuplex(DuplexNone);
-+ }
-+
-+ if (cups.currentPPD()) {
-+ // set default color
-+ if (cups.currentPPD()->color_device)
-+ setColorMode(Color);
-+ else
-+ setColorMode(GrayScale);
-+ }
-+
-+ // set collation
-+ const ppd_option_t *collate = cups.ppdOption("Collate");
-+ if (collate)
-+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+ }
-+#endif
- }
-
- /*!
diff --git a/srcpkgs/qt/patches/kde4-settings.patch b/srcpkgs/qt/patches/kde4-settings.patch
deleted file mode 100644
index 747ca4cfd64..00000000000
--- a/srcpkgs/qt/patches/kde4-settings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui/kernel/qkde.cpp.orig 2015-05-27 11:42:02.507129332 +0200
-+++ b/src/gui/kernel/qkde.cpp 2015-05-27 11:43:26.182875729 +0200
-@@ -63,7 +63,7 @@
- kdeHomePath = QString::fromLocal8Bit(qgetenv("KDEHOME"));
- if (kdeHomePath.isEmpty()) {
- QDir homeDir(QDir::homePath());
-- QString kdeConfDir(QLatin1String("/.kde"));
-+ QString kdeConfDir(QLatin1String("/.kde4"));
- if (4 == X11->desktopVersion && homeDir.exists(QLatin1String(".kde4")))
- kdeConfDir = QLatin1String("/.kde4");
- kdeHomePath = QDir::homePath() + kdeConfDir;
diff --git a/srcpkgs/qt/patches/libressl-2.8.patch b/srcpkgs/qt/patches/libressl-2.8.patch
deleted file mode 100644
index 11b14928811..00000000000
--- a/srcpkgs/qt/patches/libressl-2.8.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-10-28 11:09:30.259495644 +0100
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-10-28 11:10:29.941933269 +0100
-@@ -111,10 +111,10 @@
- DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
- DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
- DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
--DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
-+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
- DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
- DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
--DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
-+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
- DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
- DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
- DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
-
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-10-28 11:20:59.516033387 +0100
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-10-28 11:20:31.770292922 +0100
-@@ -207,10 +207,10 @@
- int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
- long q_BIO_ctrl(BIO *a, int b, long c, void *d);
- int q_BIO_free(BIO *a);
--BIO *q_BIO_new(BIO_METHOD *a);
-+BIO *q_BIO_new(const BIO_METHOD *a);
- BIO *q_BIO_new_mem_buf(void *a, int b);
- int q_BIO_read(BIO *a, void *b, int c);
--BIO_METHOD *q_BIO_s_mem();
-+const BIO_METHOD *q_BIO_s_mem();
- int q_BIO_write(BIO *a, const void *b, int c);
- int q_BN_num_bits(const BIGNUM *a);
- int q_CRYPTO_num_locks();
diff --git a/srcpkgs/qt/patches/mips-sgidef.patch b/srcpkgs/qt/patches/mips-sgidef.patch
deleted file mode 100644
index b0d8181182e..00000000000
--- a/srcpkgs/qt/patches/mips-sgidef.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2015-05-07 16:14:48.000000000 +0200
-+++ qt/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2017-01-14 19:34:43.375000207 +0100
-@@ -336,7 +336,7 @@
- /* CPU(MIPS) - MIPS, any version */
- #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_))
- #define WTF_CPU_MIPS 1
--#include <sgidefs.h>
-+#include <asm/sgidefs.h>
- #if defined(__MIPSEB__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
diff --git a/srcpkgs/qt/patches/moc-boost-workaround.patch b/srcpkgs/qt/patches/moc-boost-workaround.patch
deleted file mode 100644
index 027f8064dcf..00000000000
--- a/srcpkgs/qt/patches/moc-boost-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp 2014-04-10 21:37:12.000000000 +0300
-+++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06 02:24:44.287305916 +0200
-@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
-
- // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
- pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
-
- QByteArray filename;
- QByteArray output;
diff --git a/srcpkgs/qt/patches/moc-syslib-workaround.patch b/srcpkgs/qt/patches/moc-syslib-workaround.patch
deleted file mode 100644
index ac7d5e64830..00000000000
--- a/srcpkgs/qt/patches/moc-syslib-workaround.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2017-02-20 18:21:15.826212874 +0100
-+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2017-02-20 18:23:02.448342205 +0100
-@@ -192,6 +192,8 @@
- pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
- pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
- pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
-+ // Workaround a bug where newer kernel-libc-headers sys/sysmacros.h define macros like major, minor
-+ pp.macros["_SYS_SYSMACROS_H_OUTER"];
-
- QByteArray filename;
- QByteArray output;
diff --git a/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_cpp.diff b/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_cpp.diff
deleted file mode 100644
index c7f7c2e30e2..00000000000
--- a/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_cpp.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_cpp,v 1.4 2016/01/06 17:17:32 zhuk Exp $
-1. Disable SSLv3 by default.
-2. TLSv1_*_method() are TLSv1.0-only, so default to SSLv23_*_method(), which is
- actually TLSv1.* nowadays.
-2a. Make QSsl::TlsV1 also use SSLv23_*_method(), noone in good mind would
- want to run TLSv1.0-only connections, and too many developers fail
- same way due to bad naming.
-
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp.orig Thu May 7 17:14:44 2015
-+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp Wed Jan 6 20:10:23 2016
-@@ -267,16 +267,18 @@ init_context:
- #endif
- break;
- case QSsl::SslV3:
-+#ifndef OPENSSL_NO_SSL3
- ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
-+#else
-+ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
-+#endif
- break;
-- case QSsl::SecureProtocols: // SslV2 will be disabled below
-- case QSsl::TlsV1SslV3: // SslV2 will be disabled below
- case QSsl::AnyProtocol:
-+ case QSsl::SecureProtocols:
-+ case QSsl::TlsV1SslV3:
-+ case QSsl::TlsV1: // this is TLSv1.0 only case, but misused as TLSv1.x too often
- default:
- ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
-- break;
-- case QSsl::TlsV1:
-- ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method());
- break;
- }
- if (!ctx) {
diff --git a/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp.diff b/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp.diff
deleted file mode 100644
index 2f8c6777aac..00000000000
--- a/srcpkgs/qt/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.3 2015/09/17 12:24:42 dcoppa Exp $
-
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig Wed Sep 16 13:27:39 2015
-+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp Wed Sep 16 13:33:06 2015
-@@ -228,13 +228,17 @@ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, re
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #else
-@@ -822,13 +826,17 @@ bool q_resolveOpenSslSymbols()
- #ifndef OPENSSL_NO_SSL2
- RESOLVEFUNC(SSLv2_client_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- RESOLVEFUNC(SSLv3_client_method)
-+#endif
- RESOLVEFUNC(SSLv23_client_method)
- RESOLVEFUNC(TLSv1_client_method)
- #ifndef OPENSSL_NO_SSL2
- RESOLVEFUNC(SSLv2_server_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- RESOLVEFUNC(SSLv3_server_method)
-+#endif
- RESOLVEFUNC(SSLv23_server_method)
- RESOLVEFUNC(TLSv1_server_method)
- RESOLVEFUNC(X509_NAME_entry_count)
diff --git a/srcpkgs/qt/patches/powerpc.patch b/srcpkgs/qt/patches/powerpc.patch
deleted file mode 100644
index b3b0e313571..00000000000
--- a/srcpkgs/qt/patches/powerpc.patch
+++ /dev/null
@@ -1,754 +0,0 @@
-Source: @pullmoll
-Upstream: no (Qt4 is dead)
-Reason: Implement atomic operations like it was done for aarch64 using gcc builtins
-
-diff -rub qt.orig/src/corelib/arch/powerpc/arch.pri qt/src/corelib/arch/powerpc/arch.pri
---- qt.orig/src/corelib/arch/powerpc/arch.pri 2015-05-07 16:14:48.000000000 +0200
-+++ qt/src/corelib/arch/powerpc/arch.pri 2019-06-13 13:29:09.168289246 +0200
-@@ -1,10 +1,4 @@
- #
- # PowerPC architecture
- #
--!*-g++* {
-- *-64 {
-- SOURCES += $$QT_ARCH_CPP/qatomic64.s
-- } else {
-- SOURCES += $$QT_ARCH_CPP/qatomic32.s
-- }
--}
-+SOURCES += $$QT_ARCH_CPP/qatomic_powerpc.cpp
-diff -rub qt.orig/src/corelib/arch/qatomic_powerpc.h qt/corelib/arch/qatomic_powerpc.h
---- qt.orig/src/corelib/arch/qatomic_powerpc.h 2015-05-07 16:14:48.000000000 +0200
-+++ qt/src/corelib/arch/qatomic_powerpc.h 2019-06-13 13:30:55.499295070 +0200
-@@ -101,546 +101,233 @@
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
- { return false; }
-
--#if defined(Q_CC_GNU)
--
--#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) \
-- || (!defined(__64BIT__) && !defined(__powerpc64__) && !defined(__ppc64__))
--# define _Q_VALUE "0, %[_q_value]"
--# define _Q_VALUE_MEMORY_OPERAND "+m" (_q_value)
--# define _Q_VALUE_REGISTER_OPERAND [_q_value] "r" (&_q_value),
--#else
--// On 64-bit with gcc >= 4.2
--# define _Q_VALUE "%y[_q_value]"
--# define _Q_VALUE_MEMORY_OPERAND [_q_value] "+Z" (_q_value)
--# define _Q_VALUE_REGISTER_OPERAND
-+#ifndef Q_DATA_MEMORY_BARRIER
-+# define Q_DATA_MEMORY_BARRIER asm volatile("sync\n":::"memory")
-+#endif
-+#ifndef Q_COMPILER_MEMORY_BARRIER
-+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")
- #endif
-
- inline bool QBasicAtomicInt::ref()
- {
-- register int originalValue;
-- register int newValue;
-- asm volatile("lwarx %[originalValue]," _Q_VALUE "\n"
-- "addi %[newValue], %[originalValue], %[one]\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-12\n"
-- : [originalValue] "=&b" (originalValue),
-- [newValue] "=&r" (newValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [one] "i" (1)
-- : "cc", "memory");
-+ int newValue;
-+
-+ Q_COMPILER_MEMORY_BARRIER;
-+ newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+ Q_COMPILER_MEMORY_BARRIER;
-+
- return newValue != 0;
- }
-
- inline bool QBasicAtomicInt::deref()
- {
-- register int originalValue;
-- register int newValue;
-- asm volatile("lwarx %[originalValue]," _Q_VALUE "\n"
-- "addi %[newValue], %[originalValue], %[minusOne]\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-12\n"
-- : [originalValue] "=&b" (originalValue),
-- [newValue] "=&r" (newValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [minusOne] "i" (-1)
-- : "cc", "memory");
-+ int newValue;
-+
-+ Q_COMPILER_MEMORY_BARRIER;
-+ newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+ Q_COMPILER_MEMORY_BARRIER;
-+
- return newValue != 0;
- }
-
- inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
- {
-- register int result;
-- asm volatile("lwarx %[result]," _Q_VALUE "\n"
-- "xor. %[result], %[result], %[expectedValue]\n"
-- "bne $+12\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-16\n"
-- : [result] "=&r" (result),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [expectedValue] "r" (expectedValue),
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return result == 0;
--}
-+ bool val;
-
--inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
--{
-- register int result;
-- asm volatile("lwarx %[result]," _Q_VALUE "\n"
-- "xor. %[result], %[result], %[expectedValue]\n"
-- "bne $+16\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-16\n"
-- "isync\n"
-- : [result] "=&r" (result),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [expectedValue] "r" (expectedValue),
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return result == 0;
--}
--
--inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
--{
-- register int result;
-- asm volatile("eieio\n"
-- "lwarx %[result]," _Q_VALUE "\n"
-- "xor. %[result], %[result], %[expectedValue]\n"
-- "bne $+12\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-16\n"
-- : [result] "=&r" (result),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [expectedValue] "r" (expectedValue),
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return result == 0;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
- }
-
- inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
- {
-- register int originalValue;
-- asm volatile("lwarx %[originalValue]," _Q_VALUE "\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-8\n"
-- : [originalValue] "=&r" (originalValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return originalValue;
--}
--
--inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
--{
-- register int originalValue;
-- asm volatile("lwarx %[originalValue]," _Q_VALUE "\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-8\n"
-- "isync\n"
-- : [originalValue] "=&r" (originalValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return originalValue;
--}
--
--inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
--{
-- register int originalValue;
-- asm volatile("eieio\n"
-- "lwarx %[originalValue]," _Q_VALUE "\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-8\n"
-- : [originalValue] "=&r" (originalValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return originalValue;
-+ int val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
- }
-
- inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
- {
-- register int originalValue;
-- register int newValue;
-- asm volatile("lwarx %[originalValue]," _Q_VALUE "\n"
-- "add %[newValue], %[originalValue], %[valueToAdd]\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-12\n"
-- : [originalValue] "=&r" (originalValue),
-- [newValue] "=&r" (newValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [valueToAdd] "r" (valueToAdd)
-- : "cc", "memory");
-- return originalValue;
-+ int val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
- }
-
--inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
--{
-- register int originalValue;
-- register int newValue;
-- asm volatile("lwarx %[originalValue]," _Q_VALUE "\n"
-- "add %[newValue], %[originalValue], %[valueToAdd]\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-12\n"
-- "isync\n"
-- : [originalValue] "=&r" (originalValue),
-- [newValue] "=&r" (newValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [valueToAdd] "r" (valueToAdd)
-- : "cc", "memory");
-- return originalValue;
--}
--
--inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
--{
-- register int originalValue;
-- register int newValue;
-- asm volatile("eieio\n"
-- "lwarx %[originalValue]," _Q_VALUE "\n"
-- "add %[newValue], %[originalValue], %[valueToAdd]\n"
-- "stwcx. %[newValue]," _Q_VALUE "\n"
-- "bne- $-12\n"
-- : [originalValue] "=&r" (originalValue),
-- [newValue] "=&r" (newValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [valueToAdd] "r" (valueToAdd)
-- : "cc", "memory");
-- return originalValue;
--}
--
--#if defined(__64BIT__) || defined(__powerpc64__) || defined(__ppc64__)
--# define LPARX "ldarx"
--# define STPCX "stdcx."
--#else
--# define LPARX "lwarx"
--# define STPCX "stwcx."
--#endif
--
- template <typename T>
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
- {
-- register void *result;
-- asm volatile(LPARX" %[result]," _Q_VALUE "\n"
-- "xor. %[result], %[result], %[expectedValue]\n"
-- "bne $+12\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-16\n"
-- : [result] "=&r" (result),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [expectedValue] "r" (expectedValue),
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return result == 0;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
--{
-- register void *result;
-- asm volatile(LPARX" %[result]," _Q_VALUE "\n"
-- "xor. %[result], %[result], %[expectedValue]\n"
-- "bne $+16\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-16\n"
-- "isync\n"
-- : [result] "=&r" (result),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [expectedValue] "r" (expectedValue),
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return result == 0;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
--{
-- register void *result;
-- asm volatile("eieio\n"
-- LPARX" %[result]," _Q_VALUE "\n"
-- "xor. %[result], %[result], %[expectedValue]\n"
-- "bne $+12\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-16\n"
-- : [result] "=&r" (result),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [expectedValue] "r" (expectedValue),
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return result == 0;
-+ bool val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
- }
-
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
- {
-- register T *originalValue;
-- asm volatile(LPARX" %[originalValue]," _Q_VALUE "\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-8\n"
-- : [originalValue] "=&r" (originalValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return originalValue;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
--{
-- register T *originalValue;
-- asm volatile(LPARX" %[originalValue]," _Q_VALUE "\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-8\n"
-- "isync\n"
-- : [originalValue] "=&r" (originalValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return originalValue;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
--{
-- register T *originalValue;
-- asm volatile("eieio\n"
-- LPARX" %[originalValue]," _Q_VALUE "\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-8\n"
-- : [originalValue] "=&r" (originalValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [newValue] "r" (newValue)
-- : "cc", "memory");
-- return originalValue;
-+ T *val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
- }
-
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
- {
-- register T *originalValue;
-- register T *newValue;
-- asm volatile(LPARX" %[originalValue]," _Q_VALUE "\n"
-- "add %[newValue], %[originalValue], %[valueToAdd]\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-12\n"
-- : [originalValue] "=&r" (originalValue),
-- [newValue] "=&r" (newValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [valueToAdd] "r" (valueToAdd * sizeof(T))
-- : "cc", "memory");
-- return originalValue;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
--{
-- register T *originalValue;
-- register T *newValue;
-- asm volatile(LPARX" %[originalValue]," _Q_VALUE "\n"
-- "add %[newValue], %[originalValue], %[valueToAdd]\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-12\n"
-- "isync\n"
-- : [originalValue] "=&r" (originalValue),
-- [newValue] "=&r" (newValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [valueToAdd] "r" (valueToAdd * sizeof(T))
-- : "cc", "memory");
-- return originalValue;
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
--{
-- register T *originalValue;
-- register T *newValue;
-- asm volatile("eieio\n"
-- LPARX" %[originalValue]," _Q_VALUE "\n"
-- "add %[newValue], %[originalValue], %[valueToAdd]\n"
-- STPCX" %[newValue]," _Q_VALUE "\n"
-- "bne- $-12\n"
-- : [originalValue] "=&r" (originalValue),
-- [newValue] "=&r" (newValue),
-- _Q_VALUE_MEMORY_OPERAND
-- : _Q_VALUE_REGISTER_OPERAND
-- [valueToAdd] "r" (valueToAdd * sizeof(T))
-- : "cc", "memory");
-- return originalValue;
--}
--
--#undef LPARX
--#undef STPCX
--#undef _Q_VALUE
--#undef _Q_VALUE_MEMORY_OPERAND
--#undef _Q_VALUE_REGISTER_OPERAND
--
--#else
--
--extern "C" {
-- int q_atomic_test_and_set_int(volatile int *ptr, int expectedValue, int newValue);
-- int q_atomic_test_and_set_acquire_int(volatile int *ptr, int expectedValue, int newValue);
-- int q_atomic_test_and_set_release_int(volatile int *ptr, int expectedValue, int newValue);
-- int q_atomic_test_and_set_ptr(volatile void *ptr, void *expectedValue, void *newValue);
-- int q_atomic_test_and_set_acquire_ptr(volatile void *ptr, void *expectedValue, void *newValue);
-- int q_atomic_test_and_set_release_ptr(volatile void *ptr, void *expectedValue, void *newValue);
-- int q_atomic_increment(volatile int *);
-- int q_atomic_decrement(volatile int *);
-- int q_atomic_set_int(volatile int *, int);
-- int q_atomic_fetch_and_store_acquire_int(volatile int *ptr, int newValue);
-- int q_atomic_fetch_and_store_release_int(volatile int *ptr, int newValue);
-- void *q_atomic_set_ptr(volatile void *, void *);
-- int q_atomic_fetch_and_store_acquire_ptr(volatile void *ptr, void *newValue);
-- int q_atomic_fetch_and_store_release_ptr(volatile void *ptr, void *newValue);
-- int q_atomic_fetch_and_add_int(volatile int *ptr, int valueToAdd);
-- int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int valueToAdd);
-- int q_atomic_fetch_and_add_release_int(volatile int *ptr, int valueToAdd);
-- void *q_atomic_fetch_and_add_ptr(volatile void *ptr, qptrdiff valueToAdd);
-- void *q_atomic_fetch_and_add_acquire_ptr(volatile void *ptr, qptrdiff valueToAdd);
-- void *q_atomic_fetch_and_add_release_ptr(volatile void *ptr, qptrdiff valueToAdd);
--} // extern "C"
--
--
--inline bool QBasicAtomicInt::ref()
--{
-- return q_atomic_increment(&_q_value) != 0;
--}
--
--inline bool QBasicAtomicInt::deref()
--{
-- return q_atomic_decrement(&_q_value) != 0;
--}
--
--inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
--{
-- return q_atomic_test_and_set_int(&_q_value, expectedValue, newValue) != 0;
-+ T *val;
-+ Q_COMPILER_MEMORY_BARRIER;
-+ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return val;
- }
-
- inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
- {
-- return q_atomic_test_and_set_acquire_int(&_q_value, expectedValue, newValue) != 0;
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
- {
-- return q_atomic_test_and_set_release_int(&_q_value, expectedValue, newValue) != 0;
-+ Q_DATA_MEMORY_BARRIER;
-+ return testAndSetRelaxed(expectedValue, newValue);
- }
-
--inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
-+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
- {
-- return q_atomic_set_int(&_q_value, newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
- {
-- return q_atomic_fetch_and_store_acquire_int(&_q_value, newValue);
-+ int returnValue = fetchAndStoreRelaxed(newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
- {
-- return q_atomic_fetch_and_store_release_int(&_q_value, newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return fetchAndStoreRelaxed(newValue);
- }
-
--inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
-+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
- {
-- return q_atomic_fetch_and_add_int(&_q_value, valueToAdd);
-+ Q_DATA_MEMORY_BARRIER;
-+ int returnValue = fetchAndStoreRelaxed(newValue);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
- {
-- return q_atomic_fetch_and_add_acquire_int(&_q_value, valueToAdd);
-+ int returnValue = fetchAndAddRelaxed(valueToAdd);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
- {
-- return q_atomic_fetch_and_add_release_int(&_q_value, valueToAdd);
-+ Q_DATA_MEMORY_BARRIER;
-+ return fetchAndAddRelaxed(valueToAdd);
- }
-
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
-+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
- {
-- return q_atomic_test_and_set_ptr(&_q_value, expectedValue, newValue) != 0;
-+ Q_DATA_MEMORY_BARRIER;
-+ int returnValue = fetchAndAddRelaxed(valueToAdd);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- template <typename T>
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
- {
-- return q_atomic_test_and_set_acquire_ptr(&_q_value, expectedValue, newValue) != 0;
-+ bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- template <typename T>
- Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
- {
-- return q_atomic_test_and_set_release_ptr(&_q_value, expectedValue, newValue) != 0;
-+ Q_DATA_MEMORY_BARRIER;
-+ return testAndSetRelaxed(expectedValue, newValue);
- }
-
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
- {
-- return reinterpret_cast<T *>(q_atomic_set_ptr(&_q_value, newValue));
-+ Q_DATA_MEMORY_BARRIER;
-+ bool returnValue = testAndSetAcquire(expectedValue, newValue);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
- {
-- return reinterpret_cast<T *>(q_atomic_fetch_and_store_acquire_ptr(&_q_value, newValue));
-+ T *returnValue = fetchAndStoreRelaxed(newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
- {
-- return reinterpret_cast<T *>(q_atomic_fetch_and_store_release_ptr(&_q_value, newValue));
-+ Q_DATA_MEMORY_BARRIER;
-+ return fetchAndStoreRelaxed(newValue);
- }
-
- template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
- {
-- return reinterpret_cast<T *>(q_atomic_fetch_and_add_ptr(&_q_value, valueToAdd * sizeof(T)));
-+ Q_DATA_MEMORY_BARRIER;
-+ T *returnValue = fetchAndStoreRelaxed(newValue);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
- }
-+
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
- {
-- return reinterpret_cast<T *>(q_atomic_fetch_and_add_acquire_ptr(&_q_value, valueToAdd * sizeof(T)));
-+ T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+ Q_DATA_MEMORY_BARRIER;
-+ return returnValue;
- }
-
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
- {
-- return reinterpret_cast<T *>(q_atomic_fetch_and_add_release_ptr(&_q_value, valueToAdd * sizeof(T)));
--}
--
--#endif
--
--inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
--{
-- return testAndSetAcquire(expectedValue, newValue);
--}
--
--inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
--{
-- return fetchAndStoreAcquire(newValue);
--}
--
--inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
--{
-- return fetchAndAddAcquire(valueToAdd);
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
--{
-- return testAndSetAcquire(expectedValue, newValue);
--}
--
--template <typename T>
--Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
--{
-- return fetchAndStoreAcquire(newValue);
-+ Q_DATA_MEMORY_BARRIER;
-+ return fetchAndAddRelaxed(valueToAdd);
- }
-
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
- {
-- return fetchAndAddAcquire(valueToAdd);
-+ Q_DATA_MEMORY_BARRIER;
-+ T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+ Q_COMPILER_MEMORY_BARRIER;
-+ return returnValue;
- }
-
-+#undef Q_DATA_MEMORY_BARRIER
-+#undef Q_COMPILER_MEMORY_BARRIER
-+
- QT_END_NAMESPACE
-
- QT_END_HEADER
---- /dev/null
-+++ qt/src/corelib/arch/powerpc/qatomic_powerpc.cpp
-@@ -0,0 +1,70 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia. For licensing terms and
-+** conditions see http://qt.digia.com/licensing. For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights. These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <QtCore/qglobal.h>
-+
-+#include <unistd.h>
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+# include <sched.h>
-+#endif
-+#include <time.h>
-+
-+QT_BEGIN_NAMESPACE
-+
-+QT_USE_NAMESPACE
-+
-+Q_CORE_EXPORT void qt_atomic_yield(int *count)
-+{
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+ if((*count)++ < 50) {
-+ sched_yield();
-+ } else
-+#endif
-+ {
-+ struct timespec tm;
-+ tm.tv_sec = 0;
-+ tm.tv_nsec = 2000001;
-+ nanosleep(&tm, NULL);
-+ *count = 0;
-+ }
-+}
-+
-+QT_END_NAMESPACE
diff --git a/srcpkgs/qt/patches/qsettings-recursive-global-mutex.patch b/srcpkgs/qt/patches/qsettings-recursive-global-mutex.patch
deleted file mode 100644
index 8c66b7a9fa6..00000000000
--- a/srcpkgs/qt/patches/qsettings-recursive-global-mutex.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Calling qsettings before constructing qapplications causes a dead-lock.
-
-http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932
-http://developer.qt.nokia.com/forums/viewthread/10365
-
-
---- a/src/corelib/io/qsettings.cpp.orig
-+++ b/src/corelib/io/qsettings.cpp
-@@ -122,7 +122,7 @@
- Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc)
- Q_GLOBAL_STATIC(PathHash, pathHashFunc)
- Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc)
--Q_GLOBAL_STATIC(QMutex, globalMutex)
-+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive))
- static QSettings::Format globalDefaultFormat = QSettings::NativeFormat;
-
- #ifndef Q_OS_WIN
diff --git a/srcpkgs/qt/patches/qt-clucene-timeb.patch b/srcpkgs/qt/patches/qt-clucene-timeb.patch
deleted file mode 100644
index e3f478fc631..00000000000
--- a/srcpkgs/qt/patches/qt-clucene-timeb.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/3rdparty/clucene/src/CLucene/util/Misc.cpp.orig
-+++ b/src/3rdparty/clucene/src/CLucene/util/Misc.cpp
-@@ -20,11 +20,11 @@
- # endif
- #endif
-
--#ifdef _CL_HAVE_SYS_TIMEB_H
-+#ifndef UNDER_CE
-+#ifdef _defined(_CLCOMPILER_MSVC) || defined(__MINGW32__) || defined(__BORLANDC__)
- # include <sys/timeb.h>
- #endif
--
--#ifdef UNDER_CE
-+#else
- #include <QTime>
- #endif
-
diff --git a/srcpkgs/qt/patches/qt-gtk-theme-fix.patch b/srcpkgs/qt/patches/qt-gtk-theme-fix.patch
deleted file mode 100644
index ee2045ac502..00000000000
--- a/srcpkgs/qt/patches/qt-gtk-theme-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Timo Teräs <timo.teras@iki.fi>
-
-Fix QT GTK style to use GTK API to get the active theme name. This fixes
-things for non-GNOME setups, as well as realtime theme change detection.
-
-It still tries to detect if GTK-Qt is in use and refuse to run with that
-as it would cause obvious recursion, however that might be not always
-possible.
-
---- a/src/gui/styles/qgtkstyle_p.cpp 2013-06-07 05:16:59.000000000 +0000
-+++ b/src/gui/styles/qgtkstyle_p.cpp 2013-09-25 16:37:34.703506640 +0000
-@@ -505,7 +505,7 @@ void QGtkStylePrivate::initGtkWidgets()
-
- static QString themeName;
- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
-- themeName = getThemeName();
-+ themeName = getThemeNameGuess();
-
- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
-@@ -648,7 +648,7 @@ bool QGtkStylePrivate::getGConfBool(cons
- return retVal;
- }
-
--QString QGtkStylePrivate::getThemeName()
-+QString QGtkStylePrivate::getThemeNameGuess()
- {
- QString themeName;
- // We try to parse the gtkrc file first
-@@ -685,6 +685,19 @@ QString QGtkStylePrivate::getThemeName()
-
- return themeName;
- }
-+
-+QString QGtkStylePrivate::getThemeName()
-+{
-+ QString themeName;
-+ gchar *theme_name;
-+
-+ GtkSettings *settings = gtk_settings_get_default();
-+ g_object_get(settings, "gtk-theme-name", &theme_name, NULL);
-+ themeName = QString::fromUtf8(theme_name);
-+ g_free(theme_name);
-+
-+ return themeName;
-+}
-
- // Get size of the arrow controls in a GtkSpinButton
- int QGtkStylePrivate::getSpinboxArrowSize() const
---- a/src/gui/styles/qgtkstyle_p.h 2013-06-07 05:16:59.000000000 +0000
-+++ b/src/gui/styles/qgtkstyle_p.h 2013-09-25 16:29:11.310167033 +0000
-@@ -338,6 +338,7 @@ public:
- static bool getGConfBool(const QString &key, bool fallback = 0);
- static QString getGConfString(const QString &key, const QString &fallback = QString());
-
-+ static QString getThemeNameGuess();
- static QString getThemeName();
- virtual int getSpinboxArrowSize() const;
-
diff --git a/srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch b/srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch
deleted file mode 100644
index 35380ad6714..00000000000
--- a/srcpkgs/qt/patches/qt-musl-iconv-no-bom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig
-+++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp
-@@ -62,7 +62,7 @@
- #elif defined(Q_OS_AIX)
- # define NO_BOM
- # define UTF16 "UCS-2"
--#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
-+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
- # define NO_BOM
- # if Q_BYTE_ORDER == Q_BIG_ENDIAN
- # define UTF16 "UTF-16BE"
diff --git a/srcpkgs/qt/patches/qt-musl.patch b/srcpkgs/qt/patches/qt-musl.patch
deleted file mode 100644
index 90b9ccda08c..00000000000
--- a/srcpkgs/qt/patches/qt-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig
-+++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h
-@@ -86,11 +86,7 @@
-
- #undef QT_SOCKLEN_T
-
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
- #define QT_SOCKLEN_T socklen_t
--#else
--#define QT_SOCKLEN_T int
--#endif
-
- #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
- #define QT_SNPRINTF ::snprintf
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
deleted file mode 100644
index 6f6f9771e12..00000000000
--- a/srcpkgs/qt/template
+++ /dev/null
@@ -1,431 +0,0 @@
-# Template file for 'qt'
-pkgname=qt
-version=4.8.7
-revision=29
-_distname=qt-everywhere-opensource-src
-patch_args="-Np1"
-wrksrc=${_distname}-${version}
-homepage="https://qt.io/"
-short_desc="A cross-platform application and UI framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3, LGPL-2.1"
-distfiles="https://download.qt.io/archive/qt/${version%.*}/${version}/${_distname}-${version}.tar.gz"
-checksum=e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
-
-hostmakedepends="perl sqlite pkg-config"
-makedepends="
- MesaLib-devel libressl-devel unixodbc-devel libXv-devel libXinerama-devel
- libXrandr-devel libXcursor-devel glib-devel cups-devel sqlite-devel
- alsa-lib-devel libmng-devel libSM-devel gtk+-devel libnotify-devel
- libmysqlclient-devel postgresql-libs-devel pulseaudio-devel tslib-devel"
-depends="qtchooser hicolor-icon-theme"
-replaces="qt-qtconfig>=0"
-
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse -Wno-class-memaccess"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-qmake qt-host-tools"
- LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib"
-fi
-case "$XBPS_TARGET_MACHINE" in
- mips*) broken="Serveral Assembler messages: Error: branch out of range" ;;
-esac
-
-do_configure() {
- local _opts _spec
- echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
- echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/plugins/accessible/qaccessiblebase.pri
- echo "QMAKE_LFLAGS += -Wl,-rpath-link,${wrksrc}/lib" >> mkspecs/features/help.prf
-
- _opts+=" -confirm-license"
- _opts+=" -opensource"
- _opts+=" -prefix /usr"
- _opts+=" -sysconfdir /etc"
- _opts+=" -bindir /usr/lib/qt/bin"
- _opts+=" -datadir /usr/share/qt"
- _opts+=" -docdir /usr/share/doc/qt"
- _opts+=" -plugindir /usr/lib/qt/plugins"
- _opts+=" -importdir /usr/lib/qt/imports"
- _opts+=" -translationdir /usr/share/qt/translations"
-
- if [ -n "$CROSS_BUILD" ]; then
- _opts+=" -force-pkg-config"
- _opts+=" -continue"
- _opts+=" -xplatform ${CXX}"
- _opts+=" -exceptions"
- _opts+=" -make libs"
- _opts+=" -make tools"
- _opts+=" -make docs"
- _opts+=" -make translations"
- _opts+=" -qt3support"
- case "$XBPS_TARGET_MACHINE" in
- armv5tel)
- _opts+=" -arch arm"
- _spec="arm-linux-gnueabi-c++"
- ;;
- armv5tel-musl)
- _opts+=" -arch arm"
- _spec="arm-linux-musleabi-c++"
- ;;
- armv6l)
- _opts+=" -arch arm"
- _spec="arm-linux-gnueabihf-c++"
- ;;
- armv6l-musl)
- _opts+=" -arch arm"
- _spec="arm-linux-musleabihf-c++"
- ;;
- armv7l)
- _opts+=" -arch arm"
- _spec="armv7l-linux-gnueabihf-c++"
- ;;
- armv7l-musl)
- _opts+=" -arch arm"
- _spec="armv7l-linux-musleabihf-c++"
- ;;
- aarch64)
- _opts+=" -arch aarch64"
- _spec="aarch64-linux-gnu-c++"
- ;;
- aarch64-musl)
- _opts+=" -arch aarch64"
- _spec="aarch64-linux-musl-c++"
- ;;
- mips-musl)
- _opts+=" -arch mips"
- _spec="mips-linux-musl-c++"
- ;;
- mipshf-musl)
- _opts+=" -arch mips"
- _spec="mips-linux-muslhf-c++"
- ;;
- mipsel-musl)
- _opts+=" -arch mips"
- _spec="mipsel-linux-musl-c++"
- ;;
- mipselhf-musl)
- _opts+=" -arch mips"
- _spec="mipsel-linux-muslhf-c++"
- ;;
- ppc64le)
- _opts+=" -arch powerpc"
- _spec="powerpc64le-linux-gnu-c++"
- ;;
- ppc64le-musl)
- _opts+=" -arch powerpc"
- _spec="powerpc64le-linux-musl-c++"
- ;;
- ppc64)
- _opts+=" -arch powerpc"
- _spec="powerpc64-linux-gnu-c++"
- ;;
- ppc64-musl)
- _opts+=" -arch powerpc"
- _spec="powerpc64-linux-musl-c++"
- ;;
- ppc)
- _opts+=" -arch powerpc"
- _spec="powerpc-linux-gnu-c++"
- ;;
- ppc-musl)
- _opts+=" -arch powerpc"
- _spec="powerpc-linux-musl-c++"
- ;;
- ppcle)
- _opts+=" -arch powerpc"
- _spec="powerpcle-linux-gnu-c++"
- ;;
- ppcle-musl)
- _opts+=" -arch powerpc"
- _spec="powerpcle-linux-musl-c++"
- ;;
- *-musl)
- _opts+=" -arch arm"
- _spec="${XBPS_TARGET_MACHINE}-linux-musl-c++"
- ;;
- *)
- _opts+=" -arch arm"
- _spec="${XBPS_TARGET_MACHINE}-linux-gnu-c++"
- ;;
- esac
- mkdir -p mkspecs/${_spec}
- cat > mkspecs/${_spec}/qmake.conf << _EOF
-#
-# qmake specification for ${_spec}
-#
-MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
-TEMPLATE = app
-CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
-QMAKE_INCREMENTAL_STYLE = sublib
-
-include(../common/linux.conf)
-include(../common/gcc-base-unix.conf)
-QMAKE_CC = ${CC}
-QMAKE_LINK_C = ${CC}
-QMAKE_LINK_C_SHLIB = ${CC}
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
-QMAKE_CXX = ${CXX}
-QMAKE_LINK = ${CXX}
-QMAKE_LINK_SHLIB = ${CXX}
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
-QMAKE_PCH_OUTPUT_EXT = .gch
-QMAKE_CFLAGS_PRECOMPILE = -x c-header -c \${QMAKE_PCH_INPUT} -o \${QMAKE_PCH_OUTPUT}
-QMAKE_CFLAGS_USE_PRECOMPILE = -include \${QMAKE_PCH_OUTPUT_BASE}
-QMAKE_CXXFLAGS_PRECOMPILE = -x c++-header -c \${QMAKE_PCH_INPUT} -o \${QMAKE_PCH_OUTPUT}
-QMAKE_CXXFLAGS_USE_PRECOMPILE = -include \${QMAKE_PCH_OUTPUT_BASE}
-QMAKE_LFLAGS_RELEASE += -Wl,-O1 -Wl,-rpath,${wrksrc}/lib
-QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
-
-load(qt_config)
-_EOF
- cat > mkspecs/${_spec}/qplatformdefs.h << _EOF
-#include "../linux-g++/qplatformdefs.h"
-_EOF
-
- # Force enable qfilesystemwatcher_{i,d}notify
- cat >> src/corelib/io/io.pri << _EOF
-SOURCES += io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_dnotify.cpp
-HEADERS += io/qfilesystemwatcher_inotify_p.h io/qfilesystemwatcher_dnotify_p.h
-_EOF
-
- # qmake CFLAGS/LDFLAGS
- sed -i configure \
- -e '/outpath\/qmake\".*\"\$MAKE\")/s/)/ CC=gcc CXX=g++ LINK=g++ QMAKE_CFLAGS="$XBPS_CFLAGS" QMAKE_CXXFLAGS="$XBPS_CXXFLAGS" QMAKE_LFLAGS="$XBPS_LDFLAGS" )/' \
- -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
- -e 's/5\*\|4\*\|3\.4\*)/8*|7*|6*|&/'
- export PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig
- export PKG_CONFIG_LIBDIR=${XBPS_CROSS_BASE}/usr/lib/pkgconfig
- export PKG_CONFIG_SYSROOT_DIR=${XBPS_CROSS_BASE}
-
- else
- # qmake CFLAGS/LDFLAGS
- sed -i configure \
- -e '/outpath\/qmake\".*\"\$MAKE\")/s/)/ QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" )/' \
- -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/'
- fi
-
- _opts+=" -nomake demos"
- _opts+=" -nomake examples"
- _opts+=" -openssl-linked"
- _opts+=" -xmlpatterns"
- _opts+=" -no-webkit"
- _opts+=" -gtkstyle"
- _opts+=" -system-sqlite"
- _opts+=" -shared"
- _opts+=" -graphicssystem raster"
- _opts+=" -no-icu"
- _opts+=" -no-openvg"
- _opts+=" -no-phonon"
- _opts+=" -no-phonon-backend"
- _opts+=" -no-pch"
- _opts+=" -no-rpath"
- _opts+=" -optimized-qmake"
- _opts+=" -no-reduce-relocations"
- _opts+=" -dbus-linked"
- _opts+=" -silent"
- # _opts+=" -v"
-
- echo "=== ./configure ${_opts}"
- export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
- export LD="$CXX"
- export QMAKE_CFLAGS="${CFLAGS}"
- export QMAKE_CXXFLAGS="${CXXFLAGS}"
- export QMAKE_LFLAGS="${LDFLAGS} -Wl,-rpath,${wrksrc}/lib"
- ./configure ${_opts}
-}
-do_build() {
- local _f
- if [ -n "$CROSS_BUILD" ]; then
- # Replace binaries for host
- find -name Makefile\* -exec sed -i "{}" -e"s;/builddir/.*/bin/;/usr/lib/qt/bin/;g" \;
- # Build qmake for the target
- echo "=== Building qmake for the target ${XBPS_TARGET_MACHINE}"
- mv bin/qmake{,-host}
- sed -i qmake/Makefile \
- -e"s;^\(CC =\).*;\1 ${CC};" \
- -e"s;^\(CXX =\).*;\1 ${CXX};" \
- -e"s;^\(QMAKE_CFLAGS =\).*;\1 ${CFLAGS};" \
- -e"s;^\(QMAKE_CXXFLAGS =\).*;\1 ${CXXFLAGS};" \
- -e"s;^\(QMAKE_LFLAGS =\).*;\1 ${LDFLAGS};"
- cd qmake
- make clean
- make ${makejobs}
- cd ${wrksrc}
- mv bin/qmake{,-target}
- mv bin/qmake{-host,}
- cd ${wrksrc}
- fi
- export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
- export LD="$CXX"
- make ${makejobs}
-}
-do_install() {
- local hicolordir=${DESTDIR}/usr/share/icons/hicolor
-
- make INSTALL_ROOT=${DESTDIR} install
-
- # install missing qatomic_aarch64.h
- # TODO: find better fix (add to install targets?)
- install -D -m644 src/corelib/arch/qatomic_aarch64.h ${DESTDIR}/usr/include/QtCore/
- install -D -m644 src/corelib/arch/qatomic_aarch64.h ${DESTDIR}/usr/include/Qt/
-
- # delete tests
- rm -rf ${DESTDIR}/usr/tests
-
- # install missing icons and desktop files
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -D -m644 ${icon} \
- ${hicolordir}/${size}x${size}/apps/linguist.png
- done
- install -Dm644 src/gui/dialogs/images/qtlogo-64.png \
- ${hicolordir}/64x64/apps/qtlogo.png
- install -Dm644 src/gui/dialogs/images/qtlogo-64.png \
- ${DESTDIR}/usr/share/pixmaps/qtlogo.png
- install -Dm644 tools/assistant/tools/assistant/images/assistant.png \
- ${hicolordir}/32x32/apps/assistant.png
- install -Dm644 tools/designer/src/designer/images/designer.png \
- ${hicolordir}/128x128/apps/designer.png
- install -d ${DESTDIR}/usr/share/applications
- install -m644 ${FILESDIR}/*.desktop \
- ${DESTDIR}/usr/share/applications
-
- vlicense LGPL_EXCEPTION.txt
-
- vmkdir usr/bin
- for f in ${DESTDIR}/usr/lib/qt/bin/*; do
- ln -s /usr/lib/qt/bin/$(basename $f) ${DESTDIR}/usr/bin/$(basename $f)-qt4
- done
-
- # Remove wrong stuff
- rm -rf ${DESTDIR}/usr/{examples,demos}
-
- # Clean generated qmake.conf reference to builddir
- find -name qmake.conf -exec sed -i "{}" -e"s; -Wl,-rpath,/builddir.*;;" \;
-
- # For a cross build replace qmake with the target binary
- if [ -f ${wrksrc}/bin/qmake-target ]; then
- mv ${wrksrc}/bin/qmake-target ${DESTDIR}/usr/lib/qt/bin/qmake
- ln -s /usr/lib/qt/bin/qmake ${DESTDIR}/usr/bin/qmake-qt4
- fi
-}
-
-qt-doc_package() {
- depends="qt-devel-tools>=${version}_${revision}"
- short_desc+=" - Documentation"
- pkg_install() {
- vmove usr/share/doc/qt
- }
-}
-qt-designer_package() {
- depends="hicolor-icon-theme qt-designer-libs>=${version}_${revision}"
- short_desc+=" - GUI designer"
- pkg_install() {
- vmove usr/bin/designer-qt4
- vmove usr/lib/qt/bin/designer
- vmove usr/lib/qt/plugins/designer
- vmove "usr/share/icons/hicolor/128x128/apps/designer.*"
- vmove "usr/share/applications/designer.*"
- vmove "usr/share/qt/translations/designer*"
- }
-}
-qt-designer-libs_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - GUI designer libraries"
- pkg_install() {
- vmove usr/lib/libQtDesigner.so.*
- vmove usr/lib/libQtDesignerComponents.so.*
- }
-}
-qt-designer-devel_package() {
- depends="qt-designer-libs>=${version}_${revision}"
- short_desc+=" - GUI designer development"
- pkg_install() {
- vmove usr/lib/libQtDesigner.so
- vmove usr/lib/libQtDesignerComponents.so
- }
-}
-qt-host-tools_package() {
- short_desc+=" - host tools"
- pkg_install() {
- for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \
- rcc uic uic3; do
- if [ -f "${DESTDIR}/usr/lib/qt/bin/${f}" ]; then
- vmove usr/lib/qt/bin/${f}
- fi
- done
- }
-}
-qt-devel-tools_package() {
- depends="hicolor-icon-theme"
- short_desc+=" - development tools"
- pkg_install() {
- for f in assistant lconvert linguist pixeltool qcollectiongenerator \
- qhelpgenerator qhelpconverter xmlpatterns xmlpatternsvalidator \
- qttracereplay qdoc3 qmlviewer; do
- if [ -f "${DESTDIR}/usr/lib/qt/bin/${f}" ]; then
- vmove usr/bin/${f}-qt4
- vmove usr/lib/qt/bin/${f}
- fi
- done
- vmove usr/share/icons/hicolor
- for f in linguist assistant; do
- vmove usr/share/applications/${f}.desktop
- [ ! -f ${DESTDIR}/usr/share/pixmaps/${f}.png ] && continue
- vmove usr/share/pixmaps/${f}.png
- done
- vmove usr/share/qt/phrasebooks
- }
-}
-qt-devel_package() {
- depends="qt-qmake qt-devel-tools qt-host-tools libX11-devel qt>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \
- rcc uic uic3; do
- if [ -f "${DESTDIR}/usr/bin/${f}-qt4" ]; then
- vmove usr/bin/${f}-qt4
- fi
- done
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.prl"
- vmove usr/lib/pkgconfig
- }
-}
-
-qt-plugin-odbc_package() {
- short_desc+=" - ODBC plugin"
- pkg_install() {
- vmove usr/lib/qt/plugins/sqldrivers/libqsqlodbc.so
- }
-}
-qt-plugin-pgsql_package() {
- short_desc+=" - PostgreSQL plugin"
- pkg_install() {
- vmove usr/lib/qt/plugins/sqldrivers/libqsqlpsql.so
- }
-}
-qt-plugin-mysql_package() {
- short_desc+=" - MySQL plugin"
- pkg_install() {
- vmove usr/lib/qt/plugins/sqldrivers/libqsqlmysql.so
- }
-}
-qt-plugin-sqlite_package() {
- short_desc+=" - SQLite plugin"
- pkg_install() {
- vmove usr/lib/qt/plugins/sqldrivers/libqsqlite.so
- }
-}
-qt-qmake_package() {
- short_desc+=" - qmake Makefile generator tool"
- pkg_install() {
- vmove usr/bin/qmake-qt4
- vmove usr/lib/qt/bin/qmake
- vmove usr/share/qt/mkspecs
- }
-}
From 6bc1daa4ca6265ea3d2b17f3d1990a4fc27cf8ba Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:11:12 +0100
Subject: [PATCH 446/634] removed-packages: add qt and bump
---
srcpkgs/removed-packages/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6486543934a..f5152ea1fc3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=16
+revision=17
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -179,6 +179,7 @@ replaces="
python-pytest-relaxed<=1.1.2_2
qimageblitz<=0.0.6_4
qucs<=0.0.19_2
+ qt<=4.8.7_29
r2-bindings<=1.0.1_2
reminiscence<=0.4.6_1
scantailor<=0.9.12.1_2
From d0c394d3ffd2c152f217de72c7540ddb4baa7440 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:13:58 +0100
Subject: [PATCH 447/634] removed-packages: add missing devel/plugin packages
and bump again
---
srcpkgs/removed-packages/template | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f5152ea1fc3..aff755a9eaa 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=17
+revision=18
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -14,6 +14,7 @@ replaces="
arm-mem-git<=20131108_2
arptables<=0.0.4_3
avogadro<=1.2.0_8
+ avogadro-devel<=1.2.0_8
bokken<=1.8_3
bzr<=2.7.0_1
bzrtools<=2.6.0_4
@@ -153,6 +154,7 @@ replaces="
ls++-git<=20140919_3
luxmark<=3.1_9
luxrays<=3.1_18
+ luxrays-devel<=3.1_18
mac<=3.99u4b5s7_3
mattermost-desktop<=4.6.0_1
mdds0<=0.12.1_3
@@ -180,6 +182,18 @@ replaces="
qimageblitz<=0.0.6_4
qucs<=0.0.19_2
qt<=4.8.7_29
+ qt-designer<=4.8.7_29
+ qt-designer-devel<=4.8.7_29
+ qt-designer-libs<=4.8.7_29
+ qt-devel<=4.8.7_29
+ qt-devel-tools<=4.8.7_29
+ qt-doc<=4.8.7_29
+ qt-host-tools<=4.8.7_29
+ qt-plugin-mysql<=4.8.7_29
+ qt-plugin-odbc<=4.8.7_29
+ qt-plugin-pgsql<=4.8.7_29
+ qt-plugin-sqlite<=4.8.7_29
+ qt-qmake<=4.8.7_29
r2-bindings<=1.0.1_2
reminiscence<=0.4.6_1
scantailor<=0.9.12.1_2
From 443a21835781bf885643418cab8c94142315ceb3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:25:59 +0100
Subject: [PATCH 448/634] xlennart: remove
upstream dead, depends on gtk2
---
srcpkgs/xlennart/template | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 srcpkgs/xlennart/template
diff --git a/srcpkgs/xlennart/template b/srcpkgs/xlennart/template
deleted file mode 100644
index 2eb0f357099..00000000000
--- a/srcpkgs/xlennart/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'xlennart'
-pkgname=xlennart
-version=1.1.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+-devel"
-maintainer="Orphaned <orphan@voidlinux.org>"
-short_desc="XBill game modification"
-homepage="https://github.com/Xylemon/xlennart"
-license="GPL-2"
-distfiles="https://github.com/Xylemon/xlennart/archive/${version}.tar.gz"
-checksum=c614db5e7cc0e64469b7dbf6957170ff14e93b580e7ca1885e94041a5102bd57
From def5fd90f81bf4f3145d3f8aa6d8621eb7858afb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:27:25 +0100
Subject: [PATCH 449/634] removed-packages: add xlennart
---
srcpkgs/removed-packages/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index aff755a9eaa..225594dc4b8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -214,6 +214,7 @@ replaces="
wireguard-go<=0.0.20181222_2
wireshark-gtk<=3.0.7_1
libxnoise<=0.2.21_4
+ xlennart<=1.1.1_1
xnoise<=0.2.21_4
xnoise-devel<=0.2.21_4
yt-play<=20140117_2
From 2baf8135e8a36864356f0693112c8e9a8a95cebc Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sun, 31 Jan 2021 04:53:23 -0800
Subject: [PATCH 450/634] tintin: take ownership
---
srcpkgs/tintin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tintin/template b/srcpkgs/tintin/template
index 14fadd6d4da..4bedfe3ab04 100644
--- a/srcpkgs/tintin/template
+++ b/srcpkgs/tintin/template
@@ -7,7 +7,7 @@ build_wrksrc=src
build_style=gnu-configure
makedepends="zlib-devel pcre-devel readline-devel gnutls-devel"
short_desc="Console-based MUD client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michael Taboada <voidpkgs@forwardme.email>"
license="GPL-2.0-or-later"
homepage="http://tintin.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/tintin/${pkgname}-${version}.tar.gz"
From 9d4bc45462318a650cc92f0aac875ee9e7882ed2 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 30 Jan 2021 18:46:07 +0100
Subject: [PATCH 451/634] dbeaver: update to 7.3.3.
also add eclipse as dependency, which is required for dbeaver to run.
---
srcpkgs/dbeaver/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index e09a1fdf757..b7e98801631 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,16 +1,17 @@
# Template file for 'dbeaver'
pkgname=dbeaver
-version=7.3.2
+version=7.3.3
revision=1
# the build downloads binaries linked to glibc
archs="x86_64"
hostmakedepends="apache-maven"
+depends="openjdk11" # openjdk11 or later version, when available
short_desc="Free Universal Database Tool"
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="Apache-2.0"
homepage="https://dbeaver.io"
distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=9b37ef875771cfb34507d5423965ce1e79d263a31c245c46a89b44f01c4d9c85
+checksum=8b4cff6a1e172da763373ddc7df554569f53a0c529175e540d4b64ed2b7066d9
nopie=true
do_build() {
From 91567a91e5911dd372f4a48a77dfca9790ae799f Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sat, 30 Jan 2021 11:59:27 +0300
Subject: [PATCH 452/634] eiskaltdcpp-qt: update to 2.4.1
+ Drop patches which came from upstream.
+ Static linking with libeiskaltdcpp.
+ Remove build dependency from Boost libraries.
+ Disable usage of Aspell libraries.
+ Enable support of Lua scripts.
+ Enable support of SQLite database.
+ New maintainer of package.
---
srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch | 65 -------------------
srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch | 36 ----------
srcpkgs/eiskaltdcpp-qt/patches/musl.patch | 31 ++++++---
.../eiskaltdcpp-qt/patches/upnpc.cpp.patch | 30 ---------
srcpkgs/eiskaltdcpp-qt/template | 19 +++---
5 files changed, 32 insertions(+), 149 deletions(-)
delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch
delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch
delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch b/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch
deleted file mode 100644
index 50603313aeb..00000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- dcpp/Util.cpp 2015-04-20 02:57:16.000000000 +0500
-+++ dcpp/Util.cpp.new 2017-10-09 15:00:00.000000000 +0500
-@@ -171,8 +171,8 @@
- ::GetShortPathName(localePath_.c_str(), buf, sizeof(buf)/sizeof(TCHAR));
- if (Util::getPath(Util::PATH_LOCALE).empty())
- paths[PATH_LOCALE] = Text::fromT(buf);
-- if (Util::getPath(Util::PATH_DOWNLOADS).empty())
-- paths[PATH_DOWNLOADS] = getDownloadsPath(paths[PATH_USER_CONFIG]);
-+ //if (Util::getPath(Util::PATH_DOWNLOADS).empty())
-+ // paths[PATH_DOWNLOADS] = getDownloadsPath(paths[PATH_USER_CONFIG]);
-
- #else
- if (Util::getPath(Util::PATH_GLOBAL_CONFIG).empty())
-@@ -704,7 +704,7 @@
- #endif
- }
-
--vector<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> addresses;
-
- #ifdef HAVE_IFADDRS_H
-@@ -712,6 +712,9 @@
-
- if (getifaddrs(&ifap) == 0)
- {
-+ bool ipv4 = (sa_family == AF_UNSPEC) || (sa_family == AF_INET);
-+ bool ipv6 = (sa_family == AF_UNSPEC) || (sa_family == AF_INET6);
-+
- for (struct ifaddrs *i = ifap; i != NULL; i = i->ifa_next)
- {
- struct sockaddr *sa = i->ifa_addr;
-@@ -723,14 +726,14 @@
- socklen_t len;
-
- // IPv4 address
-- if (sa->sa_family == AF_INET)
-+ if (ipv4 && (sa->sa_family == AF_INET))
- {
- struct sockaddr_in* sai = (struct sockaddr_in*)sa;
- src = (void*) &(sai->sin_addr);
- len = INET_ADDRSTRLEN;
- }
- // IPv6 address
-- else if (sa->sa_family == AF_INET6)
-+ else if (ipv6 && (sa->sa_family == AF_INET6))
- {
- struct sockaddr_in6* sai6 = (struct sockaddr_in6*)sa;
- src = (void*) &(sai6->sin6_addr);
-@@ -752,9 +755,13 @@
-
- return addresses;
- }
--string Util::getLocalIp() {
-+string Util::getLocalIp(unsigned short as_family) {
- #ifdef HAVE_IFADDRS_H
-- return getLocalIPs().empty() ? "0.0.0.0" : getLocalIPs()[0];
-+ vector<string> addresses = getLocalIPs(as_family);
-+ if (addresses.empty())
-+ return (((as_family == AF_UNSPEC) || (as_family == AF_INET)) ? "0.0.0.0" : "::");
-+
-+ return addresses[0];
- #else
- string tmp;
-
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch b/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch
deleted file mode 100644
index 615f1b11aa3..00000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- dcpp/Util.h 2015-04-20 02:57:16.000000000 +0500
-+++ dcpp/Util.h.new 2017-10-09 15:00:00.000000000 +0500
-@@ -28,6 +28,13 @@
-
- #include <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -270,7 +270,7 @@
- #ifdef _WIN32
- return _atoi64(aString.c_str());
- #else
-- #ifndef __HAIKU__
-+ #if !defined(__HAIKU__) && defined(__GLIBC__)
- return strtoq(aString.c_str(), (char **)NULL, 10);
- #else
- return strtoll(aString.c_str(), (char **)NULL, 10);
-@@ -403,8 +410,8 @@
- }
-
- static string encodeURI(const string& /*aString*/, bool reverse = false);
-- static string getLocalIp();
-- static std::vector<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> getLocalIPs(unsigned short sa_family = AF_UNSPEC);
- static bool isPrivateIp(string const& ip);
- static string formatAdditionalInfo(const std::string& aIp, bool sIp, bool sCC);
- /**
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
index b26b453b382..37914871c8b 100644
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
@@ -1,20 +1,33 @@
---- eiskaltdcpp-qt/src/main.cpp 2015-04-20 02:57:16.000000000 +0500
-+++ eiskaltdcpp-qt/src/main.cpp.new 2018-01-07 08:47:19.501488838 +0500
-@@ -72,7 +72,7 @@
- #if !defined(Q_WS_WIN)
+https://github.com/eiskaltdcpp/eiskaltdcpp/commit/fc9bc0c2
+
+--- dcpp/Util.h
++++ dcpp/Util.h.new
+@@ -243,7 +243,7 @@ public:
+ static int64_t toInt64(const string& aString) {
+ #ifdef _WIN32
+ return _atoi64(aString.c_str());
+-#elif defined(__HAIKU__)
++#elif defined(__HAIKU__) || !defined(__GLIBC__)
+ return strtoll(aString.c_str(), (char **)NULL, 10);
+ #else
+ return strtoq(aString.c_str(), (char **)NULL, 10);
+--- eiskaltdcpp-qt/src/main.cpp
++++ eiskaltdcpp-qt/src/main.cpp.new
+@@ -86,7 +86,7 @@ void parseCmdLine(const QStringList &);
+ #if !defined(Q_OS_WIN)
#include <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#ifdef ENABLE_STACKTRACE
-@@ -127,7 +127,7 @@
+@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
return 0;
}
--#if !defined (Q_WS_WIN) && !defined (__HAIKU__)
-+#if !defined (Q_WS_WIN) && !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_WIN) && !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_WIN) && !defined (Q_OS_HAIKU) && defined (__GLIBC__)
installHandlers();
#endif
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch b/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch
deleted file mode 100644
index fa4cd62247a..00000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- extra/upnpc.cpp 2015-04-20 02:57:16.000000000 +0500
-+++ extra/upnpc.new 2017-10-09 15:00:00.000000000 +0500
-@@ -41,9 +41,13 @@
-
- bool UPnPc::init()
- {
-- UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), 0, 0
--#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16))
-- , 0, 0);
-+ UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), NULL, 0
-+#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16))
-+ , 0
-+#if (MINIUPNPC_API_VERSION >= 14)
-+ , 2
-+#endif
-+ , NULL);
- #else
- );
- #endif
-@@ -63,8 +67,8 @@
- const string port_ = Util::toString(port);
-
- return UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port_.c_str(), port_.c_str(),
-- Util::getLocalIp().c_str(), description.c_str(), protocols[protocol], NULL
--#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16))
-+ Util::getLocalIp(AF_INET).c_str(), description.c_str(), protocols[protocol], NULL
-+#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16))
- , 0) == UPNPCOMMAND_SUCCESS;
- #else
- ) == UPNPCOMMAND_SUCCESS;
diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 39e5a8ad398..12b4a9aa465 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,20 @@
# Template file for 'eiskaltdcpp-qt'
pkgname=eiskaltdcpp-qt
-version=2.2.10
-revision=11
+version=2.4.1
+revision=1
wrksrc="eiskaltdcpp-${version}"
build_style=cmake
-configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF"
+configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel boost-devel
- qt5-devel miniupnpc-devel qt5-multimedia-devel"
-short_desc="EiskaltDC++ is a cross-platform Direct Connect and ADC clent"
-maintainer="samsky72 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+ miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
license="GPL-3.0-or-later"
-homepage="https://sourceforge.net/projects/eiskaltdcpp"
+homepage="https://github.com/eiskaltdcpp/eiskaltdcpp"
distfiles="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v${version}.tar.gz"
-checksum=e461c8c499e459651d6382a6ded6788e5ac9a9c4ff26386c3cf073d94d606127
+checksum=818f9622ac28d3cf1ae58af0a01e25af702781822b6edeb99c9d05d408a4798f
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
From f11f293af4c4010df6eb6661dc11eda255917d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 31 Jan 2021 20:54:14 +0100
Subject: [PATCH 453/634] libXpresent: remove presentproto dependency
presentproto no longer exists as standalone but is contained in xorgproto.
---
srcpkgs/libXpresent/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libXpresent/template b/srcpkgs/libXpresent/template
index 201b01a1843..b68957b445f 100644
--- a/srcpkgs/libXpresent/template
+++ b/srcpkgs/libXpresent/template
@@ -14,7 +14,7 @@ checksum=92f1bdfb67ae2ffcdb25ad72c02cac5e4912dc9bc792858240df1d7f105946fa
libXpresent-devel_package() {
depends="${sourcepkg}-${version}_${revision} libX11-devel libXext-devel
- libXfixes-devel libXrandr-devel presentproto xorgproto xproto"
+ libXfixes-devel libXrandr-devel xorgproto xproto"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From c177c7f8380d96bdeb0d88890ba3f8854e87555c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Jan 2021 23:36:05 +0200
Subject: [PATCH 454/634] dnsmasq: update to 2.84.
Closes: #28344 [via git-merge-pr]
---
srcpkgs/dnsmasq/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index 884ea0557b3..b680b2ad7fa 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
# Template file for 'dnsmasq'
pkgname=dnsmasq
-version=2.83
+version=2.84
revision=1
conf_files="/etc/dnsmasq.conf"
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
changelog="http://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
distfiles="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
-checksum=6b67955873acc931bfff61a0a1e0dc239f8b52e31df50e9164d3a4537571342f
+checksum=4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36
system_accounts="dnsmasq"
dnsmasq_homedir="/var/chroot"
From 98c4a8abe6f3335eb7992c13c51d5b26313af4f8 Mon Sep 17 00:00:00 2001
From: lambdagolem <31174944+lambdagolem@users.noreply.github.com>
Date: Sun, 31 Jan 2021 21:03:46 +0100
Subject: [PATCH 455/634] pmbootstrap: update to 1.29.1.
---
srcpkgs/pmbootstrap/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 4d6f3492100..0f486a2dd23 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,7 +1,7 @@
# Template file for 'pmbootstrap'
pkgname=pmbootstrap
-version=1.27.0
-revision=2
+version=1.29.1
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools coreutils procps-ng libressl git"
@@ -10,7 +10,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://postmarketos.org"
distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=0f99436c5af39fa90d1c5cd8cb3794bc234d087402f262a35d7856d0135b5230
+checksum=d3608be5db1dedfa150c90248aadbc72211274802cfe2c0b87427b8cf91a73b4
do_check() {
# tests require chroot
From 99a4bd5b1d0680623eaafbdde997a89cee9c1f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 31 Jan 2021 22:54:39 +0100
Subject: [PATCH 456/634] clisp: fix ftbfs; xlintify
---
srcpkgs/clisp/template | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template
index d0576f7c986..0bd8d107d04 100644
--- a/srcpkgs/clisp/template
+++ b/srcpkgs/clisp/template
@@ -1,30 +1,35 @@
# Template file for 'clisp'
pkgname=clisp
version=2.49
-revision=4
+revision=5
# possibly works elsewhere but not in an ancient 2010 release
archs="x86_64* i686*"
build_style=configure
-configure_args="--prefix=/usr --disable-mmap --without-dynamic-modules
- $(vopt_with readline)"
+configure_args="--prefix=/usr --disable-mmap --disable-rpath
+ --without-dynamic-modules $(vopt_with readline)"
+hostmakedepends="ffcall"
+makedepends="libsigsegv-devel $(vopt_if readline readline-devel)"
short_desc="ANSI Common Lisp Interpreter, Compiler and Debugger"
maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="http://clisp.cons.org"
-makedepends="ffcall libsigsegv-devel $(vopt_if readline readline-devel)"
distfiles="${SOURCEFORGE_SITE}/clisp/clisp-${version}.tar.bz2"
checksum=8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890
-
-case "${XBPS_TARGET_MACHINE}" in
- i686*) CFLAGS="-falign-functions=4" ;;
-esac
-
nopie=yes
nocross=yes
lib32disabled=yes
disable_parallel_build=yes
build_options="readline"
+case "$XBPS_TARGET_MACHINE" in
+ i686-musl) broken="*** - MULTIPLE-VALUE-SETQ: variable EXTRA-FILE-TYPES has no value";;
+esac
+
+CFLAGS="-mtune=generic"
+if [ "$XBPS_TARGET_WORDSIZE" == 32 ]; then
+ CFLAGS+=" -falign-functions=4"
+fi
+
do_build() {
# Need to increase the Limit
ulimit -s 16384
From a3bd3c2d66f0a48c4ee2ba9a4b7bda8a5985f199 Mon Sep 17 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, 1 Feb 2021 08:11:46 +0700
Subject: [PATCH 457/634] passff-host: remove update file
---
srcpkgs/passff-host/update | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 srcpkgs/passff-host/update
diff --git a/srcpkgs/passff-host/update b/srcpkgs/passff-host/update
deleted file mode 100644
index d012a166fd1..00000000000
--- a/srcpkgs/passff-host/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://api.github.com/repos/passff/passff-host/tags
-pattern="v\K[^\d]*([\d\.]+)"
From 0932b07b8382539692c8edffd5ab867f2bc00382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 31 Jan 2021 22:30:44 -0300
Subject: [PATCH 458/634] nwg-launchers: update to 0.4.4.
---
srcpkgs/nwg-launchers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template
index 700dfed4676..776fd408d7a 100644
--- a/srcpkgs/nwg-launchers/template
+++ b/srcpkgs/nwg-launchers/template
@@ -1,6 +1,6 @@
# Template file for 'nwg-launchers'
pkgname=nwg-launchers
-version=0.4.3
+version=0.4.4
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/nwg-piotr/nwg-launchers"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=59ca116a23210278f481bd5754d242455737e929aa2e5cc91a5a8fb1fcd2b2e6
+checksum=c8a0efdfdcad764bea08c677b9ee81d46a723815a005bc8b88bb5b726d0231cc
From 5b74da0cb76588cf90a0c5b2550d2c7f5121bccc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:33:16 +0200
Subject: [PATCH 459/634] mtpaint: update to 3.50.03.
---
srcpkgs/mtpaint/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index a799ea000c4..1d623607c11 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,15 +1,15 @@
# Template file for 'mtpaint'
pkgname=mtpaint
-version=3.50.02
+version=3.50.03
revision=1
-_commit=f6e8058c117cc11ae4cd5b1b11391d20de7f06cf
+_commit=40bde4557c254188b2924c90f4a35eef784b0a12
wrksrc="mtPaint-${_commit}"
build_style=configure
configure_args="--prefix=/usr --mandir=/usr/share/man
- imagick cflags GIF jpeg jp2v2 tiff lcms2 man gtk3 webp
+ imagick cflags jpeg jp2v2 tiff lcms2 man gtk3 webp
intl release"
hostmakedepends="pkg-config gettext"
-makedepends="giflib-devel gtk+3-devel libmagick-devel libopenjpeg2-devel
+makedepends="gtk+3-devel libmagick-devel libopenjpeg2-devel
libwebp-devel gettext-devel"
depends="desktop-file-utils"
short_desc="Simple GTK painting program"
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
homepage="http://mtpaint.sourceforge.net/"
changelog="https://raw.githubusercontent.com/wjaguar/mtPaint/master/NEWS"
distfiles="https://github.com/wjaguar/mtPaint/archive/${_commit}.tar.gz"
-checksum=728265164534b07895f6bf70d5e546581dbd6bddd727bf83d2784eea374d7e35
+checksum=96622c392652478abb6cd29ffcc10885d8ed0007ec45bd8841f45f9dcff8bb31
post_install() {
vdoc doc/vcode.t2t
From 9d938ad334a1d8643b3d4c32f65423f21a748229 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 31 Jan 2021 19:00:55 +0100
Subject: [PATCH 460/634] shfmt: update to 3.2.2.
---
srcpkgs/shfmt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a897f227fb5..b4e1ec13a27 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
# Template file for 'shfmt'
pkgname=shfmt
-version=3.2.1
+version=3.2.2
revision=1
wrksrc="sh-${version}"
build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/mvdan/sh"
distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=a1470285e04b69ee7a2bb3948b64e1da9cabe59658997b50aac7c64465f330bd
+checksum=e990aed5bb167f5cfc6790243ec3cc5e18508a64e8c9609ed5015634ba053b16
post_install() {
scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
From e610e7787786fe299cfdab7f074477aa519a910f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:59:01 +0200
Subject: [PATCH 461/634] font-sarasa-gothic: update to 0.17.0.
---
srcpkgs/font-sarasa-gothic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 960ac449d19..25a9648e464 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
# Template file for 'font-sarasa-gothic'
pkgname=font-sarasa-gothic
-version=0.16.3
+version=0.17.0
revision=1
create_wrksrc=yes
depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
license="OFL-1.1"
homepage="https://github.com/be5invis/Sarasa-Gothic"
distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=9019ba649400239db8331044f1dae5c6624c19a24d8a202bb193177d89005acc
+checksum=56b693d54ec185acb704d19640daa5bd1f4a98a1bdec5f1d447b9def5f4d6210
font_dirs="/usr/share/fonts/TTF"
From 010ccf3a7465796e1623b3fdc2ae04b57f7d7d50 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:52:37 +0200
Subject: [PATCH 462/634] kdiff3: update to 1.8.5.
---
srcpkgs/kdiff3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdiff3/template b/srcpkgs/kdiff3/template
index c488570332e..5ff9543f44f 100644
--- a/srcpkgs/kdiff3/template
+++ b/srcpkgs/kdiff3/template
@@ -1,6 +1,6 @@
# Template file for 'kdiff3'
pkgname=kdiff3
-version=1.8.2
+version=1.8.5
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Ben Sung Hsu <pobetiger+kdiff3@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://kde.org/applications/development/kdiff3"
distfiles="${KDE_SITE}/kdiff3/kdiff3-${version}.tar.xz"
-checksum=fb7154778491dc11b9bd38465164ce1a7c2d1810f70a57cd4268ffad42d5bb68
+checksum=bc92f7d04eb123f9c56dbe3047af67bf715240fa99487ac1d1ccf2a45e0854c1
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From feb08936fb391a852f9ef37822b5baa1087d89c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 31 Jan 2021 00:50:04 -0300
Subject: [PATCH 463/634] bind: fix named service.
When used with the -f option, it can crash, likely due to a lack of
syslog. Using -g makes it work but still keeps it in the foreground, by
logging directly to stderr. By adding a logger to it, we follow the
pattern of most other services.
Fixes #18961.
---
srcpkgs/bind/files/named/log/run | 2 ++
srcpkgs/bind/files/named/run | 3 ++-
srcpkgs/bind/template | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/bind/files/named/log/run
diff --git a/srcpkgs/bind/files/named/log/run b/srcpkgs/bind/files/named/log/run
new file mode 100644
index 00000000000..142fbd4af3f
--- /dev/null
+++ b/srcpkgs/bind/files/named/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t named
diff --git a/srcpkgs/bind/files/named/run b/srcpkgs/bind/files/named/run
index 9b510127a30..b6bf67c39e9 100755
--- a/srcpkgs/bind/files/named/run
+++ b/srcpkgs/bind/files/named/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/named || exit 1
chown named:named /var/run/named || exit 1
-exec named -u named -f -c /etc/named/named.conf
+exec named -u named -g -c /etc/named/named.conf
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f0744606e44..57243a23f4f 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
# Template file for 'bind'
pkgname=bind
version=9.16.7
-revision=2
+revision=3
_fullver="${version}${_patchver:+-${_patchver}}"
wrksrc="${pkgname}-${_fullver}"
build_style=gnu-configure
From 6325b04d5d5cb8baafba6ef4d5fedb8dc07dd4ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 01:19:15 -0300
Subject: [PATCH 464/634] wayland: update to 0.19.0, adopt.
Also fix ndebug mode with meson options instead of CFLAGS. Disabling
NDEBUG is necessary for the test suite to work correctly.
Thanks ifreund for pointing me in this direction.
---
srcpkgs/wayland/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index be69b35852d..624441d48a8 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -1,19 +1,18 @@
# Template file for 'wayland'
pkgname=wayland
-version=1.18.0
-revision=3
+version=1.19.0
+revision=1
build_style=meson
-configure_args="-Ddocumentation=false"
+# "Tests must not be built with NDEBUG defined, they rely on assert()."
+configure_args="-Ddocumentation=false -Db_ndebug=false"
hostmakedepends="flex pkg-config"
makedepends="expat-devel libffi-devel libfl-devel libxml2-devel"
short_desc="Wayland protocol compositor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayland.freedesktop.org/"
distfiles="https://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
-checksum=4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d
-
-CFLAGS="-UNDEBUG"
+checksum=baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wayland-devel"
From 15cd85e5224db3ebf856684245e32f506fa6ad48 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sun, 31 Jan 2021 20:22:13 -0500
Subject: [PATCH 465/634] oragono: update to 2.5.0.
---
srcpkgs/oragono/patches/paths.patch | 16 ++++++++--------
srcpkgs/oragono/template | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
index c06f9fe2170..22ecab8b1b1 100644
--- a/srcpkgs/oragono/patches/paths.patch
+++ b/srcpkgs/oragono/patches/paths.patch
@@ -1,5 +1,5 @@
---- default.yaml.orig 2020-07-26 08:57:19.471641788 -0400
-+++ default.yaml 2020-07-26 08:59:56.772839651 -0400
+--- default.yaml.orig 2021-01-30 22:19:08.000000000 -0500
++++ default.yaml 2021-01-31 20:20:33.092293843 -0500
@@ -50,8 +50,8 @@
# The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
":6697":
@@ -8,10 +8,10 @@
- key: privkey.pem
+ cert: /var/lib/oragono/fullchain.pem
+ key: /var/lib/oragono/privkey.pem
- # 'proxy' should typically be false. It's only for Kubernetes-style load
- # balancing that does not terminate TLS, but sends an initial PROXY line
- # in plaintext.
-@@ -159,7 +159,7 @@
+ # 'proxy' should typically be false. It's for cloud load balancers that
+ # always send a PROXY protocol header ahead of the connection. See the
+ # manual ("Reverse proxies") for more details.
+@@ -166,7 +166,7 @@
# motd filename
# if you change the motd, you should move it to ircd.motd
@@ -20,7 +20,7 @@
# motd formatting codes
# if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -671,7 +671,7 @@
+@@ -714,7 +714,7 @@
# datastore configuration
datastore:
# path to the datastore
@@ -29,7 +29,7 @@
# if the database schema requires an upgrade, `autoupgrade` will attempt to
# perform it automatically on startup. the database will be backed
-@@ -700,7 +700,7 @@
+@@ -743,7 +743,7 @@
default: en
# which directory contains our language files
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index 7e64061e289..da723058042 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,6 +1,6 @@
# Template file for 'oragono'
pkgname=oragono
-version=2.4.0
+version=2.5.0
revision=1
build_style=go
go_import_path="github.com/oragono/oragono"
@@ -10,7 +10,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
license="MIT"
homepage="https://oragono.io/"
distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=7740b77dac399c595c810a70b094c41f3933eb2e31a582a602caada8a96b83c7
+checksum=b954b20a19a3cfbc0c76febc6277217b275b355e0989edbd6d1a80a1accb6ded
conf_files="/etc/oragono.conf"
system_accounts="_oragono"
_oragono_homedir="/var/lib/oragono"
From 75b74e0978c44dad703cb8db528f0e3452457b0b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:22:18 -0500
Subject: [PATCH 466/634] python3-pyzmq: update to 22.0.2.
---
srcpkgs/python3-pyzmq/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 162a999f7a7..db236716fa0 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pyzmq'
pkgname=python3-pyzmq
-version=21.0.2
+version=22.0.2
revision=1
wrksrc="pyzmq-${version}"
build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
homepage="https://pyzmq.readthedocs.io/"
changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=098c13c6198913c2a0690235fa74d2e49161755f66b663beaec89651554cc79c
+checksum=d7b82a959e5e22d492f4f5a1e650e909a6c8c76ede178f538313ddb9d1e92963
pre_build() {
cat > setup.cfg <<-EOF
From df797d45512bc375f760afe44ef19dd797dd0d20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:22:21 -0500
Subject: [PATCH 467/634] python3-matplotlib: update to 3.3.4.
---
srcpkgs/python3-matplotlib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 189cc2ac711..095a661d60c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-matplotlib'
pkgname=python3-matplotlib
-version=3.3.3
-revision=2
+version=3.3.4
+revision=1
wrksrc="matplotlib-${version}"
build_style=python3-module
build_helper="numpy"
@@ -14,7 +14,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="custom:matplotlib, BSD-3-Clause, MIT"
homepage="https://matplotlib.org/"
distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=12c8a48373b7e46d4c9b84629a8964341357d9a56ac2ac1f2475669bf3102f94
+checksum=ce7cebd3df11a032fff9b3a32029f49f0fc7c322f556f26ea9ef812d6e43cb21
replaces="python3-matplotlib-data>=0"
pre_build() {
From 2b442a016f9e2460c14a2d7016254ee186707345 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:22:28 -0500
Subject: [PATCH 468/634] python-Jinja2: update to 2.11.3.
---
srcpkgs/python-Jinja2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index 88dd81f1266..d447aebca8c 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -1,7 +1,7 @@
# Template file for 'python-Jinja2'
pkgname=python-Jinja2
-version=2.11.2
-revision=2
+version=2.11.3
+revision=1
wrksrc="Jinja2-${version}"
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="http://jinja.pocoo.org/"
changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0
+checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
do_check() {
PYTHONPATH=src python2 -m pytest
From 9f3fda5597a42f64c6456be7f826b6dc863b366f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:27:35 -0500
Subject: [PATCH 469/634] python3-pyopencl: update to 2021.1.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 2ceffe9836f..326632e9778 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pyopencl'
pkgname=python3-pyopencl
-version=2021.1
+version=2021.1.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=262a29708a5465bd12b75d838f8d1107cd9321f54cb1c553c0064db10f3d5041
+checksum=ee78d2696a4bb62c6def2678d662d67d27c103621b8c00e21158d16ccbf5c346
do_configure() {
./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \
From 0a4760ee8f6939569e3fc73dd03ba729af6fad8a Mon Sep 17 00:00:00 2001
From: Byl3x <mbilek06@gmail.com>
Date: Thu, 28 Jan 2021 15:58:46 +0100
Subject: [PATCH 470/634] qutebrowser: update to 2.0.1
Closes: #28286 [via git-merge-pr]
---
srcpkgs/qutebrowser/template | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 3ff0c7da5f0..32a464e07e7 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,19 +1,18 @@
# Template file for 'qutebrowser'
pkgname=qutebrowser
-version=1.14.1
+version=2.0.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools asciidoc"
-depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
- python3-yaml python3-attrs python3-PyQt5-opengl python3-PyQt5-sql
- qt5-plugin-sqlite python3-setuptools"
+depends="python3-PyQt5-quick python3-Jinja2 python3-yaml
+ python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite"
short_desc="Keyboard-focused browser with a minimal GUI"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://qutebrowser.org/"
changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=554c145ff64b1a92d4f53e3c624aaad51baafb7cb5b469bc815ae2e0e1958796
+checksum=aa988d61f1a396d7e7101054851291cf57e7cf19e7fc0eeffd30b672570ab242
nostrip=yes
build_options="webengine"
@@ -36,6 +35,12 @@ pre_build() {
a2x -f manpage doc/qutebrowser.1.asciidoc
}
+do_check() {
+ # testing requires unpackaged plugins:
+ # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
+ :
+}
+
post_install() {
vman doc/qutebrowser.1
vinstall misc/org.qutebrowser.qutebrowser.desktop 644 usr/share/applications
From c6a06e43ad1ae27082e38d9523cac04ce62985a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:33:59 -0500
Subject: [PATCH 471/634] python3-pyPEG2: remove package
Upstream package hasn't been touched in more than five years, its
Bitbucket repository is dead, and the only dependant (qutebrowser)
dropped its dependency.
---
srcpkgs/python3-pyPEG2/template | 15 ---------------
srcpkgs/removed-packages/template | 3 ++-
2 files changed, 2 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/python3-pyPEG2/template
diff --git a/srcpkgs/python3-pyPEG2/template b/srcpkgs/python3-pyPEG2/template
deleted file mode 100644
index d936155e7bb..00000000000
--- a/srcpkgs/python3-pyPEG2/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python3-pyPEG2'
-pkgname=python3-pyPEG2
-version=2.15.2
-revision=7
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3-lxml"
-short_desc="Intrinsic PEG Parser-Interpreter for Python3"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="http://fdik.org/pyPEG/"
-distfiles="${PYPI_SITE}/p/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=2b2d4f80d8e1a9370b2a91f4a25f4abf7f69b85c8da84cd23ec36451958a1f6d
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 225594dc4b8..7ccbf196372 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=18
+revision=19
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -179,6 +179,7 @@ replaces="
python-pyenet<=1.3.13.post7_2
python-pyside<=1.2.2_7
python-pytest-relaxed<=1.1.2_2
+ python3-pyPEG2<=2.15.2_7
qimageblitz<=0.0.6_4
qucs<=0.0.19_2
qt<=4.8.7_29
From c35961670cd5d411ff92cb68516f363c54db83af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 31 Jan 2021 21:52:16 -0500
Subject: [PATCH 472/634] python3-packaging: update to 20.9.
---
srcpkgs/python3-packaging/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-packaging/template b/srcpkgs/python3-packaging/template
index b5639817dd9..0f5e75f7275 100644
--- a/srcpkgs/python3-packaging/template
+++ b/srcpkgs/python3-packaging/template
@@ -1,6 +1,6 @@
# Template file for 'python3-packaging'
pkgname=python3-packaging
-version=20.8
+version=20.9
revision=1
wrksrc="packaging-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Apache-2.0, BSD-2-Clause"
homepage="https://github.com/pypa/packaging"
distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz"
-checksum=78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093
+checksum=5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5
do_check() {
: provides no tests
From d00348ccecca1886287853ad2de3f1abcea572d0 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 473/634] cargo: added patch for #28372
---
srcpkgs/cargo/patches/fix-serde.diff | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/cargo/patches/fix-serde.diff
diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff
new file mode 100644
index 00000000000..d76499f5cd9
--- /dev/null
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@@ -0,0 +1,14 @@
+This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
+diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
+index 758f5c23f1..a70cd0dce8 100644
+--- src/cargo/util/config/de.rs
++++ src/cargo/util/config/de.rs
+@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
+ seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
+ }
+ Definition::Environment(env) => {
+- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
++ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
+ }
+ Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
+ }
From b8d0d8fffa8234a7d79cfabb028eb6a1eb089b77 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:41:41 +0200
Subject: [PATCH 474/634] skalibs: update to 2.10.0.1.
---
common/shlibs | 2 +-
srcpkgs/skalibs/template | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2f298ff9ad3..563a2b91b8c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2303,7 +2303,7 @@ libgnunettransport.so.2 gnunet-0.12.2_1
libgnunettransportapplication.so.0 gnunet-0.12.2_1
libgnunettransportcore.so.0 gnunet-0.12.2_1
libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
-libskarnet.so.2.9 skalibs-2.9.0.0_1
+libskarnet.so.2.10 skalibs-2.10.0.1_1
libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
libtidy.so.5 libtidy5-5.1.25_1
libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index f8e5b43977c..cd1ff83ced9 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,8 +1,7 @@
# Template file for 'skalibs'
pkgname=skalibs
-version=2.9.3.0
+version=2.10.0.1
revision=1
-_sysdepspkg=skaware-void-sysdeps
build_style=configure
configure_args="--libdir=/usr/lib --enable-static --enable-shared
--enable-force-devr
@@ -10,12 +9,12 @@ configure_args="--libdir=/usr/lib --enable-static --enable-shared
--bindir=/usr/bin --dynlibdir=/usr/lib
--with-sysdep-devurandom=yes"
short_desc="General purpose libraries for building software from skarnet.org"
-maintainer="bougyman <bougyman@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://skarnet.org/software/skalibs/"
changelog="https://skarnet.org/software/skalibs/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f01a07049d384097864410f9251447ad899db0d17f82cd8ebc6b7000d7783b44
+checksum=4ffbae8fdcd5108916bbea8eb6f795106d2c3189039e331bcd4b8e00e9971cb2
post_install() {
vlicense COPYING LICENSE
From 2763fc60498aca246c5bd56e54c3fa554e4a9115 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:10 +0200
Subject: [PATCH 475/634] New package: s6-man-pages-2.10.0.1.1.
---
srcpkgs/s6-man-pages/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/s6-man-pages/template
diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
new file mode 100644
index 00000000000..7b26862c1d1
--- /dev/null
+++ b/srcpkgs/s6-man-pages/template
@@ -0,0 +1,20 @@
+# Template file for 's6-man-pages'
+pkgname=s6-man-pages
+version=2.10.0.1.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="mdocml"
+short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="https://github.com/flexibeast/s6-man-pages"
+distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
+checksum=de85efead2548166df4450286abbae4f9450dcff49e300ffba2b8e34a362078e
+
+
+do_install() {
+ vmkdir usr/share/man/man1
+ vmkdir usr/share/man/man7
+ make MANPATH="${DESTDIR}/usr/share/man" install-man
+ vlicense LICENSE
+}
From 0b6f7a0c9e8fab6f169f90b7b48abcb5701a496a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:20 +0200
Subject: [PATCH 476/634] s6: update to 2.10.0.1.
---
srcpkgs/s6/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index da6adbf9015..1dd9bd9c987 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,7 +1,7 @@
# Template file for 's6'
pkgname=s6
-version=2.9.2.0
-revision=2
+version=2.10.0.1
+revision=1
build_style=configure
configure_args="--libdir=/usr/lib --bindir=/usr/bin
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -14,7 +14,7 @@ license="ISC"
homepage="http://skarnet.org/software/s6/"
changelog="https://skarnet.org/software/s6/upgrade.html"
distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=363db72af8fffba764b775c872b0749d052805b893b07888168f59a841e9dddd
+checksum=d0026f0fb4790febbd45f66bdcded54fab4a27ac2f579c075267a21154a0d1f5
case "$XBPS_TARGET_MACHINE" in
*-musl)
@@ -31,7 +31,7 @@ post_install() {
s6-doc_package() {
short_desc="Documentation for s6"
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} s6-man-pages"
pkg_install() {
vmove usr/share/doc
}
From be733a80964b6d31b03c76eb6346aeba12662575 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:45 +0200
Subject: [PATCH 477/634] s6-rc: update to 0.5.2.1.
---
srcpkgs/s6-rc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index 23744d4df96..31cce8d8e95 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,6 +1,6 @@
# Template file for 's6-rc'
pkgname=s6-rc
-version=0.5.2.0
+version=0.5.2.1
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-rc/"
changelog="https://skarnet.org/software/s6-rc/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1ab21a9bdde61b50e3d9deab867e01f808064dce653b0ebf8e5f5125d57cfee2
+checksum=2842fa55e2bddb65573d78d2c475c4a2f2b26b9258a18b457f8a0342e2fafa0a
post_install() {
vlicense COPYING
From 88fcf6683a740d79e03eb5f9dd5527c2c65de055 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:50 +0200
Subject: [PATCH 478/634] s6-portable-utils: update to 2.2.3.1.
---
srcpkgs/s6-portable-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index c0e19c6085a..24572e52d36 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,6 +1,6 @@
# Template file for 's6-portable-utils'
pkgname=s6-portable-utils
-version=2.2.3.0
+version=2.2.3.1
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -13,7 +13,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-portable-utils/"
changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=29baab7ca8d5c97cb5f311f4ad359ecee4ed13249fb51e351f4bbc175de47f18
+checksum=43e68a9abec873b337baeee92075a1c2e22cdfffd595cb91475fdcb10b6441cf
post_install() {
vlicense COPYING
From 4a505a75e461748d849957677a4cadeb0ba00c15 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:57 +0200
Subject: [PATCH 479/634] s6-networking: update to 2.4.0.0.
---
srcpkgs/s6-networking/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index d3a33e7b7ef..75ac1c3aa1f 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,7 +1,7 @@
# Template file for 's6-networking'
pkgname=s6-networking
-version=2.3.2.0
-revision=2
+version=2.4.0.0
+revision=1
build_style=configure
configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
$(vopt_if bearssl --enable-ssl=bearssl)
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-networking"
changelog="https://skarnet.org/software/s6-networking/upgrade.html"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=bbe36a8460d90f3bff56c934811876186f7224ced5bdc15c2c96d49b4e917d12
+checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
build_options="bearssl libressl"
build_options_default="bearssl"
From 45c92a417dd7a4e0f04bcef7e7415eaa55242649 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:05 +0200
Subject: [PATCH 480/634] s6-linux-utils: update to 2.5.1.4.
---
srcpkgs/s6-linux-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 9e4cf9d4ff7..32e443a6cb0 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,6 +1,6 @@
# Template file for 's6-linux-utils'
pkgname=s6-linux-utils
-version=2.5.1.3
+version=2.5.1.4
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --includedir=/usr/include
@@ -13,7 +13,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-linux-utils"
changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=4471511c9ce995c5ac61e0714def5a05fcabe730ef0bb93a42b12ad5bf007b71
+checksum=d8ad8dcc8d805646b655971ddcaabcd50094d8347bd49d859ba2c51713fbfd09
case "$XBPS_TARGET_MACHINE" in
*-musl)
From d2bb0626030c96a3226b3f4b22717d7ce9271cc8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:10 +0200
Subject: [PATCH 481/634] s6-dns: update to 2.3.5.0.
---
srcpkgs/s6-dns/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index c192e6286a2..e3258cbd684 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,6 +1,6 @@
# Template file for 's6-dns'
pkgname=s6-dns
-version=2.3.3.0
+version=2.3.5.0
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="ISC"
homepage="https://skarnet.org/software/s6-dns"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=2ac75918ff5eb4d6dabe33f7e55fa70cf3e6a9062ff87de5a35029ea22238716
+checksum=9f0b71c82cb51e9b7f998978d94c44e5e896fa60105f7233544db539572bb740
post_install() {
vlicense COPYING
From f057431d90a7529a8b87ee1ca7fa5969cba33411 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:16 +0200
Subject: [PATCH 482/634] nsss: update to 0.1.0.0.
---
srcpkgs/nsss/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index 0e9e472eef6..bf23155fd7a 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,7 +1,7 @@
# Template file for 'nsss'
pkgname=nsss
-version=0.0.2.2
-revision=2
+version=0.1.0.0
+revision=1
# Only available for musl
archs="*-musl"
build_style=configure
@@ -10,12 +10,12 @@ configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
--bindir=/usr/bin --dynlibdir=/usr/lib --includedir=/usr/include/nsss"
makedepends="skalibs-devel"
short_desc="Minimal competing implementation of glibc's Name Switch Service"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://skarnet.org/software/nsss/"
changelog="https://skarnet.org/software/nsss/upgrade.html"
distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz"
-checksum=3345d76155b6a5d55b13b30cfecb0b9a21fd1264164f5f48b1c3eca57849a12a
+checksum=b88a389264a76893ef3ad9c086ea694f32b688ed22fb7480a2a172131c5f3d97
do_check() {
: #checkdepends=s6, creates dependency cycle
From b092a2d29fb9d122feb07503841ea582b394300b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:21 +0200
Subject: [PATCH 483/634] oblibs: update to 0.1.2.0.
---
srcpkgs/oblibs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index f2e2aa0b53f..c0e2f13f447 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,6 +1,6 @@
# Template file for 'oblibs'
pkgname=oblibs
-version=0.1.1.1
+version=0.1.2.0
revision=1
wrksrc="${pkgname}-v${version}"
build_style=configure
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://framagit.org/Obarun/oblibs"
distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=7b19fab4c1e3926c6f5dad6cc7373f250ac4bf9a1541ac01737e169b46dc765a
+checksum=0009cbe48d786bca14e8e973a5092de5270713db1940d538f38d6dfaa9e75e0a
post_install() {
vlicense LICENSE
From 9ae9e2a4c6f345c0e3b57f4dc4862630ca794cef Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:28 +0200
Subject: [PATCH 484/634] mdevd: update to 0.1.3.0.
---
srcpkgs/mdevd/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index a5c97a0dffa..ef6e7d21553 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,6 +1,6 @@
# Template file for 'mdevd'
pkgname=mdevd
-version=0.1.2.0
+version=0.1.3.0
revision=1
build_style=configure
configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -8,12 +8,12 @@ configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
--with-lib=${XBPS_CROSS_BASE}/usr/lib"
makedepends="skalibs-devel"
short_desc="Small mdev-compatible kernel hotplug daemon similar to udevd"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://skarnet.org/software/mdevd/"
changelog="https://skarnet.org/software/mdevd/upgrade.html"
distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=952af443bc61b3694432f7799ba8182824083726872f47f45467c1a5b24796c1
+checksum=be89ab072c4de822a06e26579dcca10e85ae5fd5be23ba903415b4de8fe0fb6a
case "$XBPS_TARGET_MACHINE" in
*-musl)
From f52df77e5de01fb3e6428654affafb58c73462b1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:39 +0200
Subject: [PATCH 485/634] execline: update to 2.7.0.1.
---
srcpkgs/execline/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 71280116e88..7fc5dfbfc89 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
# Template file for 'execline'
pkgname=execline
-version=2.6.1.1
+version=2.7.0.1
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -8,12 +8,12 @@ configure_args="--libdir=/usr/lib --bindir=/usr/bin
--with-lib=${XBPS_CROSS_BASE}/usr/lib"
makedepends="skalibs-devel"
short_desc="Non-interactive scripting language"
-maintainer="bougyman <bougyman@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://skarnet.org/software/execline/"
changelog="https://skarnet.org/software/execline/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=394308f0349f962086a9695ca2bb5ef32cd38e5be6b7cec0b3d0cf35a2b2ba56
+checksum=cdf61164f97f764a06aba36986d549159df56f2d1a4b3bbf5467ee91ad8fdcdd
CFLAGS="-fPIC"
From 359e59467a55bfd5c50a17527c13d07ba4b695e0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:45 +0200
Subject: [PATCH 486/634] 66: update to 0.6.0.1.
---
srcpkgs/66/INSTALL.msg | 7 ++++---
srcpkgs/66/template | 8 ++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/66/INSTALL.msg b/srcpkgs/66/INSTALL.msg
index b9115b8ebe1..4eb62e16d37 100644
--- a/srcpkgs/66/INSTALL.msg
+++ b/srcpkgs/66/INSTALL.msg
@@ -1,3 +1,4 @@
-CAUTION: upgrading 66 to a new major version may require manual intervention!
-You may need to run the `66-update` utility or otherwise update your trees.
-For details, refer to https://framagit.org/Obarun/66/raw/master/NEWS.md
+CAUTION: 66 v0.6.0.0 has changes to the way the log and env options
+are handled in the frontend service file. Please consult the
+documentation and make the appropriate changes before restarting
+or enabling your services, especially complex module services.
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 05d032bb8a5..e53d54b9801 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
# Template file for '66'
pkgname=66
-version=0.5.1.1
-revision=2
+version=0.6.0.1
+revision=1
wrksrc="66-v${version}"
build_style=configure
configure_args="--prefix=/usr
@@ -17,7 +17,7 @@ license="ISC"
homepage="http://web.obarun.org/software/"
changelog="https://framagit.org/Obarun/66/raw/master/NEWS.md"
distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
-checksum=7a0db00186f1c2111d07cbcc082f769c806820607d7ba5f49e505abf06687e0c
+checksum=6267e6b51fa6a5c56ef10f385f89bbbf87dca51ff397be32a7dac161cbc25a9b
conf_files="/etc/66/init /etc/66/init.conf"
@@ -25,7 +25,7 @@ system_accounts="_s6log"
post_install() {
vdoc README.md
- vlicense COPYING
+ vlicense LICENSE
}
66-doc_package() {
From f3280ab4ef6e0547432edd3ed75dd5c966199110 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:49 +0200
Subject: [PATCH 487/634] 66-tools: update to 0.0.7.1.
---
srcpkgs/66-tools/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index 4fe5daae075..4aa2674cca2 100644
--- a/srcpkgs/66-tools/template
+++ b/srcpkgs/66-tools/template
@@ -1,7 +1,7 @@
# Template file for '66-tools'
pkgname=66-tools
-version=0.0.6.2
-revision=2
+version=0.0.7.1
+revision=1
wrksrc=${pkgname}-v${version}
build_style=configure
configure_args="--prefix=/usr
@@ -16,8 +16,8 @@ license="ISC"
homepage="http://web.obarun.org/software/index.html"
changelog="https://framagit.org/Obarun/66-tools/-/raw/master/NEWS.md"
distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz"
-checksum=2b9617cf4101cc1a9f4877358ab73dfaa7a7dd8ea5f20409205645784eaef121
+checksum=370fda8d10254bfece86cbeabf7b4d48d8b47e91bd57fe5bae12e18b5a032547
post_install() {
- vlicense COPYING
+ vlicense LICENSE
}
From 129ce05c801655b4df5efdd0e9c82c893cd0dab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 01:02:17 -0300
Subject: [PATCH 488/634] babl: update to 0.1.84.
- fix vala detection for cross
- remove manual disabling of build options, now that the meson build
style defaults features to "auto" instead of "enabled"
---
srcpkgs/babl/template | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 747bad3e40c..4f3c155c995 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,27 +1,19 @@
# Template file for 'babl'
pkgname=babl
-version=0.1.78
+version=0.1.84
revision=1
build_style=meson
build_helper=gir
-configure_args="-Dwith-docs=false"
+configure_args="-Dwith-docs=false -Denable-gir=true"
hostmakedepends="pkg-config vala-devel gobject-introspection"
-makedepends="lcms2-devel"
+makedepends="lcms2-devel vala-devel"
short_desc="Dynamic pixel format translation library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-only"
homepage="http://gegl.org/babl/"
changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS"
distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a
-
-case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) ;;
- *)
- configure_args+=" -Denable-sse=false -Denable-sse2=false
- -Denable-sse3=false -Denable-sse4_1=false -Denable-avx2=false
- -Denable-f16c=false -Denable-mmx=false";;
-esac
+checksum=e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea
babl-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From faf5d72a494eef59a7baab4bd6aac9431dfe347d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Dec 2020 14:43:50 -0300
Subject: [PATCH 489/634] gegl: update to 0.4.28.
Introspection should always be enabled, since other packages depend on
it.
---
srcpkgs/gegl/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 961686af6b9..417a91034a5 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,10 +1,10 @@
# Template file for 'gegl'
pkgname=gegl
-version=0.4.24
+version=0.4.28
revision=1
build_style=meson
build_helper="gir"
-configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)
+configure_args="-Ddocs=false -Dintrospection=true
-Dlibspiro=disabled -Dlibv4l=disabled -Dlibv4l2=disabled -Dlua=disabled
-Dmrg=disabled -Dopenexr=disabled -Dsdl2=disabled -Dvapigen=disabled
-Dlibav=disabled -Dumfpack=disabled"
@@ -18,10 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
homepage="https://www.gimp.org"
changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt"
distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a
-
-build_options="gir"
-build_options_default="gir"
+checksum=1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900
gegl-devel_package() {
depends="json-glib-devel babl-devel gegl>=${version}_${revision}"
From 77be0ed81c068bf6c8d1d00d59f8e7a75d20ec50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 28 Dec 2020 19:50:50 -0300
Subject: [PATCH 490/634] gimp: update to 2.10.22, add HEIF support, locale
data in /usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
Update and HEIF based on
https://github.com/anddam/void-packages/commit/9202f62e3c9925fbdbbfc1e5415327afbd728c2a
---
srcpkgs/gimp/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 61ae1ad1752..332fb0b12e4 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,16 +1,17 @@
# Template file for 'gimp'
pkgname=gimp
-version=2.10.20
-revision=3
+version=2.10.22
+revision=1
build_style=gnu-configure
-configure_args="--disable-check-update"
+configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
- poppler-glib-devel pygtk-devel glib-networking libwebp-devel"
+ poppler-glib-devel pygtk-devel glib-networking libwebp-devel
+ libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
short_desc="GNU image manipulation program"
conf_files="/etc/gimp/${version%%.*}.0/*"
@@ -18,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c
+checksum=2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb
python_version=2
lib32disabled=yes
no_generic_pkgconfig_link=yes
@@ -28,6 +29,8 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
fi
+ # don't allow configure to set DATADIRNAME=lib
+ vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
libgimp_package() {
From 56f419fbfabeae0ba3e808a7d7e0bf217a30a211 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Feb 2021 09:32:41 +0100
Subject: [PATCH 491/634] python3-llfuse: update to 1.4.1.
---
srcpkgs/python3-llfuse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template
index 0902174ecda..1d4d0c7e783 100644
--- a/srcpkgs/python3-llfuse/template
+++ b/srcpkgs/python3-llfuse/template
@@ -1,6 +1,6 @@
# Template file for 'python3-llfuse'
pkgname=python3-llfuse
-version=1.4.0
+version=1.4.1
revision=1
wrksrc="llfuse-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/python-llfuse/python-llfuse"
distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.gz"
-checksum=cb5dc6052bdd9c19dd15d44cd2876520007029a7733e7b9f0c2022c768e3ca52
+checksum=c29c79d96a5aeab51608cae12594a1bf83576d86232f97341c7f779d413a4ec9
From b3cc9f6f3f5d201df902cd17e41a8e0f64fa729e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 30 Jan 2021 08:47:52 +0100
Subject: [PATCH 492/634] vpnc: change upstream to fork
fixes #26798.
* Changes upstream to https://github.com/streambinder/vpnc/. That's a fork
that's a fork which is at least used in alpine.
* Depends on vpnc-scripts. New upstream doesn't ship those files anymore
* Add wrapper script to stay backwards compatible
* Switch to build_style=gnu-makefile instead of manually calling make.
---
srcpkgs/vpnc/files/vpnc-script | 3 +
srcpkgs/vpnc/patches/00-fix-fritzbox.diff | 81 -----------------------
srcpkgs/vpnc/patches/2-fix-musl.patch | 33 ---------
srcpkgs/vpnc/template | 33 +++++----
4 files changed, 23 insertions(+), 127 deletions(-)
create mode 100644 srcpkgs/vpnc/files/vpnc-script
delete mode 100644 srcpkgs/vpnc/patches/00-fix-fritzbox.diff
delete mode 100644 srcpkgs/vpnc/patches/2-fix-musl.patch
diff --git a/srcpkgs/vpnc/files/vpnc-script b/srcpkgs/vpnc/files/vpnc-script
new file mode 100644
index 00000000000..c2b9f65bd17
--- /dev/null
+++ b/srcpkgs/vpnc/files/vpnc-script
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/libexec/vpnc-scripts/vpnc-script "$@"
diff --git a/srcpkgs/vpnc/patches/00-fix-fritzbox.diff b/srcpkgs/vpnc/patches/00-fix-fritzbox.diff
deleted file mode 100644
index 5f6c7a63cb9..00000000000
--- a/srcpkgs/vpnc/patches/00-fix-fritzbox.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-Description: Fixes AVM's FritzBoxes not being able to connect
-Upstream: Yes
-Index: vpnc.c
-===================================================================
---- vpnc.c (revision 466)
-+++ vpnc.c (revision 469)
-@@ -88,6 +88,10 @@
- 0x90, 0xCB, 0x80, 0x91, 0x3E, 0xBB, 0x69, 0x6E,
- 0x08, 0x63, 0x81, 0xB5, 0xEC, 0x42, 0x7B, 0x1F
- };
-+const unsigned char VID_NATT_03[] = { /* "draft-ietf-ipsec-nat-t-ike-03" */
-+ 0x7d, 0x94, 0x19, 0xa6, 0x53, 0x10, 0xca, 0x6f,
-+ 0x2c, 0x17, 0x9d, 0x92, 0x15, 0x52, 0x9d, 0x56
-+};
- const unsigned char VID_NATT_RFC[] = { /* "RFC 3947" */
- 0x4A, 0x13, 0x1C, 0x81, 0x07, 0x03, 0x58, 0x45,
- 0x5C, 0x57, 0x28, 0xF2, 0x0E, 0x95, 0x45, 0x2F
-@@ -141,6 +145,7 @@
- { VID_NATT_01, sizeof(VID_NATT_01), "Nat-T 01" },
- { VID_NATT_02, sizeof(VID_NATT_02), "Nat-T 02" },
- { VID_NATT_02N, sizeof(VID_NATT_02N), "Nat-T 02N" },
-+ { VID_NATT_03, sizeof(VID_NATT_03), "Nat-T 03" },
- { VID_NATT_RFC, sizeof(VID_NATT_RFC), "Nat-T RFC" },
- { VID_DWR, sizeof(VID_DWR), "Delete With Reason" },
- { VID_CISCO_FRAG, sizeof(VID_CISCO_FRAG), "Cisco Fragmentation" },
-@@ -1156,8 +1161,11 @@
- value = a->next->u.attr_16;
- else if (a->next->af == isakmp_attr_lots && a->next->u.lots.length == 4)
- value = ntohl(*((uint32_t *) a->next->u.lots.data));
-- else
-- assert(0);
-+ else {
-+ DEBUG(2, printf("got unknown ike lifetime attributes af %d len %d\n",
-+ a->next->af, a->next->u.lots.length));
-+ return;
-+ }
-
- DEBUG(2, printf("got ike lifetime attributes: %d %s\n", value,
- (a->u.attr_16 == IKE_LIFE_TYPE_SECONDS) ? "seconds" : "kilobyte"));
-@@ -1267,6 +1275,8 @@
- l = l->next = new_isakmp_data_payload(ISAKMP_PAYLOAD_VID,
- VID_NATT_RFC, sizeof(VID_NATT_RFC));
- l = l->next = new_isakmp_data_payload(ISAKMP_PAYLOAD_VID,
-+ VID_NATT_03, sizeof(VID_NATT_03));
-+ l = l->next = new_isakmp_data_payload(ISAKMP_PAYLOAD_VID,
- VID_NATT_02N, sizeof(VID_NATT_02N));
- l = l->next = new_isakmp_data_payload(ISAKMP_PAYLOAD_VID,
- VID_NATT_02, sizeof(VID_NATT_02));
-@@ -1501,6 +1511,12 @@
- seen_natt_vid = 1;
- if (natt_draft < 1) natt_draft = 2;
- DEBUG(2, printf("peer is NAT-T capable (RFC 3947)\n"));
-+ } else if (rp->u.vid.length == sizeof(VID_NATT_03)
-+ && memcmp(rp->u.vid.data, VID_NATT_03,
-+ sizeof(VID_NATT_03)) == 0) {
-+ seen_natt_vid = 1;
-+ if (natt_draft < 1) natt_draft = 2;
-+ DEBUG(2, printf("peer is NAT-T capable (draft-03)\n"));
- } else if (rp->u.vid.length == sizeof(VID_NATT_02N)
- && memcmp(rp->u.vid.data, VID_NATT_02N,
- sizeof(VID_NATT_02N)) == 0) {
-@@ -1582,6 +1598,19 @@
- seen_natd_them = 1;
- }
- break;
-+ case ISAKMP_PAYLOAD_N:
-+ if (rp->u.n.type == ISAKMP_N_IPSEC_RESPONDER_LIFETIME) {
-+ if (rp->u.n.protocol == ISAKMP_IPSEC_PROTO_ISAKMP)
-+ lifetime_ike_process(s, rp->u.n.attributes);
-+ else if (rp->u.n.protocol == ISAKMP_IPSEC_PROTO_IPSEC_ESP)
-+ lifetime_ipsec_process(s, rp->u.n.attributes);
-+ else
-+ DEBUG(2, printf("got unknown lifetime notice, ignoring..\n"));
-+ } else {
-+ DEBUG(1, printf("rejecting ISAKMP_PAYLOAD_N, type is not lifetime\n"));
-+ reject = ISAKMP_N_INVALID_PAYLOAD_TYPE;
-+ }
-+ break;
- default:
- DEBUG(1, printf("rejecting invalid payload type %d\n", rp->type));
- reject = ISAKMP_N_INVALID_PAYLOAD_TYPE;
diff --git a/srcpkgs/vpnc/patches/2-fix-musl.patch b/srcpkgs/vpnc/patches/2-fix-musl.patch
deleted file mode 100644
index 9485c006bd7..00000000000
--- a/srcpkgs/vpnc/patches/2-fix-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git sysdep.c sysdep.c
-index ff07753..43fdb74 100644
---- sysdep.c
-+++ sysdep.c
-@@ -59,7 +59,9 @@
- #if defined(__DragonFly__)
- #include <net/tun/if_tun.h>
- #elif defined(__linux__)
-+#ifdef __GLIBC__
- #include <linux/if_tun.h>
-+#endif
- #elif defined(__APPLE__)
- /* no header for tun */
- #elif defined(__CYGWIN__)
-diff --git sysdep.h sysdep.h
-index a5eafd6..af34e94 100644
---- sysdep.h
-+++ sysdep.h
-@@ -38,11 +38,13 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr);
-
- /***************************************************************************/
- #if defined(__linux__) || defined(__GLIBC__)
-+#ifdef __GLIBC__
- #include <error.h>
-+#define HAVE_ERROR 1
-+#endif
-
- #define HAVE_VASPRINTF 1
- #define HAVE_ASPRINTF 1
--#define HAVE_ERROR 1
- #define HAVE_GETLINE 1
- #define HAVE_UNSETENV 1
- #define HAVE_SETENV 1
diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 51e2f2998a6..84f434690cd 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,17 +1,22 @@
# Template file for 'vpnc'
pkgname=vpnc
version=0.5.3
-revision=7
+revision=8
+_githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
+wrksrc="vpnc-$_githash"
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="SBINDIR=/usr/bin"
+make_check_target=test
hostmakedepends="perl"
-makedepends="libgcrypt-devel"
-depends="net-tools"
+makedepends="libgcrypt-devel libressl-devel"
+depends="net-tools vpnc-scripts"
short_desc="Client for cisco vpn concentrator"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
-distfiles="https://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${version}.tar.gz"
-checksum=46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884
-
+distfiles="https://github.com/streambinder/vpnc/archive/$_githash.tar.gz"
+checksum=190493d792c8d5b2f7ba6a621fa14daf5602b2dcfcf31c202255fd08b1a943a4
conf_files="
/etc/vpnc/default.conf
/etc/vpnc/vpnc-script"
@@ -20,14 +25,16 @@ if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" vpnc"
fi
-do_configure() {
+post_patch() {
+ vsed -e 's/^#OPENSSL/OPENSSL/' -i Makefile
+ vsed -e 's/^install:.*/install: install-common/' -i Makefile
+ vsed -e 's#^SBINDIR=.*#SBINDIR=/$(PREFIX)/bin#' -i Makefile
if [ "$CROSS_BUILD" ]; then
- sed -i 's%^my \$vpnc = .*;%my \$vpnc = "/usr/bin/vpnc";%' makeman.pl
+ vsed -e 's%^my \$vpnc = .*;%my \$vpnc = "/usr/bin/vpnc";%' -i src/makeman.pl
fi
}
-do_build() {
- make CC=$CC ${makejobs}
-}
-do_install() {
- make PREFIX=/usr SBINDIR=/usr/bin DESTDIR=${DESTDIR} install
+
+post_install() {
+ rm -r $DESTDIR/usr/lib/systemd/system
+ vinstall $FILESDIR/vpnc-script 755 etc/vpnc
}
From 13786dbc6e6967e15e1bc33e00d57d70a6dbdf37 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 31 Jan 2021 13:38:57 +0300
Subject: [PATCH 493/634] fuzzel: update to 1.5.0.
---
srcpkgs/fuzzel/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 9223ef9976c..50ed5225939 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,18 +1,18 @@
# Template file for 'fuzzel'
pkgname=fuzzel
-version=1.4.2
+version=1.5.0
revision=1
wrksrc="$pkgname"
build_style=meson
hostmakedepends="pkg-config scdoc wayland-devel"
-makedepends="cairo-devel fcft-devel librsvg-devel libxkbcommon-devel
- pixman-devel tllist wayland-devel wayland-protocols"
+makedepends="cairo-devel fcft-devel librsvg-devel libpng-devel
+ libxkbcommon-devel pixman-devel tllist wayland-devel wayland-protocols"
short_desc="Application launcher for wlroots based Wayland compositors"
maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://codeberg.org/dnkl/fuzzel"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=e4acd9afa299abd0a1995f85ffd13b05648178d71326aa1c749187f113de4817
+checksum=a67d6c56c9de465ce777b091163034a594a19d3c1cf411cccdca4a40a11a2410
post_install() {
rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
From 1756285e96f1799c851a3681417127c0ff9bd387 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Sun, 31 Jan 2021 17:54:16 +0100
Subject: [PATCH 494/634] synapse: update to 1.26.0.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 5b7c62bfb05..1258ebbd7d6 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.25.0
+version=1.26.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=0ae31c1e59d531ef20d232c2c9ef9f3a87ba9733d5b3061d96e0a1a645975185
+checksum=8e9c9aaf8fb89ca74b10fb4f2d1db61973c1d34c659939b16971417c8603e1ec
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
From e1946ed8eabc8c235dfdd567315d92193282edea Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 31 Jan 2021 23:45:53 +0100
Subject: [PATCH 495/634] inadyn: update to 2.8.
---
srcpkgs/inadyn/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index fb16b0faba4..010cc6a3a27 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,7 +1,7 @@
# Template file for 'inadyn'
pkgname=inadyn
-version=2.7
-revision=2
+version=2.8
+revision=1
build_style=gnu-configure
configure_args="--enable-openssl"
hostmakedepends="automake libtool pkg-config"
@@ -10,8 +10,9 @@ short_desc="Small DynDNS client with SSL/TLS support"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://troglobit.com/inadyn.html"
+changelog="https://github.com/troglobit/inadyn/raw/master/ChangeLog.md"
distfiles="https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"
-checksum=eb03bc9d9c09dfbbc651b43a2eb5a967d0454a8293576df23784710dac50c6a4
+checksum=820696b6227abfd1f8666317bf25e24f13ff6fd2aaa1d136c405d36b32f905f7
system_accounts="inadyn"
inadyn_homedir="/var/empty"
From 46252e5baa25aede1996a725b7c997ef96f60ee6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 1 Feb 2021 14:13:52 +0100
Subject: [PATCH 496/634] firejail: update to 0.9.64.2.
---
srcpkgs/firejail/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template
index 08d1e5f8c40..498e89961c8 100644
--- a/srcpkgs/firejail/template
+++ b/srcpkgs/firejail/template
@@ -1,6 +1,6 @@
# Template file for 'firejail'
pkgname=firejail
-version=0.9.64
+version=0.9.64.2
revision=1
build_style=gnu-configure
configure_args="--enable-apparmor"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://firejail.wordpress.com"
changelog="https://github.com/netblue30/firejail/raw/master/RELNOTES"
distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz"
-checksum=b261ccf4b40a8c282db1542cf5f574c1c92b0bdf7cbce09267262dde047286aa
+checksum=fa4113ccdf74694eeeb3d223017c1ade92bb104232df9340d30873816856f61c
conf_files="/etc/firejail/* /etc/apparmor.d/local/firejail-default"
nocross=yes
From 2a7bf2876d7c70f6e6497ac2e0132ba770f4405c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 1 Feb 2021 14:13:55 +0100
Subject: [PATCH 497/634] inadyn: update to 2.8.1.
---
srcpkgs/inadyn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 010cc6a3a27..1dfb82c0be6 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,6 +1,6 @@
# Template file for 'inadyn'
pkgname=inadyn
-version=2.8
+version=2.8.1
revision=1
build_style=gnu-configure
configure_args="--enable-openssl"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://troglobit.com/inadyn.html"
changelog="https://github.com/troglobit/inadyn/raw/master/ChangeLog.md"
distfiles="https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"
-checksum=820696b6227abfd1f8666317bf25e24f13ff6fd2aaa1d136c405d36b32f905f7
+checksum=1185a9fb165bfc5f5b5f66f0dd8a695c9bd78d4b20cd162273eeea77f2d2e685
system_accounts="inadyn"
inadyn_homedir="/var/empty"
From 854577eb086043266873eb91555f43008cfd9b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 27 Jan 2021 08:48:38 +0700
Subject: [PATCH 498/634] nss: update to 3.61.
---
srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch | 12 ++++++++++++
srcpkgs/nss/template | 6 ++++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch
diff --git a/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch b/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch
new file mode 100644
index 00000000000..72fc5252cde
--- /dev/null
+++ b/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch
@@ -0,0 +1,12 @@
+Index: nss/gtests/manifest.mn
+===================================================================
+--- nss/gtests/manifest.mn.orig
++++ nss/gtests/manifest.mn
+@@ -41,6 +41,7 @@ certdb_gtest: common
+ certhigh_gtest: common
+ cryptohi_gtest: common
+ der_gtest: common
++freebl_gtest: common
+ pk11_gtest: common pkcs11testmodule
+ smime_gtest: common
+ softoken_gtest: common
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index b203db3b956..fbcdc67dc58 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
_nsprver=4.29
pkgname=nss
-version=3.60.1
+version=3.61
revision=1
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d
+checksum=312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370
export NS_USE_GCC=1
export LIBRUNPATH=
@@ -55,6 +55,8 @@ do_build() {
make ${makejobs} LD=$BUILD_LD LDFLAGS="$BUILD_LDFLAGS" ${_native_use64} -C coreconf
if [ "$CROSS_BUILD" ]; then
+ # We don't run test in cross build
+ export NSS_DISABLE_GTESTS=1
if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
CFLAGS+=" -DNS_PTR_GT_32"
_target_use64="USE_64=1"
From e936ddbd7c2f04c7e54991664691276daaa9c2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 01:22:57 -0300
Subject: [PATCH 499/634] gegl3: remove package.
No longer used by anything, modern version is gegl.
---
common/shlibs | 3 ---
srcpkgs/gegl3-devel | 1 -
srcpkgs/gegl3/patches/ftbfs.patch | 10 ---------
srcpkgs/gegl3/template | 36 -------------------------------
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 50 deletions(-)
delete mode 120000 srcpkgs/gegl3-devel
delete mode 100644 srcpkgs/gegl3/patches/ftbfs.patch
delete mode 100644 srcpkgs/gegl3/template
diff --git a/common/shlibs b/common/shlibs
index 563a2b91b8c..dd8a7019ee3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2244,9 +2244,6 @@ libgedacairo.so.1 geda-1.10.2_1
libxornstorage.so.0 geda-1.10.2_1
libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
libgsound.so.0 gsound-1.0.1_1
-libgegl-0.3.so.0 gegl3-0.3.0_1
-libgegl-npd-0.3.so gegl3-0.3.0_1
-libgegl-sc-0.3.so gegl3-0.3.0_1
libprocps.so.8 procps-ng-3.3.16_1
libgegl-0.4.so.0 gegl-0.4.16_1
libgegl-npd-0.4.so gegl-0.4.16_1
diff --git a/srcpkgs/gegl3-devel b/srcpkgs/gegl3-devel
deleted file mode 120000
index 66257473719..00000000000
--- a/srcpkgs/gegl3-devel
+++ /dev/null
@@ -1 +0,0 @@
-gegl3
\ No newline at end of file
diff --git a/srcpkgs/gegl3/patches/ftbfs.patch b/srcpkgs/gegl3/patches/ftbfs.patch
deleted file mode 100644
index 5de553d735f..00000000000
--- a/srcpkgs/gegl3/patches/ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/exp_combine.cpp
-+++ tools/exp_combine.cpp
-@@ -10,6 +10,7 @@
-
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-+#include <exiv2/error.hpp>
-
- using namespace std;
-
diff --git a/srcpkgs/gegl3/template b/srcpkgs/gegl3/template
deleted file mode 100644
index 64d644fcf2a..00000000000
--- a/srcpkgs/gegl3/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'gegl3'
-pkgname=gegl3
-version=0.3.28
-revision=2
-wrksrc="gegl-${version}"
-build_style=gnu-configure
-configure_args="--disable-docs --without-sdl
- --without-libavformat --without-graphviz --without-lua --without-libspiro
- --without-umfpack --with-exiv2 --without-libv4l --disable-introspection"
-hostmakedepends="pkg-config intltool"
-makedepends="libglib-devel libpng-devel babl-devel jasper-devel
- libjpeg-turbo-devel librsvg-devel gtk+-devel exiv2-devel json-glib-devel
- libraw-devel"
-short_desc="Graph based image processing framework (v0.3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3, LGPL-3"
-homepage="https://www.gimp.org/"
-distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.bz2"
-checksum=152f87604a5a191775329dfb63764efa1d5c32403d1438da68e242f96b7d23ff
-
-CFLAGS="-fcommon"
-
-post_install() {
- # Resolves conflict with gegl
- mv ${DESTDIR}/usr/bin/gegl ${DESTDIR}/usr/bin/gegl3
-}
-
-gegl3-devel_package() {
- depends="libglib-devel gegl3>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/lib/libgegl-0.3.so
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7ccbf196372..fc5eb68bd49 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -33,6 +33,7 @@ replaces="
enventor<=1.0.0_2
epstopdf<=2.27_3
fontmatrix<=0.6.0.20171228_2
+ gegl3<=0.3.28_2
geoip-data<=20171002_2
gksu<=2.0.2_4
go1.4-bootstrap<=20171003_2
From cba17f7522caac437cb9ac218a9403e47a77375a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 31 Jan 2021 14:50:33 +0100
Subject: [PATCH 500/634] cozy: update to 0.8.1.
---
srcpkgs/cozy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 0a921c4f4ab..646f6049a13 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
# Template file for 'cozy'
pkgname=cozy
-version=0.7.8
+version=0.8.1
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
license="GPL-3.0-only, LGPL-3.0-only"
homepage="https://github.com/geigi/cozy"
distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=4eabffe6df7702a00fcf52f802a3839b0a05d8f423facf26157703e76c2c53bc
+checksum=16fdb225ee24a1e1acff62c3e3c3eb7bf8fd602350f4aa66508ee741ae13d030
From 2c07512cc7a032987af0e3f5f25ed3a1db46dbba Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 16:19:24 +0100
Subject: [PATCH 501/634] smenu: update to 0.9.17.
---
srcpkgs/smenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/smenu/template b/srcpkgs/smenu/template
index 4a8316bc957..fed55aeabbe 100644
--- a/srcpkgs/smenu/template
+++ b/srcpkgs/smenu/template
@@ -1,6 +1,6 @@
# Template file for 'smenu'
pkgname=smenu
-version=0.9.16
+version=0.9.17
revision=1
build_style=gnu-configure
makedepends="ncurses-devel"
@@ -9,6 +9,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://github.com/p-gen/smenu"
distfiles="https://github.com/p-gen/smenu/archive/v${version}.tar.gz"
-checksum=8db8026a8d95f01b9a4b775834432b15cfd248868ef2a2ec1232bd534d26dc09
+checksum=f9d174af52d92725710dbcfe3905d511901f810849d81d3f6fc6c51c30bebc7f
LDFLAGS="-lncurses"
From 9d0c42e8208c6e841aa189a34e2f0d359e879fc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 15:08:55 +0100
Subject: [PATCH 502/634] vde2: add patch to support OpenSSL-1.1
---
...yptcab-compile-against-openssl-1.1.0.patch | 97 +++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch
diff --git a/srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch b/srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch
new file mode 100644
index 00000000000..92dd0b7969b
--- /dev/null
+++ b/srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch
@@ -0,0 +1,97 @@
+Reason: doesn't compile with openssl-1.1.0
+Source: Taken from Arch repo
+ https://raw.githubusercontent.com/archlinux/svntogit-packages/e4ea86ebebfc446113d858542cf23723f1b2a891/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch
+ edited wto also support LIBRESSL
+
+--- src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000
++++ src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000
+@@ -22,7 +22,7 @@
+ exit(1);
+ }
+
+-static EVP_CIPHER_CTX ctx;
++static EVP_CIPHER_CTX *ctx;
+ static int ctx_initialized = 0;
+ static int encryption_disabled = 0;
+ static int nfd;
+@@ -30,6 +30,10 @@
+ static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
+ static int verbose = 0;
+
++#if OPENSSL_VERSION_NUMBER < 0x1010000 || defined LIBRESSL_VERSION_NUMBER
++#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x)
++#endif
++
+ void vc_printlog(int priority, const char *format, ...)
+ {
+ va_list arg;
+@@ -103,19 +107,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init (&ctx);
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
+ {
+ fprintf (stderr,"error in encrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
++ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
+ {
+ fprintf (stderr,"error in encrypt final\n");
+ olen = -1;
+@@ -124,7 +130,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_reset(ctx);
+ return olen;
+ }
+
+@@ -138,19 +144,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init (&ctx);
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
+ {
+ fprintf (stderr,"error in decrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
++ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
+ {
+ fprintf (stderr,"error in decrypt final\n");
+ olen = -1;
+@@ -159,7 +167,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_reset (ctx);
+ return olen;
+ }
+
From 7ed2581e2a7b3ca5910e4b445d29ed88cfe8d73f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 Feb 2021 07:47:38 -0600
Subject: [PATCH 503/634] aide: update to 0.17.1.
---
srcpkgs/aide/patches/fix-errorh-include.patch | 11 -----------
srcpkgs/aide/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/aide/patches/fix-errorh-include.patch
diff --git a/srcpkgs/aide/patches/fix-errorh-include.patch b/srcpkgs/aide/patches/fix-errorh-include.patch
deleted file mode 100644
index efc4f883c54..00000000000
--- a/srcpkgs/aide/patches/fix-errorh-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/aide.h.orig
-+++ include/aide.h
-@@ -33,7 +33,6 @@
- #if HAVE_FCNTL_H
- # include <fcntl.h>
- #endif
--#include "error.h"
-
- #ifndef TEMP_FAILURE_RETRY
- /* Evaluate EXPRESSION, and repeat as long as it returns -1 with errno'
-
diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index e376acbbaad..53631c15530 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
# Template file for 'aide'
pkgname=aide
-version=0.17
+version=0.17.1
revision=1
build_style=gnu-configure
configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -15,7 +15,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://aide.github.io/"
distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=4fd88d1d5ddc70c698c6519ebbc05c8d32c3f6d8137bbfdefeaebaafd6db867b
+checksum=a401c951938f1169ceaec868ce3594736e89c5c881578c263d8a824a06b0002d
post_configure() {
vsed -i config.h -e 's/cross/ino_t/g'
From 55fbcaa656079a7ef3effdec112d8accd38beba5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 15:41:58 +0100
Subject: [PATCH 504/634] sssd: update patch to work for both LibreSSL and
OpenSSL
---
srcpkgs/sssd/patches/libressl.patch | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/sssd/patches/libressl.patch b/srcpkgs/sssd/patches/libressl.patch
index 8c3a3aa18d8..495a1066bea 100644
--- a/srcpkgs/sssd/patches/libressl.patch
+++ b/srcpkgs/sssd/patches/libressl.patch
@@ -1,11 +1,3 @@
-diff -Naurp0 a/lib/certmap/sss_cert_content_crypto.c b/lib/certmap/sss_cert_content_crypto.c
---- src/lib/certmap/sss_cert_content_crypto.c 2020-09-06 16:39:47.669132066 +0200
-+++ src/lib/certmap/sss_cert_content_crypto.c 2020-09-06 16:39:51.923060279 +0200
-@@ -774,2 +774,2 @@ int sss_cert_get_content(TALLOC_CTX *mem
-- if ((X509_get_extension_flags(cert) & EXFLAG_KUSAGE)) {
-- cont->key_usage = X509_get_key_usage(cert);
-+ if (cert->ex_flags & EXFLAG_KUSAGE) {
-+ cont->key_usage = cert->ex_kusage;
diff -Naurp0 a/p11_child/p11_child_openssl.c b/p11_child/p11_child_openssl.c
--- src/p11_child/p11_child_openssl.c 2020-09-06 16:39:47.663132167 +0200
+++ src/p11_child/p11_child_openssl.c 2020-09-06 16:39:51.887060887 +0200
@@ -16,3 +8,19 @@ diff -Naurp0 a/util/crypto/libcrypto/crypto_hmac_sha1.c b/util/crypto/libcrypto/
+++ src/util/crypto/libcrypto/crypto_hmac_sha1.c 2020-09-06 16:39:51.870061174 +0200
@@ -19,0 +20 @@
+#include <limits.h>
+--- src/lib/certmap/sss_cert_content_crypto.c 2020-10-12 12:16:19.000000000 +0200
++++ - 2021-02-01 15:35:14.968899293 +0100
+@@ -771,8 +771,13 @@
+ ret = EIO;
+ goto done;
+ }
++#ifdef LIBRESSL_VERSION_NUMBER
++ if (cert->ex_flags & EXFLAG_KUSAGE) {
++ cont->key_usage = cert->ex_kusage;
++#else
+ if ((X509_get_extension_flags(cert) & EXFLAG_KUSAGE)) {
+ cont->key_usage = X509_get_key_usage(cert);
++#endif
+ } else {
+ /* According to X.509 https://www.itu.int/rec/T-REC-X.509-201610-I
+ * section 13.3.2 "Certificate match" "keyUsage matches if all of the
From daf5f399fbe41a287967700208560bad14f367b7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 Feb 2021 08:48:55 -0600
Subject: [PATCH 505/634] evtx: update to 0.6.9.
---
srcpkgs/evtx/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evtx/template b/srcpkgs/evtx/template
index 33f1d5db188..c873ebec570 100644
--- a/srcpkgs/evtx/template
+++ b/srcpkgs/evtx/template
@@ -1,11 +1,11 @@
# Template file for 'evtx'
pkgname=evtx
-version=0.6.8
+version=0.6.9
revision=1
build_style=cargo
short_desc="Parser for the Windows XML Event Log (EVTX) format"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/omerbenamram/evtx"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=839ca62854efb59b9c09e3061d4d52937c45bf539504fb36e2aec63898986dd6
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7ebbac7d442adbfdf00783f243b0746067a3d9f1c8f8dbd261b34bd85f3a4af4
From 92757fcd16f58f75097ab1b7b33bb5b8d0dc668f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 Feb 2021 09:17:37 -0600
Subject: [PATCH 506/634] python3-aniso8601: update to 8.1.1.
---
srcpkgs/python3-aniso8601/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-aniso8601/template b/srcpkgs/python3-aniso8601/template
index 29c9ca5ac21..436adeedfa9 100644
--- a/srcpkgs/python3-aniso8601/template
+++ b/srcpkgs/python3-aniso8601/template
@@ -1,6 +1,6 @@
# Template file for 'python3-aniso8601'
pkgname=python3-aniso8601
-version=8.1.0
+version=8.1.1
revision=1
wrksrc="aniso8601-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://bitbucket.org/nielsenb/aniso8601"
distfiles="${PYPI_SITE}/a/aniso8601/aniso8601-$version.tar.gz"
-checksum=246bf8d3611527030889e6df970878969d3a2f760ba3eb694fa1fb10e6ce53f9
+checksum=be08b19c19ca527af722f2d4ba4dc569db292ec96f7de963746df4bb0bff9250
post_install() {
vlicense LICENSE
From 92595a7d9a27a0c5eaef9604aa06dbcdc6e63d81 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 1 Feb 2021 09:10:08 -0600
Subject: [PATCH 507/634] libredwg: update to 0.12.1.
---
srcpkgs/libredwg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libredwg/template b/srcpkgs/libredwg/template
index cd4cb0c322b..ed71218f8dd 100644
--- a/srcpkgs/libredwg/template
+++ b/srcpkgs/libredwg/template
@@ -1,6 +1,6 @@
# Template file for 'libredwg'
pkgname=libredwg
-version=0.12
+version=0.12.1
revision=1
build_style=gnu-configure
configure_args="--disable-bindings"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/libredwg/"
distfiles="https://github.com/LibreDWG/libredwg/releases/download/${version}/libredwg-${version}.tar.xz"
-checksum=24cdcdf511909ec41500d265258a528c72dd046982906d475738748ea221fdf8
+checksum=f9fcdc6f66417c091a5887925b10cdc651403d323754b9196c52b5968fba0fdc
post_install() {
rm ${DESTDIR}/usr/share/{dwgadd.example,load_dwg.py}
From d5c318ea48400e0d43958d000c98b59e209d7d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 14:25:09 -0300
Subject: [PATCH 508/634] gimp: fix launch failure.
For some reason, gegl doesn't report the gegl:introspect operation as
available unless graphviz is installed. Since gegl:introspect isn't
necessarily required by other gegl dependants, add graphviz as a gimp
dependency instead.
Without this, if the user doesn't have graphviz installed, gimp will
fail to launch and complain that gegl doesn't support gegl:introspect.
---
srcpkgs/gimp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 332fb0b12e4..0378ad139c6 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -12,7 +12,8 @@ makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
poppler-glib-devel pygtk-devel glib-networking libwebp-devel
libheif-devel libopenjpeg2-devel x265-devel"
-depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
+# graphviz is necessary to enable gegl:introspect
+depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1 graphviz"
short_desc="GNU image manipulation program"
conf_files="/etc/gimp/${version%%.*}.0/*"
maintainer="fosslinux <fosslinux@aussies.space>"
From 1b19f499c3c15765afc1e1f726210f5cc9b49e9a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:44:02 +0200
Subject: [PATCH 509/634] xfce4-panel: update to 4.16.1.
---
srcpkgs/xfce4-panel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index f96808ecb10..2df7a5c04a8 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,7 +1,7 @@
# Template file for 'xfce4-panel'
pkgname=xfce4-panel
-version=4.16.0
-revision=2
+version=4.16.1
+revision=1
build_style=gnu-configure
build_helper="gir"
configure_args="--with-locales-dir=/usr/share/locale
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=5e979aeeb37d306d72858b1bc67448222ea7a68de01409055b846cd31f3cc53d
+checksum=fa099bc6be6592dbb828747a473c2e1b0e7f85afd945a98002b475bb6f975991
# Package build options
build_options="gir"
From ebc64b80c72424f318ce7d26d1f499a2f9293927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Feb 2021 21:24:08 +0100
Subject: [PATCH 510/634] libnumbertext: update to 1.0.7
Move static library to -devel subpkg.
---
srcpkgs/libnumbertext/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libnumbertext/template b/srcpkgs/libnumbertext/template
index 58ca03e2194..ad68e52442e 100644
--- a/srcpkgs/libnumbertext/template
+++ b/srcpkgs/libnumbertext/template
@@ -1,6 +1,6 @@
# Template file for 'libnumbertext'
pkgname=libnumbertext
-version=1.0.6
+version=1.0.7
revision=1
build_style=gnu-configure
short_desc="Language-neutral NUMBERTEXT and MONEYTEXT for LibreOffice Calc"
@@ -8,7 +8,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Numbertext/libnumbertext"
distfiles="http://dev-www.libreoffice.org/src/${pkgname}-${version}.tar.xz"
-checksum=739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57
+checksum=17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc
libnumbertext-devel_package() {
short_desc+=" - development files"
@@ -16,6 +16,7 @@ libnumbertext-devel_package() {
pkg_install() {
vmove usr/include
vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig
}
}
From 2b056d94b93f3f49680efa0b4a50c41230b5df8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Feb 2021 21:41:39 +0100
Subject: [PATCH 511/634] lollypop: update to 1.4.15
---
srcpkgs/lollypop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 054ae6e240f..69993862d1a 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
# Template file for 'lollypop'
pkgname=lollypop
-version=1.4.14
+version=1.4.15
revision=1
build_style=meson
hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Lollypop"
distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=18d1c3d733bf7ba855064a68183215f1d5717a6162aaca5df482b60c429347b1
+checksum=084f3e731eb6002940ba13e9d1592e5e1de923d8cc623d7fe3f77d861626826d
From 62b75a3ae939971d552e7634de199455eb2247ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 22:07:28 +0100
Subject: [PATCH 512/634] libguestfs: unbreak, enable musl
---
srcpkgs/libguestfs/patches/conf.patch | 19 +++++++++++++++++++
srcpkgs/libguestfs/template | 8 ++------
2 files changed, 21 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/libguestfs/patches/conf.patch
diff --git a/srcpkgs/libguestfs/patches/conf.patch b/srcpkgs/libguestfs/patches/conf.patch
new file mode 100644
index 00000000000..6e59e74a908
--- /dev/null
+++ b/srcpkgs/libguestfs/patches/conf.patch
@@ -0,0 +1,19 @@
+--- configure 2021-01-06 11:07:19.837834801 +0100
++++ - 2021-02-01 21:59:49.975607517 +0100
+@@ -63266,7 +63266,7 @@
+ else
+ as_fn_error $? "/etc/os-release not available, please specify the distro using --with-distro=DISTRO" "$LINENO" 5
+ fi
+-
++fi
+ if case $DISTRO in #(
+ REDHAT | SUSE | OPENMANDRIVA | MAGEIA ) :
+ true ;; #(
+@@ -63313,7 +63313,6 @@
+ fi
+
+
+-fi
+
+
+
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 339bdafce66..8fd4f17921a 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,5 +1,3 @@
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/29937/steps/shell_3/logs/stdio"
-
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.44.0
@@ -17,7 +15,7 @@ hostmakedepends="cpio gperf cdrtools flex pkg-config automake libtool qemu git
ocaml ocaml-findlib perl-Module-Build perl hivex supermin
$(vopt_if ruby ruby) $(vopt_if python python3) $(vopt_if go go) $(vopt_if php php) $(vopt_if lua lua53)"
makedepends="ncurses-devel pcre-devel augeas-devel libxml2-devel gettext-devel file-devel jansson-devel
- yajl-devel perl $(vopt_if ruby ruby-devel) $(vopt_if python python3-devel)
+ yajl-devel perl libtirpc-devel $(vopt_if ruby ruby-devel) $(vopt_if python python3-devel)
$(vopt_if php php-devel) $(vopt_if lua lua53-devel) $(vopt_if fuse fuse-devel)"
short_desc="Access and modify virtual machine disk image"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -31,9 +29,7 @@ conf_files="etc/libguestfs-tools.conf
etc/xdg/virt-builder/repos.d/libguestfs.gpg"
nocross=yes
-disable_parallel_build=yes
-
-archs="i686 x86_64 ppc64le"
+archs="i686* x86_64* ppc64le*"
build_options="ruby python go php lua fuse"
build_options_default="ruby fuse"
From 7cffa040dcfd6dc15b2eb6a58d6472b36c1e59a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 23:18:54 +0100
Subject: [PATCH 513/634] albert: remove package
The licensing is nonfree and potentially violates copyright of other contributors
Ref: https://github.com/void-linux/void-packages/issues/28394
https://bugs.archlinux.org/task/69366
https://github.com/albertlauncher/albert/issues/765#issuecomment-771086409
closes #28394
---
.../0002_FindPythonLibsNew.cmake.patch | 14 --------
srcpkgs/albert/template | 35 -------------------
srcpkgs/albert/update | 2 --
srcpkgs/removed-packages/template | 3 +-
4 files changed, 2 insertions(+), 52 deletions(-)
delete mode 100644 srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch
delete mode 100644 srcpkgs/albert/template
delete mode 100644 srcpkgs/albert/update
diff --git a/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch b/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch
deleted file mode 100644
index 40ad846536a..00000000000
--- a/srcpkgs/albert/patches/0002_FindPythonLibsNew.cmake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/python/pybind11/tools/FindPythonLibsNew.cmake
-+++ plugins/python/pybind11/tools/FindPythonLibsNew.cmake
-@@ -57,9 +57,9 @@ endif()
-
- # Use the Python interpreter to find the libs.
- if(PythonLibsNew_FIND_REQUIRED)
-- find_package(PythonInterp ${PythonLibsNew_FIND_VERSION} REQUIRED)
-+ find_package(PythonLibs ${PythonLibsNew_FIND_VERSION} REQUIRED)
- else()
-- find_package(PythonInterp ${PythonLibsNew_FIND_VERSION})
-+ find_package(PythonLibs ${PythonLibsNew_FIND_VERSION})
- endif()
-
- if(NOT PYTHONINTERP_FOUND)
diff --git a/srcpkgs/albert/template b/srcpkgs/albert/template
deleted file mode 100644
index b08a0320f4f..00000000000
--- a/srcpkgs/albert/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'albert'
-pkgname=albert
-version=0.16.1
-revision=3
-_plugins_hash=029bd8ccb58c4452bd82ab42be8739f1639e42d4
-_pybind_version=2.2.4
-build_style=cmake
-configure_args="-DBUILD_VIRTUALBOX=OFF"
-makedepends="libqalculate-devel muparser-devel python3-devel qt5-declarative-devel
- qt5-svg-devel qt5-x11extras-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
- qt5-plugin-sqlite qt5-plugin-tds qt5-charts-devel"
-depends="qt5-plugin-sqlite qt5-quickcontrols qt5-graphicaleffects"
-short_desc="Lightweight desktop environment agnostic launcher"
-maintainer="Nemh <nemh@protonmail.com>"
-license="GPL-3.0-or-later, BSD-3-Clause"
-homepage="https://github.com/albertlauncher/albert"
-distfiles="https://github.com/albertlauncher/albert/archive/v${version}.tar.gz
- https://github.com/albertlauncher/plugins/archive/${_plugins_hash}.tar.gz
- https://github.com/pybind/pybind11/archive/v${_pybind_version}.tar.gz"
-checksum="e244b5825ef453221b221d76df30f8496c2e176ec6b9c26db21735d8e809956a
- 1986041e464c87e7ccc4f01b0eb4302f101aa3d62f5b02929fc97f68b3a38623
- b69e83658513215b8d1443544d0549b7d231b9f201f6fc787a2b2218b408181e"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
-fi
-
-post_extract() {
- cp -rup ../plugins-${_plugins_hash}/* plugins
- cp -rup ../pybind11-${_pybind_version}/* plugins/python/pybind11
-}
-
-post_install() {
- vlicense ../pybind11-${_pybind_version}/LICENSE
-}
diff --git a/srcpkgs/albert/update b/srcpkgs/albert/update
deleted file mode 100644
index 0d01fc3e74f..00000000000
--- a/srcpkgs/albert/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://github.com/albertlauncher/albert/releases
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fc5eb68bd49..03d6c4399a2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=19
+revision=20
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -10,6 +10,7 @@ homepage="https://voidlinux.org"
replaces="
Platinum9-theme<=0.0.0.20170720_3
+ albert<=0.16.1_4
apg<=2.2.3_5
arm-mem-git<=20131108_2
arptables<=0.0.4_3
From 36e58da836d505090c2be553aff18397303e528f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 01:25:46 +0100
Subject: [PATCH 514/634] common/build-profile/i686-musl: fix triplet
---
common/build-profiles/i686-musl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/build-profiles/i686-musl.sh b/common/build-profiles/i686-musl.sh
index 7b9e232723c..e76ab89d6ae 100644
--- a/common/build-profiles/i686-musl.sh
+++ b/common/build-profiles/i686-musl.sh
@@ -1,5 +1,5 @@
XBPS_TARGET_CFLAGS="-mtune=i686"
XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
XBPS_TARGET_FFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TRIPLET="i686-pc-linux-musl"
+XBPS_TRIPLET="i686-linux-musl"
XBPS_RUST_TARGET="i686-unknown-linux-musl"
From b2ff037c4cb088ad77f9cad3d23a50bd2f3a330a Mon Sep 17 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, 1 Feb 2021 21:55:56 +0700
Subject: [PATCH 515/634] fcitx: enable gir on cross
While we're at it, build with -O2
---
srcpkgs/fcitx/template | 43 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 8373cf9ff97..8163dee0ca5 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,8 +1,9 @@
# Template file for 'fcitx'
pkgname=fcitx
version=4.2.9.8
-revision=2
+revision=3
build_style=cmake
+build_helper=gir
short_desc="Flexible Context-aware Input Tool with eXtension"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
@@ -10,14 +11,15 @@ homepage="https://fcitx-im.org/"
distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz"
checksum=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6
-hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules"
+hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel"
makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
json-c-devel opencc-devel
libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
lib32disabled=yes
-configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
+configure_args="-DCMAKE_BUILD_TYPE=None
+ -DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
-DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT=OFF
- -DFORCE_ENCHANT=ON -DENABLE_TEST=ON"
+ -DFORCE_ENCHANT=ON -DENABLE_TEST=ON -DENABLE_GIR=$(vopt_if gir ON OFF)"
# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
case "$XBPS_TARGET_MACHINE" in
@@ -25,10 +27,12 @@ case "$XBPS_TARGET_MACHINE" in
esac
if [ "$CROSS_BUILD" ]; then
- configure_args+=" -DENABLE_GIR=OFF"
- hostmakedepends+=" glib-devel fcitx"
+ hostmakedepends+=" fcitx"
fi
+build_options="gir"
+build_options_default="gir"
+
pre_configure() {
# include FcitxMacro.cmake without invoking fcitx4-config
vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \
@@ -46,17 +50,17 @@ pre_configure() {
fi
}
+pre_build() {
+ LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/lib/fcitx-utils"
+}
+
libfcitx_package() {
short_desc+=" - shared libraries"
pkg_install() {
- for i in config core gclient utils; do
- vmove "usr/lib/libfcitx-${i}.so.*"
- done
+ vmove "usr/lib/*.so.*"
vmove "usr/lib/fcitx/fcitx-*.so"
- for i in comp-spell-dict fcitx-{po-parser,scanner}; do
- vmove usr/lib/fcitx/libexec/${i}
- done
- if [ -z "$CROSS_BUILD" ]; then
+ vmove usr/lib/fcitx/libexec
+ if [ "$build_option_gir" ]; then
vmove usr/lib/girepository-1.0
fi
vlicense COPYING.LIBS
@@ -67,17 +71,12 @@ fcitx-devel_package() {
depends="libfcitx-${version}_${revision} glib-devel"
short_desc+=" - development files"
pkg_install() {
- for i in config gclient utils; do
- vmove usr/include/fcitx-${i}
- vmove usr/lib/pkgconfig/fcitx-${i}.pc
- vmove usr/lib/libfcitx-${i}.so
- done
vmove usr/bin/fcitx4-config
- vmove usr/include/fcitx
- vmove usr/lib/pkgconfig/fcitx.pc
- vmove usr/lib/libfcitx-core.so
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
vmove usr/share/cmake
- if [ -z "$CROSS_BUILD" ]; then
+ if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
}
From e7da32d9e330d81d65390b301c6970f1148ec9f5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 1 Feb 2021 14:50:29 +0100
Subject: [PATCH 516/634] disorderfs: update to 0.5.11.
---
srcpkgs/disorderfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/disorderfs/template b/srcpkgs/disorderfs/template
index 479514b962c..2eebbb374cf 100644
--- a/srcpkgs/disorderfs/template
+++ b/srcpkgs/disorderfs/template
@@ -1,6 +1,6 @@
# Template file for 'disorderfs'
pkgname=disorderfs
-version=0.5.10
+version=0.5.11
revision=1
build_style=gnu-makefile
make_check_target=test
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://reproducible-builds.org/tools/"
#changelog="https://salsa.debian.org/reproducible-builds/disorderfs/raw/master/NEWS"
distfiles="https://salsa.debian.org/reproducible-builds/disorderfs/-/archive/${version}/disorderfs-${version}.tar.bz2"
-checksum=f268a9c743a7b7f7b9d3e506d0454230a4fccce2e35850f772cae98eade07df6
+checksum=e13935220dccb13e6e3dbaf1c2f7b22015e3ac90083e00b35573b756050d9481
CXXFLAGS="-std=c++11 -Wno-unused-parameter -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse -DFUSE_USE_VERSION=26"
From fa91a20d101ce41734dd684af56aace1f6bd4c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 12:20:44 +0100
Subject: [PATCH 517/634] ccache: update to 4.2
---
srcpkgs/ccache/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 8b46fdd4686..25e948cf79e 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,7 +1,7 @@
# Template file for 'ccache'
pkgname=ccache
-version=4.1
-revision=2
+version=4.2
+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=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
+checksum=2f14b11888c39778c93814fc6843fc25ad60ff6ba4eeee3dff29a1bad67ba94f
if [ -z "$CHROOT_READY" ]; then
hostmakedepends="cmake-bootstrap"
From 52190f0b29bc30be9e9c2583e5171e5ee4fce2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 2 Feb 2021 13:07:46 +0100
Subject: [PATCH 518/634] doomretro: update to 4.0.
---
srcpkgs/doomretro/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 89ebd6c6b41..2ec38c3449a 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
# Template file for 'doomretro'
pkgname=doomretro
-version=3.6.1
+version=4.0
revision=1
build_style=cmake
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.doomretro.com"
distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=9d1becb85944c3426f8bbb3af8eb8980d423af033f065ff2e150c56364f5b3a5
+checksum=b98871010b0c3287e9f4482931fe678a6d087b73afcdbdbd51c9653512ac1305
From c9ca4627398998125855fbf44509bdc261aed2aa Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 2 Feb 2021 11:21:06 +0100
Subject: [PATCH 519/634] fuzzel: update to 1.5.1.
---
srcpkgs/fuzzel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 50ed5225939..84ea6b87c33 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
# Template file for 'fuzzel'
pkgname=fuzzel
-version=1.5.0
+version=1.5.1
revision=1
wrksrc="$pkgname"
build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
license="MIT"
homepage="https://codeberg.org/dnkl/fuzzel"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a67d6c56c9de465ce777b091163034a594a19d3c1cf411cccdca4a40a11a2410
+checksum=8a7394a32664638c91e865d63cf5d5a34d8caf4594854ed4867afae1a6f38eb7
post_install() {
rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
From a47622946050118dd90899fdee19e34bcdb25a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 14:02:53 +0100
Subject: [PATCH 520/634] linux-tools: fix i686-musl
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 9514eafc31f..8c46de1e1ea 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -192,7 +192,7 @@ perf_package() {
vmove usr/lib/perf
vmove usr/libexec/perf-core
vmove usr/share/bash-completion/completions/perf
- if ! [ "$XBPS_TARGET_MACHINE" = i686 ]; then
+ if ! [ "${XBPS_TARGET_MACHINE/-musl/}" = i686 ]; then
vmove usr/share/perf-core
fi
vmove /usr/share/doc/perf-tip
From 4f2c9eceb6f8a38db3d76052439c8d5a05317a37 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 2 Feb 2021 14:23:43 +0200
Subject: [PATCH 521/634] anydesk: update to 6.1.0, - also drop i686 - upstream
has ended support for 32bit.
---
srcpkgs/anydesk/template | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 29cd8825fde..65f573bcf98 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,8 +1,8 @@
# Template file for 'anydesk'
pkgname=anydesk
-version=6.0.1
-revision=3
-archs="i686 x86_64"
+version=6.1.0
+revision=1
+archs="x86_64"
create_wrksrc=yes
hostmakedepends="patchelf rpmextract w3m"
short_desc="Fast remote desktop application"
@@ -13,12 +13,9 @@ homepage="https://anydesk.com/remote-desktop"
nopie=yes
restricted=yes
-distfiles="https://download.anydesk.com/linux/anydesk_$version-1_$XBPS_TARGET_MACHINE.rpm"
-if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then
- checksum=df029878486944bf0400e90746fe738eee0fc3f849e7f47f19d432fcb357c03e
-elif [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
- checksum=b92a366a8233be44f556c81f274bdce3e527591987cc4c8d2b490fcd410305ed
-fi
+distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
+checksum=35772d898afa8cba0f410775fdd7e1e8e7b753130c906db94801895c0ea74754
+
_eula_digest=f6386c15e187b6eac0ccd2564d3a873ae07d4b46a6b61dda13464caf5d54a319
post_extract() {
From add63412c6f526a24a0042b70f9cc11b981a1795 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 2 Feb 2021 07:56:29 -0600
Subject: [PATCH 522/634] plantuml: update to 1.2021.0.
---
srcpkgs/plantuml/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d922c1def87..201a3258ce4 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
# Template file for 'plantuml'
pkgname=plantuml
reverts="8047_1 8053_1 8059_1"
-version=1.2020.17
+version=1.2021.0
revision=1
create_wrksrc=yes
hostmakedepends="unzip"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
license="GPL-2.0-or-later"
homepage="http://plantuml.com/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-jar-gplv2-${version}.zip"
-checksum=8aaa3a7ece83522d4ab036bb234e42524eb6443e905f5d435268b4a85a6ce8b1
+checksum=8825fd153063765f76c6039d131940cbf720e1599089ac9ad5e5814ec8ca9e99
do_build() {
mv ${pkgname}.jar ${pkgname}-${version}.jar
From 34e63c31a7e45986cf7d120aef5e0437f0cc544b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 16:55:35 +0100
Subject: [PATCH 523/634] gammu: update to 1.42.0.
---
srcpkgs/gammu/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gammu/template b/srcpkgs/gammu/template
index 869d4d6d35d..bb5d54bcfe9 100644
--- a/srcpkgs/gammu/template
+++ b/srcpkgs/gammu/template
@@ -1,6 +1,6 @@
# Template file for 'gammu'
pkgname=gammu
-version=1.40.0
+version=1.42.0
revision=1
build_style=cmake
hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Jakub Skrzypnik <jakub.skrzypnik@interia.pl>"
license="GPL-2.0-or-later"
homepage="https://wammu.eu"
distfiles="https://dl.cihar.com/gammu/releases/gammu-${version}.tar.bz2"
-checksum=07691cfbf082038b6d8d4ad418ac34c983de551902b1cbd777f09350657b8a9f
+checksum=6197f8b4d35746d31567e61880121def676f225eba05276648410eaa6ce60c9f
gammu-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
@@ -32,4 +32,3 @@ gammu-smsd_package() {
vmove "usr/lib/libgsmsd*"
}
}
-
From 90aaecaffac0b965c902f177c99f3d9caafc59bd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 2 Feb 2021 08:35:33 -0600
Subject: [PATCH 524/634] i3-gaps: update to 4.19.1.
---
srcpkgs/i3-gaps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index 916ef6729c2..0f6f3ae61ff 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,6 +1,6 @@
# Template file for 'i3-gaps'
pkgname=i3-gaps
-version=4.19
+version=4.19.1
revision=1
wrksrc="i3-${version}"
build_style=meson
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
license="BSD-3-Clause"
homepage="https://github.com/Airblader/i3"
distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=dbd739dae5c16a94763dac0a7407d0307f0814f7bf48b99591b772820c874b4f
+checksum=97f33544f0a64a325b7b98cd4ad17dcf6f2c8ead1350d378154b76af1798e8fc
provides="i3-${version}_${revision}"
replaces="i3>=0"
From aa41d88a8dfb62fbff3b52bb5269c81293a7a0a7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 2 Feb 2021 16:26:03 +0200
Subject: [PATCH 525/634] skype: update to 8.68.0.100.
---
srcpkgs/skype/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 188bd20d8e9..b9060269780 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
# Template file for 'skype'
# This just repackages the debian package.
pkgname=skype
-version=8.67.0.96
+version=8.68.0.100
revision=1
archs="x86_64"
depends="elogind"
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:skype-servicesagreement"
homepage="https://www.skype.com"
distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
-checksum=ea138f3241e27549b05173c638efdc029cf5e0030c534085872703263584b0c7
+checksum=8078e041174d0013be47e7dc0eeac70c042d6697242312db38333a4f1cfe2c7e
repository="nonfree"
nostrip="yes"
From 66890316fd76fa030583a1dd9da9cdaed2521886 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 2 Feb 2021 17:02:28 +0100
Subject: [PATCH 526/634] wps-office: revbump to "fix" some shlib problems
the package did list qt4 as a dependencie, even so it ships with qt4 itself
just revbump to make it obvious to users that they need to update
---
srcpkgs/wps-office/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index 68180a6e4f5..fdb9a6b2120 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,7 +1,7 @@
# Template file for 'wps-office'
pkgname=wps-office
version=11.1.0.10161
-revision=1
+revision=2
archs="x86_64"
create_wrksrc=yes
makedepends="rpmextract"
From c5cd943d10e885bfbe4d3b4d8a4d0fda55710611 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 2 Feb 2021 11:53:03 -0600
Subject: [PATCH 527/634] mongo-c-driver: update to 1.17.4.
---
srcpkgs/mongo-c-driver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 03488bc2cd0..e360a5c65b1 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
# Template file for 'mongo-c-driver'
pkgname=mongo-c-driver
-version=1.17.3
+version=1.17.4
revision=1
build_style=cmake
configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://mongoc.org"
distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=6594cbae17389005bcac5a8d4091af3be4894d5314a519504d4b4509effcc0df
+checksum=9ec8fe7fb54d636886fa823460658ccf660e3d82520d10810fb7c9d302ac974f
mongo-c-driver-devel_package() {
short_desc+=" - development files"
From 6f5b19f37612af5e5f943d6146dd84a7e675c7db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Feb 2021 12:41:19 -0500
Subject: [PATCH 528/634] python3-numpy: update to 1.20.0.
---
srcpkgs/python3-numpy/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index ae5a0d09532..752fb593e48 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,7 +1,7 @@
# Template file for 'python3-numpy'
pkgname=python3-numpy
-version=1.19.5
-revision=2
+version=1.20.0
+revision=1
wrksrc="numpy-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="BSD-3-Clause"
homepage="https://www.numpy.org/"
distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=43fe3bcdf27a2eb27196a1d140385aeece71c8b1a6eda18d2c6365239e50c60f
+checksum=f30566b4a0d168a6869bef55b5843a2c8ed743f136fc80b305d6b8604828aea0
alternatives="numpy:f2py:/usr/bin/f2py3"
build_options="openblas"
@@ -37,6 +37,13 @@ post_patch() {
if [ "$XBPS_TARGET_LIBC" = musl ] ; then
vsed -i 's|"backtrace",||' numpy/core/setup_common.py
fi
+
+ if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+ # When host/target word sizes disagree, this $werror header
+ # triggers -Werror failures about redefining SIZEOF_OFF_T from
+ # the wrong host size to the correct target size
+ vsed -e 's/\$werror//' -i numpy/core/src/_simd/_simd.dispatch.c.src
+ fi
}
pre_build() {
From 07fc295c2d79126d6d4034865e1b2ea31f005668 Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Tue, 2 Feb 2021 20:42:11 +0300
Subject: [PATCH 529/634] qalculate: update to 3.16.1.
---
srcpkgs/qalculate/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index d581a74bf40..ec81d9cf9fd 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
# Template file for 'qalculate'
# NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
pkgname=qalculate
-version=3.14.0
+version=3.16.1
revision=1
wrksrc="lib${pkgname}-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
license="GPL-2.0-or-later"
homepage="https://qalculate.github.io"
distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=ef422aa54eac7c711ece65dd3a5cbc66370d3e17173465313201897c201e7d3e
+checksum=bbe837073bf0d1995fe7ead4aae2b2e24260351048f6a513a9ca210342ce8e59
libqalculate_package() {
short_desc+=" - library files"
From da3abebcfdba61ccf578a15d357acbaa96b574ae Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Tue, 2 Feb 2021 20:42:18 +0300
Subject: [PATCH 530/634] qalculate-gtk: update to 3.16.0.
---
srcpkgs/qalculate-gtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 1938fb85c19..8d31b084218 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'qalculate-gtk'
# NOTE: keep this package synchronized with "srcpkgs/qalculate"
pkgname=qalculate-gtk
-version=3.14.0
+version=3.16.0
revision=1
build_style=gnu-configure
hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
license="GPL-2.0-or-later"
homepage="https://qalculate.github.io"
distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=704dd3a98b47e0a84eb61b80c50cd6c445b37a1d28c1b1c271d7aef3592657e7
+checksum=79cbdb9705921cbe5fe9593fb798cb68c455596bc20584c6d4c930c28137655f
From fc4a8bd67780daa72c1880cc9d3c37a0789b77b2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 2 Feb 2021 20:02:24 +0100
Subject: [PATCH 531/634] syncthing: update to 1.13.0.
---
srcpkgs/syncthing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 8c9dc67fbfe..1d27cf82139 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.12.1
+version=1.13.0
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -18,7 +18,7 @@ license="MPL-2.0"
homepage="http://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=5751365374e03c32f731aeb1d07f7df0984eca30e14878d636b91cd35f0db1c3
+checksum=b31d4a323c6c970c580ecab3fd2327c5ba2709286b766b157139a5e393795bc2
pre_build() {
GOARCH= go generate \
From 6d5ba155adbaab7398a66a3c3751f5b0f91a4319 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Mon, 11 Jan 2021 16:26:38 -0700
Subject: [PATCH 532/634] New package: jamulus-3.6.2
---
srcpkgs/jamulus/template | 20 ++++++++++++++++++++
srcpkgs/jamulus/update | 1 +
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/jamulus/template
create mode 100644 srcpkgs/jamulus/update
diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template
new file mode 100644
index 00000000000..1df45532ce1
--- /dev/null
+++ b/srcpkgs/jamulus/template
@@ -0,0 +1,20 @@
+# Template file for 'jamulus'
+pkgname=jamulus
+version=3.6.2
+revision=1
+_version=r${version//./_}
+wrksrc=${pkgname}-${_version}
+build_style=qmake
+configure_args="Jamulus.pro"
+hostmakedepends="pkg-config"
+makedepends="qt5-declarative-devel jack-devel"
+short_desc="Play music online. With friends. For free"
+maintainer="KawaiiAmber <japaneselearning101@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://jamulus.io"
+distfiles="https://github.com/corrados/jamulus/archive/${_version}.tar.gz"
+checksum=6bea992f0e4b6a9d08104f8ad9d42b630d523da258e201f70418cecda1c11dac
+
+if [ "${CROSS_BUILD}" ]; then
+ hostmakedepends+=" qt5-devel"
+fi
diff --git a/srcpkgs/jamulus/update b/srcpkgs/jamulus/update
new file mode 100644
index 00000000000..bf1d58d1e62
--- /dev/null
+++ b/srcpkgs/jamulus/update
@@ -0,0 +1 @@
+pattern="r\K[0-9_]+_[0-9_]+"
From ff4af18ffde16a607b68c4813d5ebfb6a4436abc Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Mon, 1 Feb 2021 15:00:56 -0800
Subject: [PATCH 533/634] pinephone-kernel: update to 5.10.12.
---
.../files/{config => pinephone-dotconfig} | 569 +++++++++---------
srcpkgs/pinephone-kernel/template | 61 +-
2 files changed, 334 insertions(+), 296 deletions(-)
rename srcpkgs/pinephone-kernel/files/{config => pinephone-dotconfig} (93%)
diff --git a/srcpkgs/pinephone-kernel/files/config b/srcpkgs/pinephone-kernel/files/pinephone-dotconfig
similarity index 93%
rename from srcpkgs/pinephone-kernel/files/config
rename to srcpkgs/pinephone-kernel/files/pinephone-dotconfig
index f3338771c76..f112f3ebe65 100644
--- a/srcpkgs/pinephone-kernel/files/config
+++ b/srcpkgs/pinephone-kernel/files/pinephone-dotconfig
@@ -1,12 +1,13 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.8.10 Kernel Configuration
+# Linux/arm64 5.10.12 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 9.3.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=232000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
CONFIG_CLANG_VERSION=0
+CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y
@@ -49,6 +50,7 @@ CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_DOMAIN_HIERARCHY=y
CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
+CONFIG_GENERIC_IRQ_IPI=y
CONFIG_GENERIC_MSI_IRQ=y
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
CONFIG_IRQ_MSI_IOMMU=y
@@ -106,13 +108,12 @@ CONFIG_TREE_RCU=y
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_NEED_SEGCBLIST=y
# end of RCU Subsystem
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKCONFIG is not set
# CONFIG_IKHEADERS is not set
CONFIG_LOG_BUF_SHIFT=17
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
@@ -137,40 +138,42 @@ CONFIG_BLK_CGROUP=y
CONFIG_CGROUP_WRITEBACK=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
-# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set
-# CONFIG_CGROUP_FREEZER is not set
+CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
# CONFIG_PROC_PID_CPUSET is not set
CONFIG_CGROUP_DEVICE=y
-# CONFIG_CGROUP_CPUACCT is not set
+CONFIG_CGROUP_CPUACCT=y
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
CONFIG_SOCK_CGROUP_DATA=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
CONFIG_IPC_NS=y
CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_SCHED_AUTOGROUP=y
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_RD_GZIP=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
CONFIG_BOOT_CONFIG=y
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
CONFIG_SYSCTL=y
CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
@@ -199,12 +202,13 @@ CONFIG_IO_URING=y
CONFIG_ADVISE_SYSCALLS=y
CONFIG_MEMBARRIER=y
CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
CONFIG_KALLSYMS_BASE_RELATIVE=y
CONFIG_BPF_SYSCALL=y
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
-# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_USERMODE_DRIVER=y
+# CONFIG_BPF_PRELOAD is not set
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
CONFIG_RSEQ=y
@@ -215,7 +219,6 @@ CONFIG_HAVE_PERF_EVENTS=y
# Kernel Performance Events And Counters
#
CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# end of Kernel Performance Events And Counters
CONFIG_VM_EVENT_COUNTERS=y
@@ -230,14 +233,14 @@ CONFIG_SLAB_MERGE_DEFAULT=y
CONFIG_SLUB_CPU_PARTIAL=y
CONFIG_SYSTEM_DATA_VERIFICATION=y
# CONFIG_PROFILING is not set
-CONFIG_TRACEPOINTS=y
# end of General setup
CONFIG_ARM64=y
CONFIG_64BIT=y
CONFIG_MMU=y
CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARM64_CONT_PTE_SHIFT=4
+CONFIG_ARM64_CONT_PMD_SHIFT=4
CONFIG_ARCH_MMAP_RND_BITS_MIN=18
CONFIG_ARCH_MMAP_RND_BITS_MAX=24
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
@@ -276,10 +279,12 @@ CONFIG_ARCH_SUNXI=y
# CONFIG_ARCH_BITMAIN is not set
# CONFIG_ARCH_BRCMSTB is not set
# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCH_K3 is not set
# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_KEEMBAY is not set
# CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set
@@ -298,6 +303,7 @@ CONFIG_ARCH_SUNXI=y
# CONFIG_ARCH_THUNDER2 is not set
# CONFIG_ARCH_UNIPHIER is not set
# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VISCONTI is not set
# CONFIG_ARCH_XGENE is not set
# CONFIG_ARCH_ZX is not set
# CONFIG_ARCH_ZYNQMP is not set
@@ -316,17 +322,17 @@ CONFIG_ARM64_ERRATUM_827319=y
CONFIG_ARM64_ERRATUM_824069=y
CONFIG_ARM64_ERRATUM_819472=y
# CONFIG_ARM64_ERRATUM_832075 is not set
-# CONFIG_ARM64_ERRATUM_834220 is not set
CONFIG_ARM64_ERRATUM_845719=y
CONFIG_ARM64_ERRATUM_843419=y
# CONFIG_ARM64_ERRATUM_1024718 is not set
-CONFIG_ARM64_ERRATUM_1418040=y
+# CONFIG_ARM64_ERRATUM_1418040 is not set
# CONFIG_ARM64_ERRATUM_1165522 is not set
# CONFIG_ARM64_ERRATUM_1319367 is not set
# CONFIG_ARM64_ERRATUM_1530923 is not set
# CONFIG_ARM64_ERRATUM_1286807 is not set
# CONFIG_ARM64_ERRATUM_1463225 is not set
# CONFIG_ARM64_ERRATUM_1542419 is not set
+CONFIG_ARM64_ERRATUM_1508412=y
# CONFIG_CAVIUM_ERRATUM_22375 is not set
# CONFIG_CAVIUM_ERRATUM_23154 is not set
# CONFIG_CAVIUM_ERRATUM_27456 is not set
@@ -374,8 +380,7 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_SECCOMP=y
-CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT is not set
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
# CONFIG_KEXEC is not set
# CONFIG_KEXEC_FILE is not set
@@ -383,9 +388,6 @@ CONFIG_PARAVIRT=y
# CONFIG_XEN is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_HARDEN_EL2_VECTORS=y
-CONFIG_ARM64_SSBD=y
CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -396,46 +398,51 @@ CONFIG_KUSER_HELPERS=y
#
# ARMv8.1 architectural features
#
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_PAN=y
-CONFIG_ARM64_LSE_ATOMICS=y
-CONFIG_ARM64_USE_LSE_ATOMICS=y
-CONFIG_ARM64_VHE=y
+# CONFIG_ARM64_HW_AFDBM is not set
+# CONFIG_ARM64_PAN is not set
+# CONFIG_ARM64_USE_LSE_ATOMICS is not set
+# CONFIG_ARM64_VHE is not set
# end of ARMv8.1 architectural features
#
# ARMv8.2 architectural features
#
-CONFIG_ARM64_UAO=y
+# CONFIG_ARM64_UAO is not set
# CONFIG_ARM64_PMEM is not set
# CONFIG_ARM64_RAS_EXTN is not set
-CONFIG_ARM64_CNP=y
+# CONFIG_ARM64_CNP is not set
# end of ARMv8.2 architectural features
#
# ARMv8.3 architectural features
#
+# CONFIG_ARM64_PTR_AUTH is not set
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
CONFIG_AS_HAS_PAC=y
+CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
# end of ARMv8.3 architectural features
#
# ARMv8.4 architectural features
#
-CONFIG_ARM64_AMU_EXTN=y
+# CONFIG_ARM64_AMU_EXTN is not set
+CONFIG_AS_HAS_ARMV8_4=y
+# CONFIG_ARM64_TLB_RANGE is not set
# end of ARMv8.4 architectural features
#
# ARMv8.5 architectural features
#
-CONFIG_ARM64_BTI=y
+# CONFIG_ARM64_BTI is not set
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
-CONFIG_ARM64_E0PD=y
-CONFIG_ARCH_RANDOM=y
+# CONFIG_ARM64_E0PD is not set
+# CONFIG_ARCH_RANDOM is not set
+CONFIG_ARM64_AS_HAS_MTE=y
+CONFIG_ARM64_MTE=y
# end of ARMv8.5 architectural features
-CONFIG_ARM64_SVE=y
+# CONFIG_ARM64_SVE is not set
CONFIG_ARM64_MODULE_PLTS=y
# CONFIG_ARM64_PSEUDO_NMI is not set
CONFIG_RELOCATABLE=y
@@ -460,7 +467,7 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_HIBERNATION is not set
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
+CONFIG_PM_AUTOSLEEP=y
CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=100
CONFIG_PM_WAKELOCKS_GC=y
@@ -499,6 +506,7 @@ CONFIG_DT_IDLE_STATES=y
#
CONFIG_ARM_CPUIDLE=y
CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
# end of ARM CPU Idle Drivers
# end of CPU Idle
@@ -539,11 +547,11 @@ CONFIG_ARM_SCPI_PROTOCOL=y
CONFIG_ARM_SCPI_POWER_DOMAIN=y
# CONFIG_ARM_SDE_INTERFACE is not set
# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_EFI_EARLYCON=y
CONFIG_ARM_PSCI_FW=y
# CONFIG_ARM_PSCI_CHECKER is not set
CONFIG_HAVE_ARM_SMCCC=y
CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+# CONFIG_ARM_SMCCC_SOC_ID is not set
#
# Tegra firmware driver
@@ -551,51 +559,35 @@ CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
# end of Tegra firmware driver
# end of Firmware Drivers
-CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
-CONFIG_KVM_ARM_PMU=y
-CONFIG_KVM_INDIRECT_VECTORS=y
+# CONFIG_VIRTUALIZATION is not set
CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=y
-CONFIG_CRYPTO_SHA3_ARM64=y
-CONFIG_CRYPTO_SM3_ARM64_CE=y
-CONFIG_CRYPTO_SM4_ARM64_CE=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CHACHA20_NEON=y
-CONFIG_CRYPTO_POLY1305_NEON=y
+CONFIG_CRYPTO_SHA256_ARM64=m
+CONFIG_CRYPTO_SHA512_ARM64=m
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_SM4_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64=m
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
+CONFIG_CRYPTO_CHACHA20_NEON=m
+CONFIG_CRYPTO_POLY1305_NEON=m
# CONFIG_CRYPTO_NHPOLY1305_NEON is not set
-CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_BS=m
#
# General architecture-dependent options
#
+CONFIG_SET_FS=y
# CONFIG_KPROBES is not set
CONFIG_JUMP_LABEL=y
# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
@@ -626,15 +618,17 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_ARCH_STACKLEAK=y
CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR is not set
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_HAVE_ARCH_HUGE_VMAP=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
@@ -645,7 +639,6 @@ CONFIG_ARCH_MMAP_RND_BITS=18
CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
@@ -658,9 +651,9 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_HAVE_ARCH_COMPILER_H=y
CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
# CONFIG_LOCK_EVENT_COUNTS is not set
CONFIG_ARCH_HAS_RELR=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
#
# GCOV-based kernel profiling
@@ -692,10 +685,9 @@ CONFIG_BLOCK=y
CONFIG_BLK_RQ_ALLOC_TIME=y
CONFIG_BLK_SCSI_REQUEST=y
CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_BSGLIB is not set
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=m
+# CONFIG_BLK_DEV_INTEGRITY is not set
# CONFIG_BLK_DEV_ZONED is not set
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
@@ -746,7 +738,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y
# CONFIG_BFQ_CGROUP_DEBUG is not set
# end of IO Schedulers
-CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
@@ -834,7 +825,6 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_SPARSEMEM_MANUAL=y
CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
@@ -849,7 +839,6 @@ CONFIG_MIGRATION=y
CONFIG_CONTIG_ALLOC=y
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_BOUNCE=y
-CONFIG_MMU_NOTIFIER=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
@@ -858,20 +847,19 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_CLEANCACHE is not set
# CONFIG_FRONTSWAP is not set
CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_DEBUGFS=y
CONFIG_CMA_AREAS=7
CONFIG_ZPOOL=y
CONFIG_ZBUD=y
CONFIG_Z3FOLD=y
CONFIG_ZSMALLOC=y
-# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
# CONFIG_ZSMALLOC_STAT is not set
CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_IDLE_PAGE_TRACKING is not set
CONFIG_ARCH_HAS_PTE_DEVMAP=y
CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
# CONFIG_PERCPU_STATS is not set
# CONFIG_GUP_BENCHMARK is not set
CONFIG_ARCH_HAS_PTE_SPECIAL=y
@@ -908,6 +896,7 @@ CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_IP_MULTIPLE_TABLES is not set
# CONFIG_IP_ROUTE_MULTIPATH is not set
# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_ROUTE_CLASSID=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE_DEMUX is not set
@@ -943,7 +932,6 @@ CONFIG_IPV6=y
# CONFIG_IPV6_RPL_LWTUNNEL is not set
CONFIG_MPTCP=y
CONFIG_MPTCP_IPV6=y
-# CONFIG_MPTCP_HMAC_TEST is not set
# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
CONFIG_NETFILTER=y
@@ -1112,7 +1100,81 @@ CONFIG_HAVE_NET_DSA=y
# CONFIG_PHONET is not set
# CONFIG_6LOWPAN is not set
# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_PRIO is not set
+# CONFIG_NET_SCH_MULTIQ is not set
+# CONFIG_NET_SCH_RED is not set
+# CONFIG_NET_SCH_SFB is not set
+# CONFIG_NET_SCH_SFQ is not set
+# CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_CBS is not set
+# CONFIG_NET_SCH_ETF is not set
+# CONFIG_NET_SCH_TAPRIO is not set
+# CONFIG_NET_SCH_GRED is not set
+# CONFIG_NET_SCH_DSMARK is not set
+# CONFIG_NET_SCH_NETEM is not set
+# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_SKBPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_QFQ is not set
+# CONFIG_NET_SCH_CODEL is not set
+# CONFIG_NET_SCH_FQ_CODEL is not set
+# CONFIG_NET_SCH_CAKE is not set
+# CONFIG_NET_SCH_FQ is not set
+# CONFIG_NET_SCH_HHF is not set
+# CONFIG_NET_SCH_PIE is not set
+# CONFIG_NET_SCH_INGRESS is not set
+# CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_ETS is not set
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+# CONFIG_NET_CLS_TCINDEX is not set
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+# CONFIG_NET_CLS_U32 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
+# CONFIG_NET_CLS_FLOW is not set
+CONFIG_NET_CLS_CGROUP=m
+# CONFIG_NET_CLS_BPF is not set
+# CONFIG_NET_CLS_FLOWER is not set
+# CONFIG_NET_CLS_MATCHALL is not set
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+# CONFIG_GACT_PROB is not set
+CONFIG_NET_ACT_MIRRED=m
+# CONFIG_NET_ACT_SAMPLE is not set
+# CONFIG_NET_ACT_NAT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_SIMP is not set
+# CONFIG_NET_ACT_SKBEDIT is not set
+# CONFIG_NET_ACT_CSUM is not set
+# CONFIG_NET_ACT_MPLS is not set
+# CONFIG_NET_ACT_VLAN is not set
+# CONFIG_NET_ACT_BPF is not set
+# CONFIG_NET_ACT_SKBMOD is not set
+# CONFIG_NET_ACT_IFE is not set
+# CONFIG_NET_ACT_TUNNEL_KEY is not set
+# CONFIG_NET_ACT_CT is not set
+# CONFIG_NET_ACT_GATE is not set
+# CONFIG_NET_TC_SKB_EXT is not set
+CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
# CONFIG_DNS_RESOLVER is not set
# CONFIG_BATMAN_ADV is not set
@@ -1141,7 +1203,6 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing
#
# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
# end of Network testing
# end of Networking options
@@ -1160,8 +1221,6 @@ CONFIG_BT_LE=y
CONFIG_BT_LEDS=y
# CONFIG_BT_MSFTEXT is not set
CONFIG_BT_DEBUGFS=y
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_FEATURE_DEBUG is not set
#
# Bluetooth device drivers
@@ -1260,16 +1319,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
#
CONFIG_FW_LOADER=y
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_EXTRA_FIRMWARE_DIR is not set
# CONFIG_FW_LOADER_USER_HELPER is not set
# CONFIG_FW_LOADER_COMPRESS is not set
CONFIG_FW_CACHE=y
# end of Firmware loader
CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_GENERIC_CPU_VULNERABILITIES=y
@@ -1350,6 +1405,7 @@ CONFIG_BLK_DEV_NBD=m
# CONFIG_SRAM is not set
# CONFIG_XILINX_SDFEC is not set
# CONFIG_PVPANIC is not set
+# CONFIG_HISI_HIKEY_USB is not set
CONFIG_MODEM_POWER=m
# CONFIG_C2PORT is not set
@@ -1372,13 +1428,6 @@ CONFIG_MODEM_POWER=m
# CONFIG_SENSORS_LIS3_I2C is not set
# CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-# CONFIG_VOP_BUS is not set
-# end of Intel MIC & related support
-
# CONFIG_ECHO is not set
# CONFIG_MISC_RTSX_USB is not set
# CONFIG_UACCE is not set
@@ -1459,6 +1508,7 @@ CONFIG_NET_CORE=y
CONFIG_WIREGUARD=m
# CONFIG_WIREGUARD_DEBUG is not set
# CONFIG_EQUALIZER is not set
+# CONFIG_IFB is not set
# CONFIG_NET_TEAM is not set
# CONFIG_MACVLAN is not set
# CONFIG_IPVLAN is not set
@@ -1479,8 +1529,14 @@ CONFIG_VETH=m
# end of Distributed Switch Architecture drivers
# CONFIG_ETHERNET is not set
-# CONFIG_MDIO_DEVICE is not set
# CONFIG_PHYLIB is not set
+# CONFIG_MDIO_DEVICE is not set
+
+#
+# PCS device drivers
+#
+# end of PCS device drivers
+
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
@@ -1543,6 +1599,7 @@ CONFIG_WLAN=y
# CONFIG_WLAN_VENDOR_INTERSIL is not set
# CONFIG_WLAN_VENDOR_MARVELL is not set
# CONFIG_WLAN_VENDOR_MEDIATEK is not set
+# CONFIG_WLAN_VENDOR_MICROCHIP is not set
# CONFIG_WLAN_VENDOR_RALINK is not set
# CONFIG_WLAN_VENDOR_REALTEK is not set
# CONFIG_WLAN_VENDOR_RSI is not set
@@ -1682,6 +1739,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m
# CONFIG_TOUCHSCREEN_ZFORCE is not set
# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
# CONFIG_TOUCHSCREEN_IQS5XX is not set
+# CONFIG_TOUCHSCREEN_ZINITIX is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -1785,6 +1843,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
# CONFIG_HVC_DCC is not set
CONFIG_SERIAL_DEV_BUS=y
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+# CONFIG_VIRTIO_CONSOLE is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
CONFIG_DEVMEM=y
@@ -1793,7 +1852,6 @@ CONFIG_DEVMEM=y
# CONFIG_XILLYBUS is not set
# end of Character devices
-# CONFIG_RANDOM_TRUST_CPU is not set
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
#
@@ -1886,13 +1944,18 @@ CONFIG_PINMUX=y
CONFIG_GENERIC_PINMUX_FUNCTIONS=y
CONFIG_PINCONF=y
CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
CONFIG_PINCTRL_AXP209=y
# CONFIG_PINCTRL_MCP23S08 is not set
CONFIG_PINCTRL_SINGLE=y
# CONFIG_PINCTRL_SX150X is not set
# CONFIG_PINCTRL_STMFX is not set
# CONFIG_PINCTRL_OCELOT is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
CONFIG_PINCTRL_SUNXI=y
# CONFIG_PINCTRL_SUN4I_A10 is not set
# CONFIG_PINCTRL_SUN5I is not set
@@ -1910,14 +1973,17 @@ CONFIG_PINCTRL_SUNXI=y
# CONFIG_PINCTRL_SUN9I_A80_R is not set
CONFIG_PINCTRL_SUN50I_A64=y
CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_A100=y
+CONFIG_PINCTRL_SUN50I_A100_R=y
# CONFIG_PINCTRL_SUN50I_H5 is not set
# CONFIG_PINCTRL_SUN50I_H6 is not set
# CONFIG_PINCTRL_SUN50I_H6_R is not set
CONFIG_GPIOLIB=y
CONFIG_GPIOLIB_FASTPATH_LIMIT=512
CONFIG_OF_GPIO=y
-# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
#
# Memory mapped GPIO drivers
@@ -1950,6 +2016,7 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not set
# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCA9570 is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_TPIC2810 is not set
# end of I2C GPIO expanders
@@ -1967,7 +2034,6 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_AGGREGATOR is not set
# CONFIG_GPIO_MOCKUP is not set
# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
CONFIG_POWER_RESET=y
# CONFIG_POWER_RESET_BRCMSTB is not set
# CONFIG_POWER_RESET_GPIO is not set
@@ -1989,7 +2055,6 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_BATTERY_DS2780 is not set
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
# CONFIG_BATTERY_SBS is not set
# CONFIG_CHARGER_SBS is not set
# CONFIG_MANAGER_SBS is not set
@@ -2011,7 +2076,9 @@ CONFIG_AXP20X_POWER=y
# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_BQ24257 is not set
# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ2515X is not set
# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_CHARGER_RT9455 is not set
@@ -2019,6 +2086,7 @@ CONFIG_AXP20X_POWER=y
# CONFIG_CHARGER_BD99954 is not set
# CONFIG_HWMON is not set
CONFIG_THERMAL=y
+# CONFIG_THERMAL_NETLINK is not set
CONFIG_THERMAL_STATISTICS=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
CONFIG_THERMAL_OF=y
@@ -2033,7 +2101,6 @@ CONFIG_THERMAL_GOV_BANG_BANG=y
# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
CONFIG_CPU_THERMAL=y
CONFIG_CPU_FREQ_THERMAL=y
-# CONFIG_CLOCK_THERMAL is not set
# CONFIG_DEVFREQ_THERMAL is not set
# CONFIG_THERMAL_EMULATION is not set
# CONFIG_THERMAL_MMIO is not set
@@ -2137,7 +2204,6 @@ CONFIG_MFD_AXP20X_RSB=y
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SMSC is not set
# CONFIG_ABX500_CORE is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN6I_PRCM=y
@@ -2193,6 +2259,7 @@ CONFIG_REGULATOR_AXP20X=y
# CONFIG_REGULATOR_DA9210 is not set
# CONFIG_REGULATOR_DA9211 is not set
# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_FAN53880 is not set
CONFIG_REGULATOR_GPIO=y
# CONFIG_REGULATOR_ISL9305 is not set
# CONFIG_REGULATOR_ISL6271A is not set
@@ -2214,14 +2281,19 @@ CONFIG_REGULATOR_GPIO=y
# CONFIG_REGULATOR_MP886X is not set
# CONFIG_REGULATOR_MPQ7920 is not set
# CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_PCA9450 is not set
# CONFIG_REGULATOR_PFUZE100 is not set
# CONFIG_REGULATOR_PV88060 is not set
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+# CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RTMV20 is not set
# CONFIG_REGULATOR_SLG51000 is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_SY8824X is not set
+# CONFIG_REGULATOR_SY8827N is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
# CONFIG_REGULATOR_TPS65023 is not set
@@ -2261,6 +2333,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
CONFIG_V4L2_FWNODE=m
# end of Video4Linux options
@@ -2355,6 +2428,7 @@ CONFIG_VIDEO_SUN8I_ROTATE=m
# CONFIG_VIDEO_TW9906 is not set
# CONFIG_VIDEO_TW9910 is not set
# CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_MAX9286 is not set
#
# Video and audio decoders
@@ -2420,7 +2494,6 @@ CONFIG_VIDEO_SUN8I_ROTATE=m
# CONFIG_VIDEO_OV2659 is not set
# CONFIG_VIDEO_OV2680 is not set
# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV2740 is not set
CONFIG_VIDEO_OV5640=m
# CONFIG_VIDEO_OV5645 is not set
# CONFIG_VIDEO_OV5647 is not set
@@ -2450,6 +2523,7 @@ CONFIG_VIDEO_OV5640=m
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_VIDEO_NOON010PC30 is not set
# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RDACM20 is not set
# CONFIG_VIDEO_RJ54N1 is not set
# CONFIG_VIDEO_S5K6AA is not set
# CONFIG_VIDEO_S5K6A3 is not set
@@ -2467,6 +2541,7 @@ CONFIG_VIDEO_GC2145=m
# CONFIG_VIDEO_AD5820 is not set
# CONFIG_VIDEO_AK7375 is not set
# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9768 is not set
# CONFIG_VIDEO_DW9807_VCM is not set
# end of Lens drivers
@@ -2491,7 +2566,6 @@ CONFIG_DRM=y
CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_DP_AUX_CHARDEV is not set
# CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_KMS_HELPER=y
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
@@ -2525,7 +2599,6 @@ CONFIG_DRM_SCHED=m
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_RCAR_DW_HDMI is not set
# CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_RCAR_WRITEBACK=y
CONFIG_DRM_SUN4I=y
# CONFIG_DRM_SUN4I_HDMI is not set
# CONFIG_DRM_SUN4I_BACKEND is not set
@@ -2547,13 +2620,14 @@ CONFIG_DRM_PANEL=y
# CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
# CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
# CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
# CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
@@ -2565,6 +2639,7 @@ CONFIG_DRM_PANEL=y
# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
@@ -2588,6 +2663,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
# CONFIG_DRM_CDNS_DSI is not set
# CONFIG_DRM_CHRONTEL_CH7033 is not set
# CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_LONTIUM_LT9611 is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_NWL_MIPI_DSI is not set
@@ -2599,15 +2675,18 @@ CONFIG_DRM_PANEL_BRIDGE=y
# CONFIG_DRM_SII9234 is not set
# CONFIG_DRM_SIMPLE_BRIDGE is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358762 is not set
# CONFIG_DRM_TOSHIBA_TC358764 is not set
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_TOSHIBA_TC358768 is not set
+# CONFIG_DRM_TOSHIBA_TC358775 is not set
# CONFIG_DRM_TI_TFP410 is not set
# CONFIG_DRM_TI_SN65DSI86 is not set
# CONFIG_DRM_TI_TPD12S015 is not set
# CONFIG_DRM_ANALOGIX_ANX6345 is not set
# CONFIG_DRM_ANALOGIX_ANX78XX is not set
# CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_CDNS_MHDP8546 is not set
CONFIG_DRM_DW_HDMI=y
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
@@ -2666,7 +2745,7 @@ CONFIG_FB_SIMPLE=y
#
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
+# CONFIG_BACKLIGHT_KTD253 is not set
CONFIG_BACKLIGHT_PWM=y
# CONFIG_BACKLIGHT_QCOM_WLED is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
@@ -2839,6 +2918,7 @@ CONFIG_SND_SOC_BT_SCO=m
# CONFIG_SND_SOC_CS42L52 is not set
# CONFIG_SND_SOC_CS42L56 is not set
# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
# CONFIG_SND_SOC_CS4270 is not set
# CONFIG_SND_SOC_CS4271_I2C is not set
@@ -2851,19 +2931,19 @@ CONFIG_SND_SOC_BT_SCO=m
# CONFIG_SND_SOC_DA7213 is not set
# CONFIG_SND_SOC_DMIC is not set
CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_EC25=m
# CONFIG_SND_SOC_ES7134 is not set
# CONFIG_SND_SOC_ES7241 is not set
# CONFIG_SND_SOC_ES8316 is not set
# CONFIG_SND_SOC_ES8328_I2C is not set
# CONFIG_SND_SOC_GTM601 is not set
-CONFIG_SND_SOC_EC25=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
# CONFIG_SND_SOC_MAX98088 is not set
# CONFIG_SND_SOC_MAX98357A is not set
# CONFIG_SND_SOC_MAX98504 is not set
# CONFIG_SND_SOC_MAX9867 is not set
# CONFIG_SND_SOC_MAX98927 is not set
-# CONFIG_SND_SOC_MAX98373 is not set
+# CONFIG_SND_SOC_MAX98373_I2C is not set
# CONFIG_SND_SOC_MAX98390 is not set
# CONFIG_SND_SOC_MAX9860 is not set
# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
@@ -2889,6 +2969,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
# CONFIG_SND_SOC_STI_SAS is not set
# CONFIG_SND_SOC_TAS2552 is not set
# CONFIG_SND_SOC_TAS2562 is not set
+# CONFIG_SND_SOC_TAS2764 is not set
# CONFIG_SND_SOC_TAS2770 is not set
# CONFIG_SND_SOC_TAS5086 is not set
# CONFIG_SND_SOC_TAS571X is not set
@@ -2983,6 +3064,7 @@ CONFIG_HID_GENERIC=m
# CONFIG_HID_GFRM is not set
# CONFIG_HID_GLORIOUS is not set
# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_VIVALDI is not set
# CONFIG_HID_GT683R is not set
# CONFIG_HID_KEYTOUCH is not set
# CONFIG_HID_KYE is not set
@@ -3071,10 +3153,11 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
# Miscellaneous USB options
#
CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
CONFIG_USB_OTG_FSM=m
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_AUTOSUSPEND_DELAY=2
@@ -3136,7 +3219,13 @@ CONFIG_USB_UAS=m
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
# CONFIG_USB_CDNS3 is not set
CONFIG_USB_MUSB_HDRC=m
# CONFIG_USB_MUSB_HOST is not set
@@ -3166,13 +3255,13 @@ CONFIG_USB_SERIAL_SIMPLE=m
# CONFIG_USB_SERIAL_AIRCABLE is not set
# CONFIG_USB_SERIAL_ARK3116 is not set
# CONFIG_USB_SERIAL_BELKIN is not set
-# CONFIG_USB_SERIAL_CH341 is not set
+CONFIG_USB_SERIAL_CH341=m
# CONFIG_USB_SERIAL_WHITEHEAT is not set
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_CP210X is not set
+CONFIG_USB_SERIAL_CP210X=m
# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
# CONFIG_USB_SERIAL_VISOR is not set
# CONFIG_USB_SERIAL_IPAQ is not set
# CONFIG_USB_SERIAL_IR is not set
@@ -3255,7 +3344,6 @@ CONFIG_NOP_USB_XCEIV=m
# end of USB Physical Layer drivers
CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=500
@@ -3347,19 +3435,21 @@ CONFIG_USB_G_MULTI_CDC=y
CONFIG_USB_G_HID=m
# CONFIG_USB_G_DBGP is not set
CONFIG_USB_G_WEBCAM=m
-# CONFIG_USB_RAW_GADGET is not set
+CONFIG_USB_RAW_GADGET=m
# end of USB Gadget precomposed configurations
CONFIG_TYPEC=y
CONFIG_TYPEC_TCPM=m
CONFIG_TYPEC_TCPCI=m
# CONFIG_TYPEC_RT1711H is not set
+# CONFIG_TYPEC_TCPCI_MAXIM is not set
# CONFIG_TYPEC_FUSB302 is not set
CONFIG_TYPEC_UCSI=m
# CONFIG_UCSI_CCG is not set
CONFIG_TYPEC_ANX7688=m
# CONFIG_TYPEC_HD3SS3220 is not set
# CONFIG_TYPEC_TPS6598X is not set
+# CONFIG_TYPEC_STUSB160X is not set
#
# USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -3400,13 +3490,16 @@ CONFIG_MMC_SUNXI=y
# CONFIG_MEMSTICK is not set
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
+CONFIG_LEDS_CLASS_FLASH=y
+# CONFIG_LEDS_CLASS_MULTICOLOR is not set
# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
#
# LED drivers
#
+# CONFIG_LEDS_AAT1290 is not set
# CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_AS3645A is not set
# CONFIG_LEDS_AW2013 is not set
# CONFIG_LEDS_BCM6328 is not set
# CONFIG_LEDS_BCM6358 is not set
@@ -3414,14 +3507,13 @@ CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_LM3532 is not set
# CONFIG_LEDS_LM3642 is not set
# CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_LM3601X is not set
# CONFIG_LEDS_PCA9532 is not set
CONFIG_LEDS_GPIO=y
# CONFIG_LEDS_LP3944 is not set
# CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP50XX is not set
+# CONFIG_LEDS_LP55XX_COMMON is not set
# CONFIG_LEDS_LP8860 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
@@ -3432,6 +3524,7 @@ CONFIG_LEDS_GPIO=y
# CONFIG_LEDS_TCA6507 is not set
# CONFIG_LEDS_TLC591XX is not set
# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_KTD2692 is not set
# CONFIG_LEDS_IS31FL319X is not set
# CONFIG_LEDS_IS31FL32XX is not set
@@ -3443,6 +3536,7 @@ CONFIG_LEDS_GPIO=y
# CONFIG_LEDS_MLXREG is not set
# CONFIG_LEDS_USER is not set
# CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_SGM3140=m
# CONFIG_LEDS_AXP20X is not set
#
@@ -3461,8 +3555,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
#
# iptables trigger is under Netfilter config (LED target)
#
-# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_LEDS_TRIGGER_PANIC=y
CONFIG_LEDS_TRIGGER_NETDEV=y
CONFIG_LEDS_TRIGGER_PATTERN=y
@@ -3519,6 +3613,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_RX8025 is not set
# CONFIG_RTC_DRV_EM3027 is not set
# CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV3032 is not set
# CONFIG_RTC_DRV_RV8803 is not set
# CONFIG_RTC_DRV_SD3078 is not set
@@ -3577,6 +3672,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
CONFIG_DMA_OF=y
# CONFIG_ALTERA_MSGDMA is not set
# CONFIG_AMBA_PL08X is not set
+# CONFIG_BCM_SBA_RAID is not set
CONFIG_DMA_SUN6I=y
# CONFIG_DW_AXI_DMAC is not set
# CONFIG_FSL_EDMA is not set
@@ -3586,6 +3682,7 @@ CONFIG_DMA_SUN6I=y
# CONFIG_PL330_DMA is not set
# CONFIG_XILINX_DMA is not set
# CONFIG_XILINX_ZYNQMP_DMA is not set
+# CONFIG_XILINX_ZYNQMP_DPDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
# CONFIG_QCOM_HIDMA is not set
# CONFIG_DW_DMAC is not set
@@ -3683,31 +3780,21 @@ CONFIG_STAGING=y
# end of Resolver to digital converters
# end of IIO staging drivers
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# end of Speakup console speech
-
CONFIG_STAGING_MEDIA=y
CONFIG_VIDEO_SUNXI=y
CONFIG_VIDEO_SUNXI_CEDRUS=m
-#
-# soc_camera sensor drivers
-#
-
#
# Android
#
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
# end of Android
# CONFIG_STAGING_BOARD is not set
# CONFIG_LTE_GDM724X is not set
# CONFIG_GS_FPGABOOT is not set
# CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_WILC1000_SDIO is not set
# CONFIG_KS7010 is not set
#
@@ -3718,16 +3805,14 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m
# CONFIG_XIL_AXIS_FIFO is not set
# CONFIG_FIELDBUS_DEV is not set
# CONFIG_WFX is not set
-CONFIG_RTL8723CS_NEW=m
+CONFIG_RTL8723CS=m
# CONFIG_GOLDFISH is not set
-# CONFIG_MFD_CROS_EC is not set
# CONFIG_CHROME_PLATFORMS is not set
# CONFIG_MELLANOX_PLATFORM is not set
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
-# CONFIG_CLK_HSDK is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_SCPI is not set
# CONFIG_COMMON_CLK_SI5341 is not set
@@ -3750,6 +3835,8 @@ CONFIG_CLK_SUNXI_PRCM_SUN8I=y
# CONFIG_CLK_SUNXI_PRCM_SUN9I is not set
CONFIG_SUNXI_CCU=y
CONFIG_SUN50I_A64_CCU=y
+CONFIG_SUN50I_A100_CCU=y
+CONFIG_SUN50I_A100_R_CCU=y
# CONFIG_SUN50I_H6_CCU is not set
# CONFIG_SUN50I_H6_R_CCU is not set
# CONFIG_SUN8I_A83T_CCU is not set
@@ -3895,6 +3982,8 @@ CONFIG_EXTCON=y
CONFIG_IIO=y
CONFIG_IIO_BUFFER=y
CONFIG_IIO_BUFFER_CB=m
+# CONFIG_IIO_BUFFER_DMA is not set
+# CONFIG_IIO_BUFFER_DMAENGINE is not set
CONFIG_IIO_BUFFER_HW_CONSUMER=m
CONFIG_IIO_KFIFO_BUF=m
CONFIG_IIO_TRIGGERED_BUFFER=m
@@ -3903,6 +3992,7 @@ CONFIG_IIO_TRIGGER=y
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_SW_DEVICE=m
CONFIG_IIO_SW_TRIGGER=m
+# CONFIG_IIO_TRIGGERED_EVENT is not set
#
# Accelerometers
@@ -3982,6 +4072,7 @@ CONFIG_AXP20X_ADC=y
# CONFIG_CCS811 is not set
# CONFIG_IAQCORE is not set
# CONFIG_PMS7003 is not set
+# CONFIG_SCD30_CORE is not set
# CONFIG_SENSIRION_SGP30 is not set
# CONFIG_SPS30 is not set
# CONFIG_VZ89X is not set
@@ -4068,6 +4159,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# CONFIG_AM2315 is not set
# CONFIG_DHT11 is not set
# CONFIG_HDC100X is not set
+# CONFIG_HDC2010 is not set
# CONFIG_HTS221 is not set
# CONFIG_HTU21 is not set
# CONFIG_SI7005 is not set
@@ -4080,6 +4172,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# CONFIG_BMI160_I2C is not set
# CONFIG_FXOS8700_I2C is not set
# CONFIG_KMX61 is not set
+# CONFIG_INV_ICM42600_I2C is not set
CONFIG_INV_MPU6050_IIO=m
CONFIG_INV_MPU6050_I2C=m
# CONFIG_IIO_ST_LSM6DSX is not set
@@ -4094,6 +4187,7 @@ CONFIG_INV_MPU6050_I2C=m
# CONFIG_AL3320A is not set
# CONFIG_APDS9300 is not set
# CONFIG_APDS9960 is not set
+# CONFIG_AS73211 is not set
# CONFIG_BH1750 is not set
# CONFIG_BH1780 is not set
# CONFIG_CM32181 is not set
@@ -4249,7 +4343,6 @@ CONFIG_IIO_SYSFS_TRIGGER=m
CONFIG_PWM=y
CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_DEBUG is not set
# CONFIG_PWM_FSL_FTM is not set
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_SUN4I=y
@@ -4281,6 +4374,7 @@ CONFIG_RESET_SUNXI=y
CONFIG_GENERIC_PHY=y
CONFIG_GENERIC_PHY_MIPI_DPHY=y
# CONFIG_PHY_XGENE is not set
+# CONFIG_USB_LGM_PHY is not set
CONFIG_PHY_SUN4I_USB=y
CONFIG_PHY_SUN6I_MIPI_DPHY=y
# CONFIG_PHY_SUN9I_USB is not set
@@ -4309,6 +4403,7 @@ CONFIG_ARM_CCI_PMU=y
CONFIG_ARM_CCI400_PMU=y
# CONFIG_ARM_CCI5xx_PMU is not set
# CONFIG_ARM_CCN is not set
+# CONFIG_ARM_CMN is not set
CONFIG_ARM_PMU=y
# CONFIG_ARM_DSU_PMU is not set
# CONFIG_ARM_SPE_PMU is not set
@@ -4319,7 +4414,11 @@ CONFIG_ARM_PMU=y
#
# Android
#
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+CONFIG_ANDROID_BINDER_IPC_SELFTEST=y
# end of Android
# CONFIG_LIBNVDIMM is not set
@@ -4364,18 +4463,30 @@ CONFIG_JBD2=y
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_QUOTA is not set
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
CONFIG_F2FS_FS=y
CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
CONFIG_F2FS_CHECK_FS=y
-# CONFIG_F2FS_IO_TRACE is not set
# CONFIG_F2FS_FAULT_INJECTION is not set
CONFIG_F2FS_FS_COMPRESSION=y
CONFIG_F2FS_FS_LZO=y
@@ -4447,6 +4558,7 @@ CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
+# CONFIG_TMPFS_INODE64 is not set
# CONFIG_HUGETLBFS is not set
CONFIG_MEMFD_CREATE=y
CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
@@ -4580,6 +4692,7 @@ CONFIG_INIT_STACK_NONE=y
# end of Kernel hardening options
# end of Security options
+CONFIG_XOR_BLOCKS=y
CONFIG_CRYPTO=y
#
@@ -4605,14 +4718,14 @@ CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_GF128MUL=m
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_NULL2=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=y
CONFIG_CRYPTO_AUTHENC=y
# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_SIMD=m
CONFIG_CRYPTO_ENGINE=m
#
@@ -4623,6 +4736,7 @@ CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_ECC=m
CONFIG_CRYPTO_ECDH=m
# CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
CONFIG_CRYPTO_CURVE25519=m
#
@@ -4664,8 +4778,8 @@ CONFIG_CRYPTO_HMAC=y
#
CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32=y
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_XXHASH=y
+CONFIG_CRYPTO_BLAKE2B=y
CONFIG_CRYPTO_BLAKE2S=m
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_GHASH=m
@@ -4732,7 +4846,9 @@ CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y
@@ -4743,14 +4859,14 @@ CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=m
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
@@ -4760,6 +4876,9 @@ CONFIG_CRYPTO_DEV_ALLWINNER=y
# CONFIG_CRYPTO_DEV_SUN4I_SS is not set
CONFIG_CRYPTO_DEV_SUN8I_CE=m
# CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_HASH is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG is not set
+# CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG is not set
# CONFIG_CRYPTO_DEV_SUN8I_SS is not set
# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -4786,11 +4905,11 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
# end of Certificates for signature checking
-CONFIG_BINARY_PRINTF=y
-
#
# Library routines
#
+CONFIG_RAID6_PQ=y
+# CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_LINEAR_RANGES=y
# CONFIG_PACKING is not set
CONFIG_BITREVERSE=y
@@ -4798,7 +4917,7 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=y
+# CONFIG_CORDIC is not set
# CONFIG_PRIME_NUMBERS is not set
CONFIG_RATIONAL=y
CONFIG_GENERIC_PCI_IOMAP=y
@@ -4832,7 +4951,7 @@ CONFIG_LZ4_COMPRESS=y
CONFIG_LZ4_DECOMPRESS=y
CONFIG_ZSTD_COMPRESS=y
CONFIG_ZSTD_DECOMPRESS=y
-CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC=m
CONFIG_XZ_DEC_X86=y
CONFIG_XZ_DEC_POWERPC=y
CONFIG_XZ_DEC_IA64=y
@@ -4841,13 +4960,12 @@ CONFIG_XZ_DEC_ARMTHUMB=y
CONFIG_XZ_DEC_SPARC=y
CONFIG_XZ_DEC_BCJ=y
# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
CONFIG_DECOMPRESS_LZ4=y
CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_INTERVAL_TREE=y
CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
@@ -4863,6 +4981,7 @@ CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_REMAP=y
CONFIG_DMA_DIRECT_REMAP=y
CONFIG_DMA_CMA=y
+# CONFIG_DMA_PERNUMA_CMA is not set
#
# Default contiguous memory area size:
@@ -4877,8 +4996,6 @@ CONFIG_CMA_ALIGNMENT=8
CONFIG_SGL_ALLOC=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
CONFIG_NLATTR=y
CONFIG_CLZ_TAB=y
# CONFIG_IRQ_POLL is not set
@@ -4887,11 +5004,13 @@ CONFIG_LIBFDT=y
CONFIG_OID_REGISTRY=y
CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
CONFIG_FONT_SUPPORT=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
CONFIG_SBITMAP=y
# CONFIG_STRING_SELFTEST is not set
# end of Library routines
@@ -4908,9 +5027,8 @@ CONFIG_SBITMAP=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_DEBUG_CORE is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
CONFIG_SYMBOLIC_ERRNAME=y
CONFIG_DEBUG_BUGVERBOSE=y
# end of printk and dmesg options
@@ -4918,17 +5036,14 @@ CONFIG_DEBUG_BUGVERBOSE=y
#
# Compile-time checks and compiler options
#
-# CONFIG_DEBUG_INFO is not set
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=1024
# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
# CONFIG_HEADERS_INSTALL is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# end of Compile-time checks and compiler options
#
@@ -4939,73 +5054,52 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
CONFIG_MAGIC_SYSRQ_SERIAL=y
CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
# CONFIG_UBSAN is not set
# end of Generic Kernel Debugging Instruments
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
+# CONFIG_DEBUG_KERNEL is not set
#
# Memory Debugging
#
# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_RODATA_TEST is not set
CONFIG_ARCH_HAS_DEBUG_WX=y
# CONFIG_DEBUG_WX is not set
CONFIG_GENERIC_PTDUMP=y
-# CONFIG_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
-# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_VM_PGTABLE is not set
CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_HAVE_ARCH_KASAN=y
CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
CONFIG_CC_HAS_KASAN_GENERIC=y
CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
# CONFIG_KASAN is not set
-CONFIG_KASAN_STACK=1
# end of Memory Debugging
-# CONFIG_DEBUG_SHIRQ is not set
-
#
# Debug Oops, Lockups and Hangs
#
# CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_PANIC_TIMEOUT=0
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
-CONFIG_WQ_WATCHDOG=y
# CONFIG_TEST_LOCKUP is not set
# end of Debug Oops, Lockups and Hangs
#
# Scheduler Debugging
#
-CONFIG_SCHED_DEBUG=y
CONFIG_SCHED_INFO=y
-# CONFIG_SCHEDSTATS is not set
# end of Scheduler Debugging
# CONFIG_DEBUG_TIMEKEEPING is not set
@@ -5014,52 +5108,25 @@ CONFIG_SCHED_INFO=y
# Lock Debugging (spinlocks, mutexes, etc...)
#
CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
# CONFIG_WW_MUTEX_SELFTEST is not set
# end of Lock Debugging (spinlocks, mutexes, etc...)
CONFIG_STACKTRACE=y
# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
CONFIG_HAVE_DEBUG_BUGVERBOSE=y
#
# Debug kernel data structures
#
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# end of Debug kernel data structures
-# CONFIG_DEBUG_CREDENTIALS is not set
-
#
# RCU Debugging
#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
# end of RCU Debugging
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -5067,44 +5134,8 @@ CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_BOOTTIME_TRACING=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_SYNTH_EVENTS is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACE_EVENT_INJECT is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_FTRACE is not set
# CONFIG_SAMPLES is not set
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
# CONFIG_STRICT_DEVMEM is not set
@@ -5121,8 +5152,6 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
# Kernel Testing and Coverage
#
# CONFIG_KUNIT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
CONFIG_ARCH_HAS_KCOV=y
CONFIG_CC_HAS_SANCOV_TRACE_PC=y
# CONFIG_KCOV is not set
diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 8ec4c4e13b9..56d1028beb6 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -1,15 +1,15 @@
# Template file for 'pinephone-kernel'
pkgname=pinephone-kernel
-version=5.8.10
+version=5.10.12
revision=1
-_commit=b8647e317c32f64543c32465abb7b4651e6e3199
-wrksrc="linux-${_commit}"
+_tag=orange-pi-5.10-20210130-2109
+wrksrc="linux-${_tag}"
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John Sullivan <jsullivan@csumb.edu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
-distfiles="https://github.com/megous/linux/archive/${_commit}.tar.gz"
-checksum=65c154fde37f38334ccd2038765954536f78a504ef4460a3021cb8e33f64de6a
+distfiles="https://github.com/megous/linux/archive/${_tag}.tar.gz"
+checksum=7ef48ee91f6b6cfdc74f3dc73753903748bcda3282f1ac6e2ff33d392f6c30ca
python_version=3
patch_args="-Np1"
@@ -22,7 +22,7 @@ noshlibprovides=yes
preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ libressl-devel perl uboot-mkimage cpio pahole python3"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
@@ -41,42 +41,51 @@ mutable_files="
/usr/lib/modules/${_kernver}/modules.alias.bin
/usr/lib/modules/${_kernver}/modules.devname"
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+if [ "$CROSS_BUILD" ]; then
+ _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+if [ "${_patchver}" ]; then
+ _version="EXTRAVERSION=${_patchver}"
+fi
+
do_configure() {
- # 5.8 misses Documentation/DocBook. We ship the directory from 4.12 here.
- cp -a $FILESDIR/DocBook -t Documentation
+ local arch=arm64
- local arch _args
- arch=arm64
+ # 5.10 misses Documentation/DocBook. We ship the directory from 4.12 here.
+ cp -a $FILESDIR/DocBook -t Documentation
- if [ "$CROSS_BUILD" ]; then
- _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+ if [ -f ${FILESDIR}/pinephone-dotconfig-custom ]; then
+ msg_normal "Detected a custom .config file for pinephone, using it.\n"
+ cp -f ${FILESDIR}/pinephone-dotconfig-custom .config
+ make ${makejobs} ARCH=$arch ${_cross} oldconfig
+ elif [ -f ${FILESDIR}/pinephone-dotconfig ]; then
+ msg_normal "Detected a .config file for pinephone, using it.\n"
+ cp -f $FILESDIR/pinephone-dotconfig .config
+ make ${makejobs} ARCH=$arch ${_cross} oldconfig
+ else
+ msg_normal "Defaulting to 'pinephone_defconfig'.\n"
+ make ${makejobs} ARCH=$arch ${_cross} pinephone_defconfig
fi
- cp $FILESDIR/config .config || make ARCH=$arch $_args pinephone_defconfig
-
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
}
do_build() {
- local arch _cross _args
- _args="Image modules dtbs"
- arch=arm64
+ local arch=arm64
- if [ "$CROSS_BUILD" ]; then
- _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
- fi
- if [ "${_patchver}" ]; then
- _version="EXTRAVERSION=${_patchver}"
- fi
export LDFLAGS=
make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
- make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+ make ARCH=$arch ${_version} ${_cross} ${makejobs} Image modules dtbs
}
do_install() {
- local arch subarch _args hdrdest
- arch=arm64
+ local arch=arm64 subarch _args hdrdest
# Run depmod after compressing modules.
sed -i '2iexit 0' scripts/depmod.sh
From bf60f18a2f1810a64ac463a6e5432daa60aa0622 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 1 Feb 2021 15:03:30 +0100
Subject: [PATCH 534/634] kid3: update to 3.8.5, remove unused shlibs
---
common/shlibs | 2 --
srcpkgs/kid3/template | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dd8a7019ee3..b9fec683dea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3461,8 +3461,6 @@ libfifechan_opengl.so.0.1.5 fifechan-0.1.5_1
libpolyclipping.so.22 clipper-6.4.2_1
libSoapySDR.so.0.7 SoapySDR-0.7.0_1
libeditorconfig.so.0 editorconfig-0.12.2_1
-libkid3-core.so.3.8.4 kid3-3.8.4_1
-libkid3-gui.so.3.8.4 kid3-3.8.4_1
libcfitsio.so.9 cfitsio-3.480_1
libapparmor.so.1 libapparmor-2.12.0_1
libplacebo.so.72 libplacebo-2.72.0_1
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 074b992774d..3291fe4b1e8 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,6 +1,6 @@
# Template file for 'kid3'
pkgname=kid3
-version=3.8.4
+version=3.8.5
revision=1
build_style=cmake
configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
@@ -17,9 +17,9 @@ depends="desktop-file-utils hicolor-icon-theme"
short_desc="MP3, Ogg/Vorbis and FLAC tag editor"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="GPL-2.0-only"
-homepage="https://kid3.sourceforge.io"
+homepage="https://kid3.kde.org"
distfiles="${SOURCEFORGE_SITE}/kid3/kid3-${version}.tar.gz"
-checksum=598b843aa32ed9530ebfa9a45424579e622714447f0d67cf36a62e693277bc07
+checksum=0c467927541e9dd8172758016778742f0b154cb2f5bcfce727b35cfbdee3141f
build_options="KDE mp3 mp4 flac vorbis taglib chromaprint"
build_options_default="mp3 mp4 flac vorbis taglib chromaprint"
From d00b0a2d0ce8585b92fbb0fd6ad419141b1fe0c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 20:54:01 +0100
Subject: [PATCH 535/634] quake4: requires tar; adopt; xlintify
---
srcpkgs/quake4/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/quake4/template b/srcpkgs/quake4/template
index 66e721be9ae..5987e41d3a8 100644
--- a/srcpkgs/quake4/template
+++ b/srcpkgs/quake4/template
@@ -2,14 +2,15 @@
pkgname=quake4
version=1.4.2
revision=3
+hostmakedepends="tar"
depends="SDL libXext virtual?libudev zlib desktop-file-utils"
short_desc="Quake 4 for Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Propietary"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="custom: propietary"
homepage="http://www.quake4game.com/"
-distfiles="http://ftp.iinet.net.au/games/idstuff/quake4/linux/quake4-linux-${version}.x86.run"
-skip_extraction="quake4-linux-${version}.x86.run"
+distfiles="http://sources.voidlinux.de/${pkgname}-${version}/quake4-linux-${version}.x86.run"
checksum=9203b387b1a4075a1b9ad1eb7be32b49a88141a448d9330d9cbe1f40a145bd6a
+skip_extraction="quake4-linux-${version}.x86.run"
# 32bit package for x86_64 built on x86 :-)
archs="i686"
From b1c0bcc2dfbf4d143cebf9dcb7ed3ecaff485dca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Feb 2021 14:45:35 -0500
Subject: [PATCH 536/634] python3-parso: update to 0.8.1.
---
srcpkgs/python3-parso/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template
index cb2c8e20105..bdca7f91715 100644
--- a/srcpkgs/python3-parso/template
+++ b/srcpkgs/python3-parso/template
@@ -1,18 +1,18 @@
# Template file for 'python3-parso'
pkgname=python3-parso
-reverts="0.8.0_1"
-version=0.7.1
-revision=2
+version=0.8.1
+revision=1
wrksrc="parso-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
+checkdepends="python3-pytest"
short_desc="Python parser (Python 3)"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/davidhalter/parso"
distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz"
-checksum=caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9
+checksum=8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e
post_install() {
vlicense LICENSE.txt
From 0cffa4175d1bdd235ca4de05344f121c8ff336a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Feb 2021 14:46:02 -0500
Subject: [PATCH 537/634] python3-jedi: update to 0.18.0.
---
srcpkgs/python3-jedi/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-jedi/template b/srcpkgs/python3-jedi/template
index 0adda2c40ca..728ff3a3669 100644
--- a/srcpkgs/python3-jedi/template
+++ b/srcpkgs/python3-jedi/template
@@ -1,18 +1,22 @@
# Template file for 'python3-jedi'
pkgname=python3-jedi
-version=0.17.2
-revision=4
+version=0.18.0
+revision=1
wrksrc="jedi-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-parso"
-checkdepends="python3-parso python3-pytest"
+checkdepends="python3-parso python3-pytest python3-docopt"
short_desc="Autocompletion/static analysis library for Python 3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://jedi.readthedocs.io/"
distfiles="${PYPI_SITE}/j/jedi/jedi-${version}.tar.gz"
-checksum=86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20
+checksum=92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707
+
+do_check() {
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 ./test/run.py
+}
post_install() {
vlicense LICENSE.txt
From cac0ead42be1b6bbd7543bafe6c41e33e1775775 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Feb 2021 14:46:31 -0500
Subject: [PATCH 538/634] python3-ipython: update to 7.20.0.
---
srcpkgs/python3-ipython/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index dfef2b9c249..21b801f0267 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=7.19.0
+version=7.20.0
revision=1
wrksrc="ipython-${version}"
build_style=python3-module
@@ -16,13 +16,9 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a
+checksum=1923af00820a8cf58e91d56b89efc59780a6e81363b94464a0f17c039dffff9e
conflicts="python-ipython<=5.8.0_2"
-do_check() {
- pytest
-}
-
post_install() {
# remove iptest
rm -f ${DESTDIR}/usr/bin/iptest*
From cba0feeb03c7acf6aa7286304a1944e1a734e501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 22:37:11 +0100
Subject: [PATCH 539/634] cavestory: update to 1.2; add x86_64
The update to 1.2 contains binaries for 32 and 64 bits. There is no license file.
The page https://www.cavestory.org/game-info/game-releases.php
says 'Cave Story (Freeware)' and so copy that text and a link to
the web page to a LICENSE file to satisfy xlint.
---
srcpkgs/cavestory/files/cavestory | 2 +-
srcpkgs/cavestory/template | 32 +++++++++++++++++--------------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cavestory/files/cavestory b/srcpkgs/cavestory/files/cavestory
index 930cc3ce5f9..2c8c339baa9 100755
--- a/srcpkgs/cavestory/files/cavestory
+++ b/srcpkgs/cavestory/files/cavestory
@@ -1,3 +1,3 @@
#!/bin/sh
-cd /usr/share/cavestory
+cd /usr/libexec/cavestory
exec ./doukutsu.bin "$@"
diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index ed3665b197a..52d06a0e51d 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -1,26 +1,30 @@
# Template file for 'cavestory'
pkgname=cavestory
-version=1.01
-revision=3
-wrksrc=linuxDoukutsu-${version}
-archs="i686"
-lib32mode=full
-repository=nonfree
-short_desc="A Japanese side-scrolling platformer game"
+version=1.2
+revision=1
+archs="x86_64 i686"
+wrksrc=linuxDoukutsu-1.01
+short_desc="Japanese side-scrolling platformer game"
maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="Proprietary"
+license="custom: proprietary"
homepage="http://www.cavestory.org/"
-distfiles="http://www.cavestory.org/downloads/linuxdoukutsu-${version}.tar.bz2"
-checksum=76466fc1b1901ce25e301a4ec8450aced806c9d499d66707d6f7b38efebc24c1
+distfiles="http://www.cavestory.org/downloads/linuxdoukutsu-1.01.tar.bz2
+ http://www.cavestory.org/downloads/linuxDoukutsu-${version}.zip"
+checksum="76466fc1b1901ce25e301a4ec8450aced806c9d499d66707d6f7b38efebc24c1
+ a8711393c86cb6a7c6786883b22aed814f0e819cf935f8b273cb9dc5d58cfc6b"
+repository=nonfree
+nopie=yes
do_install() {
- vmkdir usr/share/cavestory
- vcopy Config.dat usr/share/cavestory
- vcopy data usr/share/cavestory
+ vmkdir usr/libexec/cavestory
+ vcopy Config.dat usr/libexec/cavestory
+ vcopy data usr/libexec/cavestory
vdoc doc/readme.txt
vdoc doc/configfileformat.txt
- vcopy doukutsu.bin usr/share/cavestory
+ mv ../linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits doukutsu.bin
+ vinstall doukutsu.bin 755 usr/libexec/cavestory
vbin ${FILESDIR}/cavestory
vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/
+ vlicense doc/readme.txt
}
From 48ce08702c7bf919467c9881264c2c2717940410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 23:02:48 +0100
Subject: [PATCH 540/634] cavestory: forgot to commit the LICENSE change
---
srcpkgs/cavestory/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index 52d06a0e51d..b08211e1419 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -1,7 +1,7 @@
# Template file for 'cavestory'
pkgname=cavestory
version=1.2
-revision=1
+revision=2
archs="x86_64 i686"
wrksrc=linuxDoukutsu-1.01
short_desc="Japanese side-scrolling platformer game"
@@ -26,5 +26,9 @@ do_install() {
vbin ${FILESDIR}/cavestory
vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/
- vlicense doc/readme.txt
+ cat >LICENSE <<EOF
+Cave Story (Freeware)
+See: https://www.cavestory.org/game-info/game-releases.php
+EOF
+ vlicense LICENSE
}
From 7c82af2dc187cec10fc6c7fd952fd4b0bbeb6593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 23:04:24 +0100
Subject: [PATCH 541/634] gens-gs: remove
---
srcpkgs/gens-gs/patches/gens-gtk.patch | 178 -------------------------
srcpkgs/gens-gs/template | 21 ---
2 files changed, 199 deletions(-)
delete mode 100644 srcpkgs/gens-gs/patches/gens-gtk.patch
delete mode 100644 srcpkgs/gens-gs/template
diff --git a/srcpkgs/gens-gs/patches/gens-gtk.patch b/srcpkgs/gens-gs/patches/gens-gtk.patch
deleted file mode 100644
index b33ff85b017..00000000000
--- a/srcpkgs/gens-gs/patches/gens-gtk.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000
-@@ -84,7 +84,7 @@
- gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
-+ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)about_window, "delete_event",
---- src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000
-@@ -84,7 +84,7 @@
- gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
-+ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)bmf_window, "delete_event",
---- src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000
-@@ -109,7 +109,7 @@
- gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
-+ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)(dir_window), "delete_event",
---- src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000
-@@ -140,7 +140,7 @@
- gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
- gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
-+ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)genopt_window, "delete_event",
-@@ -458,11 +458,11 @@
- gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0);
-
- // Dropdown for intro effect.
-- cboIntroEffect = gtk_combo_box_new_text();
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect");
-- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
-+ cboIntroEffect = gtk_combo_box_text_new();
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None");
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect");
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect");
-+ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
- gtk_widget_show(cboIntroEffect);
- gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0);
- g_signal_connect((gpointer)(cboIntroEffect), "changed",
---- src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000
-@@ -154,9 +154,9 @@
- GSFT_UNUSED_PARAMETER(y);
- GSFT_UNUSED_PARAMETER(user_data);
-
-- if (context->targets)
-+ if (gdk_drag_context_list_targets(context))
- {
-- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
-+ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
- gtk_drag_get_data(widget, context, target_type, time);
- return true;
- }
---- src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000
-@@ -75,7 +75,7 @@
- gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
-+ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)(glres_window), "delete_event",
---- src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000
-@@ -80,8 +80,7 @@
- // Callbacks.
- static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
- static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
--static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
-- guint page_num, gpointer user_data);
-+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
- static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
- static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
-
-@@ -119,7 +118,7 @@
- gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
-+ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)pmgr_window, "delete_event",
-@@ -559,11 +558,9 @@
- * @param page_num New notebook page index.
- * @param user_data User data.
- */
--static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
-- guint page_num, gpointer user_data)
-+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
- {
- GSFT_UNUSED_PARAMETER(notebook);
-- GSFT_UNUSED_PARAMETER(page);
- GSFT_UNUSED_PARAMETER(user_data);
-
- // Activate the "cursor-changed" callback for the page.
---- src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000
-@@ -94,7 +94,7 @@
- gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
- gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
-+ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
-
- // Callbacks for if the window is closed.
- g_signal_connect((gpointer)(selcd_window), "delete_event",
-@@ -128,7 +128,7 @@
- gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0);
-
- // Create the dropdown for the CD-ROM device name.
-- cboDeviceName = gtk_combo_box_entry_new_text();
-+ cboDeviceName = gtk_combo_box_text_new_with_entry();
- gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63);
- gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName);
- gtk_widget_show(cboDeviceName);
-@@ -156,7 +156,7 @@
- gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0);
-
- // Create the dropdown for the CD-ROM drive speed selection.
-- cboDriveSpeed = gtk_combo_box_new_text();
-+ cboDriveSpeed = gtk_combo_box_text_new();
- char tmpSpeed[16];
- for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++)
- {
-@@ -167,7 +167,7 @@
- else
- szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]);
-
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed);
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed);
- }
- gtk_widget_show(cboDriveSpeed);
- gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0);
-@@ -252,7 +252,7 @@
- continue;
-
- // Add the device file.
-- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName);
-+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName);
- }
- }
-
---- src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000
-+++ src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000
-@@ -111,7 +111,7 @@
- gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
- gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
-- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
-+ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
-
- // Add the window icon.
- GList *icon_list = NULL;
diff --git a/srcpkgs/gens-gs/template b/srcpkgs/gens-gs/template
deleted file mode 100644
index 61004717914..00000000000
--- a/srcpkgs/gens-gs/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gens-gs'
-#
-archs="i686"
-lib32mode="full"
-LDFLAGS="-ldl -lX11"
-
-pkgname=gens-gs
-version=2.16.7
-revision=2
-wrksrc="gens-gs-r7"
-build_style=gnu-configure
-configure_args="--with-pic --disable-static"
-hostmakedepends="pkg-config nasm"
-makedepends="gtk+-devel SDL-devel"
-depends="desktop-file-utils"
-short_desc="Sega Genesis/CD/32X emulator combining features from various forks of Gens"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://segaretro.org/Gens/GS"
-distfiles="http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz"
-checksum=6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1
From 4cd5423382faed3c3baf3da6b92becd8f2cf8413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Feb 2021 23:04:52 +0100
Subject: [PATCH 542/634] removed-packages: add gens-gs
---
srcpkgs/removed-packages/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03d6c4399a2..cef8a752e46 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=20
+revision=21
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -35,6 +35,7 @@ replaces="
epstopdf<=2.27_3
fontmatrix<=0.6.0.20171228_2
gegl3<=0.3.28_2
+ gens-gs<=2.16.7_2
geoip-data<=20171002_2
gksu<=2.0.2_4
go1.4-bootstrap<=20171003_2
From fb8c5f29013822c6340b9e6696ee32c337cacbfb Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 2 Feb 2021 22:02:03 +0100
Subject: [PATCH 543/634] dbeaver: update to 7.3.4.
---
srcpkgs/dbeaver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b7e98801631..553904369be 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
# Template file for 'dbeaver'
pkgname=dbeaver
-version=7.3.3
+version=7.3.4
revision=1
# the build downloads binaries linked to glibc
archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="Apache-2.0"
homepage="https://dbeaver.io"
distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=8b4cff6a1e172da763373ddc7df554569f53a0c529175e540d4b64ed2b7066d9
+checksum=1adc7989776955d52afb5f6ff7cf4d027f2a8d7b0522ebacdaf8ece1f51db228
nopie=true
do_build() {
From 3742e8ee212040b112f393188a16c175bf3b8780 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Tue, 2 Feb 2021 17:29:45 -0500
Subject: [PATCH 544/634] oragono: update to 2.5.1.
---
srcpkgs/oragono/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index da723058042..68a4f5386bc 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,6 +1,6 @@
# Template file for 'oragono'
pkgname=oragono
-version=2.5.0
+version=2.5.1
revision=1
build_style=go
go_import_path="github.com/oragono/oragono"
@@ -10,7 +10,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
license="MIT"
homepage="https://oragono.io/"
distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=b954b20a19a3cfbc0c76febc6277217b275b355e0989edbd6d1a80a1accb6ded
+checksum=1d38f36d73b4f2ffff158dfc47de833111b4c5f25703276a426c0f01618874ac
conf_files="/etc/oragono.conf"
system_accounts="_oragono"
_oragono_homedir="/var/lib/oragono"
From 63bb67974a93668bde3dd1f6ce8ec89d25b5cb0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 01:10:35 +0100
Subject: [PATCH 545/634] supertuxkart: import upstream patch to fix build
---
...3c9c26da5520f2eaa02f2458971ba07f2aad.patch | 106 ++++++++++++++++++
1 file changed, 106 insertions(+)
create mode 100644 srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch
diff --git a/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch b/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch
new file mode 100644
index 00000000000..eee9f9efb54
--- /dev/null
+++ b/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch
@@ -0,0 +1,106 @@
+From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+Date: Sun, 29 Nov 2020 12:42:11 +0800
+Subject: [PATCH] Fix compilation with latest SDL
+
+---
+ src/input/gamepad_config.cpp | 55 ++++++++++++++++++------------------
+ 1 file changed, 27 insertions(+), 28 deletions(-)
+
+diff --git src/input/gamepad_config.cpp src/input/gamepad_config.cpp
+index 7c6f632099..c060e7a5a7 100644
+--- src/input/gamepad_config.cpp
++++ src/input/gamepad_config.cpp
+@@ -32,8 +32,7 @@
+ #include "input/sdl_controller.hpp"
+ #include <array>
+
+-static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name");
+-enum AxisWithDirection
++enum AxisWithDirection : unsigned
+ {
+ SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX,
+ SDL_CONTROLLER_AXIS_LEFTX_LEFT,
+@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds ()
+ core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const
+ {
+ #ifndef SERVER_ONLY
+- std::array<core::stringw, SDL_CONTROLLER_AXIS_WITH_DIRECTION_AND_BUTTON_MAX> readable =
++ std::map<unsigned, core::stringw> readable =
+ {{
+- "A", // SDL_CONTROLLER_BUTTON_A
+- "B", // SDL_CONTROLLER_BUTTON_B
+- "X", // SDL_CONTROLLER_BUTTON_X
+- "Y", // SDL_CONTROLLER_BUTTON_Y
++ { SDL_CONTROLLER_BUTTON_A, "A" },
++ { SDL_CONTROLLER_BUTTON_B, "B" },
++ { SDL_CONTROLLER_BUTTON_X, "X" },
++ { SDL_CONTROLLER_BUTTON_Y, "Y" },
+ // I18N: name of buttons on gamepads
+- _("Back"), // SDL_CONTROLLER_BUTTON_BACK
++ { SDL_CONTROLLER_BUTTON_BACK, _("Back") },
+ // I18N: name of buttons on gamepads
+- _("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE
++ { SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") },
+ // I18N: name of buttons on gamepads
+- _("Start"), // SDL_CONTROLLER_BUTTON_START
++ { SDL_CONTROLLER_BUTTON_START, _("Start") },
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK
++ { SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK
++ { SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") },
+ // I18N: name of buttons on gamepads
+- _("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER
++ { SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") },
+ // I18N: name of buttons on gamepads
+- _("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
++ { SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") },
+ // I18N: name of buttons on gamepads
+- _("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP
++ { SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") },
+ // I18N: name of buttons on gamepads
+- _("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN
++ { SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") },
+ // I18N: name of buttons on gamepads
+- _("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT
++ { SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") },
+ // I18N: name of buttons on gamepads
+- _("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT
++ { SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") },
+
+ // Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT
++ { SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") },
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT
++ { SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") },
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN
++ { SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") },
+ // I18N: name of buttons on gamepads
+- _("Left thumbstick up"), // SDL_CONTROLLER_AXIS_LEFTY_UP
++ { SDL_CONTROLLER_AXIS_LEFTY_UP, _("Left thumbstick up") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick right"), // SDL_CONTROLLER_AXIS_RIGHTX_RIGHT
++ { SDL_CONTROLLER_AXIS_RIGHTX_RIGHT, _("Right thumbstick right") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick left"), // SDL_CONTROLLER_AXIS_RIGHTX_LEFT
++ { SDL_CONTROLLER_AXIS_RIGHTX_LEFT, _("Right thumbstick left") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick down"), // SDL_CONTROLLER_AXIS_RIGHTY_DOWN
++ { SDL_CONTROLLER_AXIS_RIGHTY_DOWN, _("Right thumbstick down") },
+ // I18N: name of buttons on gamepads
+- _("Right thumbstick up"), // SDL_CONTROLLER_AXIS_RIGHTY_UP
++ { SDL_CONTROLLER_AXIS_RIGHTY_UP, _("Right thumbstick up") },
+ // I18N: name of buttons on gamepads
+- _("Left trigger"), // SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP
++ { SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP, _("Left trigger") },
+ // I18N: name of buttons on gamepads
+- _("Right trigger") // SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP
++ { SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP, _("Right trigger") }
+ }};
+
+ const Binding &b = getBinding(action);
From bbfac8fb46d035448da9e681c7bb5bd554fc2b68 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:56:23 -0600
Subject: [PATCH 546/634] gst-libav: update to 1.18.3.
---
srcpkgs/gst-libav/template | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 715637e6d99..bfb62ea021e 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
# Template file for 'gst-libav'
pkgname=gst-libav
-version=1.16.2
+version=1.18.3
revision=1
wrksrc="${pkgname}-${version}"
build_style=meson
@@ -12,18 +12,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2
+checksum=ad20546bcd78ac1e7cf194666d73c4f33efeb62647d2b6af22993b540699e91c
case "$XBPS_TARGET_MACHINE" in
*-musl) # Required by musl for M_SQRT1_2
CFLAGS="-D_XOPEN_SOURCE"
;;
esac
-
-post_configure() {
- case "$XBPS_TARGET_MACHINE" in
- x86_64-musl) # compiling with -O3 triggers a gcc bug
- sed -i 's/-O3/-O2/g' gst-libs/ext/libav/config.mak
- ;;
- esac
-}
From 2f4b87c491407ca3201b0e7090d6635594191425 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 13:59:27 -0600
Subject: [PATCH 547/634] gst-omx: update to 1.18.3, drop rpi option.
rpi is broken and seems sketchy quality-wise.
---
srcpkgs/gst-omx/template | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index 2a77a4a8e27..8646c3c87ae 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,28 +1,14 @@
# Template file for 'gst-omx'
pkgname=gst-omx
-version=1.16.2
-revision=2
-build_style=gnu-configure
-configure_args="--disable-examples
- $(vopt_if rpi --with-omx-target=rpi --with-omx-target=generic)"
-hostmakedepends="pkg-config python glib-devel"
+version=1.18.3
+revision=1
+build_style=meson
+configure_args="-Dexamples=disabled -Dtarget=generic"
+hostmakedepends="pkg-config python3 glib-devel"
makedepends="gst-plugins-base1-devel"
short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=11ed411a2eba75610d72331eeb14ff05e2df28f4fd05cb69225a88bec6d27439
-
-build_options="rpi"
-
-case "$XBPS_TARGET_MACHINE" in
- armv[67]*) build_options_default="rpi" ;;
-esac
-
-if [ "$build_option_rpi" ]; then
- makedepends+=" rpi-firmware rpi-userland-devel"
- export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/opt/vc/lib/pkgconfig"
- CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include/IL"
- LDFLAGS="-Wl,-rpath=/opt/vc/lib"
-fi
+checksum=ed0f26504e9a60e15055134410f156e40952336410f2a59bdbbda45e61e8b93f
From b29c462060974972100d95de0aa2e439c81f4cae Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:01:55 -0600
Subject: [PATCH 548/634] gstreamer-vaapi: update to 1.18.3.
---
srcpkgs/gstreamer-vaapi/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 3c3ed86673a..cb0a2596d8c 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,14 +1,20 @@
# Template file for 'gstreamer-vaapi'
pkgname=gstreamer-vaapi
-version=1.16.2
+version=1.18.3
revision=1
build_style=meson
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libva-devel MesaLib-devel gst-plugins-bad1-devel"
+checkdepends="$makedepends"
short_desc="VA-API plugins for GStreamer 1.x"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601
+checksum=ae9877f15757a661d4dfe6a09755a2faa959ab60752f14ca26b7ff10765e1f12
+
+pre_check() {
+ # Seems to need certain hardware to pass
+ vsed -i '/vaapipostproc/d' tests/check/meson.build
+}
From f487b66d0e0247f9398218fe8a0c62daa868ee96 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:09:41 -0600
Subject: [PATCH 549/634] gst1-python3: update to 1.18.3.
---
srcpkgs/gst1-python/template | 19 ++++++-------------
srcpkgs/gst1-python3/patches/python-3.8.patch | 11 -----------
srcpkgs/gst1-python3/template | 7 +++----
3 files changed, 9 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/gst1-python3/patches/python-3.8.patch
diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template
index 7242b212a37..13a967a1703 100644
--- a/srcpkgs/gst1-python/template
+++ b/srcpkgs/gst1-python/template
@@ -1,23 +1,16 @@
# Template file for 'gst1-python'
pkgname=gst1-python
-version=1.16.2
+version=1.18.3
revision=1
wrksrc="gst-python-${version}"
-build_style=gnu-configure
-configure_args="--disable-static"
-pycompile_module="gi/overrides"
+build_style=meson
hostmakedepends="pkg-config python"
-makedepends="libglib-devel python-gobject-devel gst-plugins-base1-devel"
-depends="python-gobject"
+makedepends="libglib-devel python3-gobject-devel gst-plugins-base1-devel"
+depends="python3-gobject"
+checkdepends="$depends"
short_desc="Python bindings for GStreamer 1.x"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
+checksum=4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a
diff --git a/srcpkgs/gst1-python3/patches/python-3.8.patch b/srcpkgs/gst1-python3/patches/python-3.8.patch
deleted file mode 100644
index cbf1a58ea51..00000000000
--- a/srcpkgs/gst1-python3/patches/python-3.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build
-+++ meson.build
-@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
-
- pymod = import('python')
- python = pymod.find_installation(get_option('python'))
--python_dep = python.dependency(required : true)
-+python_dep = dependency('python3-embed', required : true)
-
- python_abi_flags = python.get_variable('ABIFLAGS', '')
- pylib_loc = get_option('libpython-dir')
diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 402018c0476..8232e307b80 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,10 +1,9 @@
# Template file for 'gst1-python3'
pkgname=gst1-python3
-version=1.16.2
-revision=3
+version=1.18.3
+revision=1
wrksrc="gst-python-${version}"
build_style=meson
-pycompile_module="gi/overrides"
hostmakedepends="pkg-config python3"
makedepends="libglib-devel python3-devel python3-gobject-devel gst-plugins-base1-devel"
depends="python3-gobject"
@@ -13,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=208df3148d73d9f416d016564737585d8ea763d91201732d44b5fe688c6288a8
+checksum=4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a
From 8bc93bd8248f1511d7063bc3692f550f656f8504 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:26:13 -0600
Subject: [PATCH 550/634] gst1-editing-services: update to 1.18.3.
---
srcpkgs/gst1-editing-services/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index a23f876d84b..89be86fa238 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,8 +1,8 @@
# Template file for 'gst1-editing-services'
pkgname=gst1-editing-services
-version=1.16.2
+version=1.18.3
revision=1
-wrksrc="${pkgname/gst1/gstreamer}-${version}"
+wrksrc="${pkgname/gst1/gst}-${version}"
build_style=meson
build_helper="gir"
configure_args="-Dgtk_doc=disabled"
@@ -12,16 +12,19 @@ short_desc="GStreamer 1.x Editing Services"
maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
-distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
-checksum=0e06a6191a0c6c16e16272bf2573cecaeb245f10629486ad940a299bef700c16
-python_version=2 #unverified
+distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
+checksum=8ae139b13b1646a20ba63b0b90877d35813e24cd87642d325e751fc7cb175e20
+
+do_check() {
+ : # Tests fail in older versions as well
+}
gst1-editing-services-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}
From 0989c3c14ab376066abbe6e53e7775a43e3812a5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:46:22 -0600
Subject: [PATCH 551/634] gst-plugins-bad1: update to 1.18.3.
---
.../patches/no-gir-automagic.patch | 24 ++++++++--
...an-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch | 48 -------------------
srcpkgs/gst-plugins-bad1/template | 12 +++--
3 files changed, 27 insertions(+), 57 deletions(-)
delete mode 100644 srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
diff --git a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
index 68c74ee18e5..38cc2f5edc1 100644
--- a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
@@ -1,11 +1,25 @@
---- meson.build 2019-06-09 12:56:31.309473261 +0200
-+++ meson.build 2019-06-09 12:56:46.166649265 +0200
-@@ -405,7 +405,7 @@
+From d4cba6b214ff9a631cdfb845c07101f97510abff Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:33:52 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5d52ea9..4b2b5ea 100644
+--- meson.build
++++ meson.build
+@@ -445,7 +445,7 @@ python3 = import('python').find_installation()
gir = find_program('g-ir-scanner', required : get_option('introspection'))
gnome = import('gnome')
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
+--
+2.29.2
+
diff --git a/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch b/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
deleted file mode 100644
index 30271438d8e..00000000000
--- a/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-uptream: yes (master)
-
-From 29bf8d8528ec694f65c8fae310adac996322cc74 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@ltnglobal.com>
-Date: Sat, 9 May 2020 19:59:46 +0200
-Subject: [PATCH] vulkan: Drop use of VK_RESULT_BEGIN_RANGE
-
-This was removed in Vulkan 1.2.140.
-
-> Shortly after 2020-04-24, we will be removing the automatically
-> generated `VK_*_BEGIN_RANGE`, `VK_*_END_RANGE`, and `VK_*_RANGE_SIZE`
-> tokens from the Vulkan headers. These tokens are currently defined for
-> some enumerated types, but are explicitly not part of the Vulkan API.
-> They existed only to support some Vulkan implementation internals,
-> which no longer require them. We will be accepting comments on this
-> topic in [#1230], but we strongly suggest any external projects using
-> these tokens immediately migrate away from them.
-
-[#1230]: https://github.com/KhronosGroup/Vulkan-Docs/issues/1230
----
- ext/vulkan/vkerror.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/ext/vulkan/vkerror.c b/ext/vulkan/vkerror.c
-index 3fec27e4d..c91589d9b 100644
---- ext/vulkan/vkerror.c
-+++ ext/vulkan/vkerror.c
-@@ -27,7 +27,7 @@
- #include "vkerror.h"
-
- /* *INDENT-OFF* */
--static const struct
-+static const struct
- {
- VkResult result;
- const char *str;
-@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result)
-
- if (result >= 0)
- return NULL;
-- if (result < VK_RESULT_BEGIN_RANGE)
-- return "Unknown Error";
-
- for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) {
- if (result == vk_result_string_map[i].result)
---
-2.26.2
-
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 212203c24a1..e94d8095e0b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
-version=1.16.2
-revision=10
+version=1.18.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
@@ -15,7 +15,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
-Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled
-Dgme=$(vopt_if gme enabled disabled)
-Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
-hostmakedepends="automake gettext libtool pkg-config python glib-devel
+hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
orc wayland-devel"
makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
@@ -36,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74
+checksum=b7e34b6b86272588fbd8b314dadfa6ceff895198cfb59e2950378e9e31ff22e0
build_options="gir gme"
build_options_default="gir"
@@ -49,6 +49,10 @@ case "$XBPS_TARGET_MACHINE" in
*) build_options_default+=" gme" ;;
esac
+do_check() {
+ ninja check || msg_warn "Tests failed, but not unexpected"
+}
+
gst-plugins-bad1-devel_package() {
depends="gst-plugins-base1-devel>=${version} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From d845f93dbcd87f99fd3c12f67631eda725826a9c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:52:30 -0600
Subject: [PATCH 552/634] gst-plugins-good1: update to 1.18.3.
---
srcpkgs/gst-plugins-good1/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index ba326be3f1d..0a5daa610ee 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
-version=1.16.2
-revision=3
+version=1.18.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
@@ -23,11 +23,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319
+checksum=9b3b8e05d4d6073bf929fb33e2d8f74dd81ff21fa5b50c3273c78dfa2ab9c5cb
build_options="gtk3"
build_options_default="gtk3"
+do_check() {
+ ninja -C build test || : #Fails on i686
+}
+
gst-plugins-good1-qt5_package() {
short_desc+=" - Qt5 plugins"
depends="gst-plugins-good1-${version}_${revision}"
From afc4fa560f20655efc9f7d9da3076ac39b7f7ff8 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:54:53 -0600
Subject: [PATCH 553/634] gst-plugins-ugly1: update to 1.18.3.
---
srcpkgs/gst-plugins-ugly1/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index c4661f69138..c5622645e30 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,12 +1,12 @@
# Template file for 'gst-plugins-ugly1'
pkgname=gst-plugins-ugly1
-version=1.16.2
-revision=2
+version=1.18.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled"
# XXX add required pkgs for the amr, sid plugins.
-hostmakedepends="pkg-config intltool python"
+hostmakedepends="pkg-config intltool python3"
makedepends="glib-devel libxml2-devel gst-plugins-base1-devel
libcdio-devel libdvdread-devel libmad-devel x264-devel mpg123-devel
orc-devel liba52-devel libmpeg2-devel lame-devel"
@@ -16,5 +16,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca
+checksum=70f7429b25dd2f714eb18e80af61b1363b1f63019e16cd28e086e3a619eaa992
lib32disabled=yes
From fc570d13a244e8916d18f66618f017f85ff7d408 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:31:16 -0600
Subject: [PATCH 554/634] gst-plugins-base1: update to 1.18.3.
Removed sndio patch due to upstream
---
.../patches/no-gir-automagic.patch | 24 ++++++++++++----
srcpkgs/gst-plugins-base1/template | 28 ++++++++++++++-----
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
index f1226041ae6..36483a10e06 100644
--- a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
@@ -1,11 +1,25 @@
---- meson.build 2019-06-09 10:53:06.607859182 +0200
-+++ meson.build 2019-06-09 10:53:24.953088389 +0200
-@@ -356,7 +356,7 @@
+From 0d734eb2314fc60deee59de5f1440617e04e5125 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:25:30 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5ecce7f..98f8113 100644
+--- meson.build
++++ meson.build
+@@ -416,7 +416,7 @@ endif
gir = find_program('g-ir-scanner', required : get_option('introspection'))
gnome = import('gnome')
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
+--
+2.29.2
+
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index eb05c1c2fa3..f5065d2ea03 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-base1'
pkgname=gst-plugins-base1
-version=1.16.2
-revision=2
+version=1.18.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
build_helper="gir"
@@ -16,27 +16,41 @@ makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel
libSM-devel orc-devel $(vopt_if cdparanoia libcdparanoia-devel)
opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel"
depends="orc>=0.4.18 gstreamer1>=${version}"
+checkdepends="mesa-dri"
short_desc="GStreamer Base Plug-ins (v1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a
+checksum=dbfa20283848f0347a223dd8523dfb62e09e5220b21b1d157a8b0c8b67ba9f52
-# Package build options
build_options="cdparanoia gir sndio"
build_options_default="cdparanoia gir"
-
-# this should not remain in this package in longer term
-# either upstream, separate, or remove
desc_option_sndio="Enable sndio support (unsupported, known to be problematic)"
+# Remove sndio if not upstreamed
+if [ "$build_option_sndio" ]; then
+ msg_warn "sndio is unsupported upstream"
+fi
+
case "$XBPS_TARGET_MACHINE" in
mips*) # XXX: work around assembler "Error: branch out of range"
CFLAGS=" -Os"
;;
esac
+pre_check() {
+ export XDG_RUNTIME_DIR=/etc/xdg
+ # Fails to get PCI-id in chroot
+ vsed -e '/glimagesink/d' \
+ -e '/gl-launch-lines/d' \
+ -i tests/check/meson.build
+}
+
+do_check() {
+ ninja -C build test || : # Locally checks pass
+}
+
gst-plugins-base1-devel_package() {
depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision} orc-devel"
short_desc+=" - development files"
From 2f5420cbe322154bc0b17b0469a67e301d5acd4b Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:21:10 -0600
Subject: [PATCH 555/634] gstreamer1: update to 1.18.3.
Remove gtk_doc option as it does nothing and doubt many use
---
.../gstreamer1/patches/no-gir-automagic.patch | 22 ++++++++++---
srcpkgs/gstreamer1/template | 32 +++++++++----------
2 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
index c0135214edd..53740b4bb04 100644
--- a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
+++ b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
@@ -1,13 +1,25 @@
-diff --git a/meson.build b/meson.build
-index e738c55..e1b8d93 100644
+From 225e87688f21a817224655372004eb512f862d43 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Sun, 15 Nov 2020 10:04:50 -0600
+Subject: [PATCH] no-gir-automatic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git meson.build meson.build
+index 5a21823..5d1db37 100644
--- meson.build
+++ meson.build
-@@ -451,7 +451,7 @@ rt_lib = cc.find_library('rt', required : false)
+@@ -503,7 +503,7 @@ rt_lib = cc.find_library('rt', required : false)
gir = find_program('g-ir-scanner', required : get_option('introspection'))
gnome = import('gnome')
--build_gir = gir.found() and not meson.is_cross_build()
-+build_gir = gir.found()
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
++build_gir = gir.found() or get_option('introspection').enabled()
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
+--
+2.29.2
+
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 7a5863b2765..629caa92e52 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,16 +1,15 @@
# Template file for 'gstreamer1'
pkgname=gstreamer1
-version=1.16.2
-revision=2
+version=1.18.3
+revision=1
wrksrc="gstreamer-${version}"
build_style=meson
build_helper="gir"
configure_args="-Dptp-helper-permissions=capabilities
-Dpackage-origin=https://www.voidlinux.org -Ddbghelp=disabled
- -Dintrospection=$(vopt_if gir enabled disabled)
- -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
-hostmakedepends="gettext pkg-config flex python docbook-xsl glib-devel
- libcap-progs $(vopt_if gtk_doc gtk-doc)"
+ -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="gettext pkg-config flex python3 docbook-xsl glib-devel
+ libcap-progs"
makedepends="libxml2-devel libglib-devel gtk+3-devel libcap-devel libunwind-devel
bash-completion"
short_desc="Core GStreamer libraries and elements (1.x)"
@@ -18,17 +17,19 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e
+checksum=0c2e09e18f2df69a99b5cb3bd53c597b3cc2e35cf6c98043bb86a66f3d312100
-# Package build options
-build_options="gir gtk_doc"
-build_options_default="gir"
+pre_check() {
+ # gst_gstdatetime is known to fail according to LFS
+ vsed -i '/gstdatetime/d' tests/check/meson.build
+}
-desc_option_gtk_doc="Build GTK Documentation with gtk-doc"
+do_check() {
+ ninja -C build test || msg_warn "Fails on musl"
+}
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
+build_options="gir"
+build_options_default="gir"
gstreamer1-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -37,9 +38,6 @@ gstreamer1-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
vmove usr/share/aclocal
if [ "$build_option_gir" ]; then
vmove "usr/share/gir*"
From 5323388f39c85c5f56b61e69a64080b64c88fa5b Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Mon, 1 Feb 2021 10:00:21 +0100
Subject: [PATCH 556/634] geos: update to 3.9.0.
---
common/shlibs | 4 ++--
srcpkgs/geos/patches/geos-arm.patch | 14 ++++++++++++++
srcpkgs/geos/template | 6 +++---
3 files changed, 19 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/geos/patches/geos-arm.patch
diff --git a/common/shlibs b/common/shlibs
index b9fec683dea..1523374f949 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3451,8 +3451,8 @@ libmedC.so.11 libmed-4.0.0_1
libmed.so.11 libmed-4.0.0_1
libeog.so eog-3.28.0_4
libfreexl.so.1 freexl-1.0.5_1
-libgeos-3.7.0.so geos-3.7.0_1
-libgeos_c.so.1 geos-3.6.2_1
+libgeos-3.9.0.so geos-3.9.0_1
+libgeos_c.so.1 geos-3.9.0_1
libpapi.so.5 papi-5.6.0_1
libpfm.so.4 papi-5.6.0_1
libfifechan.so.0.1.5 fifechan-0.1.5_1
diff --git a/srcpkgs/geos/patches/geos-arm.patch b/srcpkgs/geos/patches/geos-arm.patch
new file mode 100644
index 00000000000..5b6a7c6c7da
--- /dev/null
+++ b/srcpkgs/geos/patches/geos-arm.patch
@@ -0,0 +1,14 @@
+see http://trac.osgeo.org/geos/ticket/222
+
+--- src/inlines.cpp 2020-12-09 18:17:36.000000000 +0100
++++ src/inlines.cpp 2021-02-02 09:57:11.270098998 +0100
+@@ -62,7 +62,9 @@
+ #include <geos/geomgraph/TopologyLocation.inl>
+ #include <geos/geomgraph/index/SegmentIntersector.inl>
+ #include <geos/noding/snapround/HotPixel.inl>
++#if ! defined(__ARM_EABI__)
+ #include <geos/noding/BasicSegmentString.inl>
++#endif // !defined __ARM_EABI__
+ #include <geos/noding/MCIndexNoder.inl>
+
+ #endif // defined __CYGWIN__
diff --git a/srcpkgs/geos/template b/srcpkgs/geos/template
index 049af66d27a..4926620832e 100644
--- a/srcpkgs/geos/template
+++ b/srcpkgs/geos/template
@@ -1,14 +1,14 @@
# Template file for 'geos'
pkgname=geos
-version=3.7.1
+version=3.9.0
revision=1
build_style=gnu-configure
short_desc="C++ port of the Java Topology Suite (JTS)"
-maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
license="LGPL-2.1-or-later"
homepage="https://trac.osgeo.org/geos"
distfiles="https://download.osgeo.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=0006c7b49eaed016b9c5c6f872417a7d7dc022e069ddd683335793d905a8228c
+checksum=bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269
geos-devel_package() {
depends="${makedepends} ${sourcepkg}-${version}_${revision}"
From 6f6d31255f25771995f8df82e6054761b5f0fd50 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 30 Jun 2020 16:19:50 -0500
Subject: [PATCH 557/634] dolphin-emu: update to 5.0.13178.
This moves to their beta releases, which are recommende for distribution
use.
Added by ericonr:
- Fix cross and use system's libenet.
Closes #25625.
---
...1c73c6e384b55ac8b95891bcecc455fae0da.patch | 47 --------
.../patches/mbedtls_platform_h.patch | 10 --
srcpkgs/dolphin-emu/patches/musl.patch | 22 ----
.../dolphin-emu/patches/raster_font_cpp.patch | 112 ------------------
.../dolphin-emu/patches/soundtouch212.patch | 17 ---
srcpkgs/dolphin-emu/template | 25 ++--
6 files changed, 13 insertions(+), 220 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
delete mode 100644 srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
delete mode 100644 srcpkgs/dolphin-emu/patches/musl.patch
delete mode 100644 srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
delete mode 100644 srcpkgs/dolphin-emu/patches/soundtouch212.patch
diff --git a/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch b/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
deleted file mode 100644
index a808884a62a..00000000000
--- a/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Origin: https://github.com/dolphin-emu/dolphin/commit/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
-Subject: [PATCH] intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK,
- which are reserved
-
----
---- Source/Core/Common/x64CPUDetect.cpp 2016-06-24 10:09:07.000000000 +0200
-+++ - 2018-08-19 19:43:35.737800299 +0200
-@@ -41,15 +41,27 @@
- return __cpuidex(info, function_id, 0);
- }
-
--#define _XCR_XFEATURE_ENABLED_MASK 0
--static u64 _xgetbv(u32 index)
-+#endif // ifndef _WIN32
-+
-+#ifdef _WIN32
-+
-+static u64 xgetbv(u32 index)
-+{
-+ return _xgetbv(index);
-+}
-+constexpr u32 XCR_XFEATURE_ENABLED_MASK = _XCR_XFEATURE_ENABLED_MASK;
-+
-+#else
-+
-+static u64 xgetbv(u32 index)
- {
- u32 eax, edx;
- __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
- return ((u64)edx << 32) | eax;
- }
-+constexpr u32 XCR_XFEATURE_ENABLED_MASK = 0;
-+#endif // ifdef _WIN32
-
--#endif // ifndef _WIN32
-
- CPUInfo cpu_info;
-
-@@ -134,7 +146,7 @@
- // - XGETBV result has the XCR bit set.
- if (((cpu_id[2] >> 28) & 1) && ((cpu_id[2] >> 27) & 1))
- {
-- if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
-+ if ((xgetbv(XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
- {
- bAVX = true;
- if ((cpu_id[2] >> 12) & 1)
diff --git a/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch b/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
deleted file mode 100644
index 3d6587bbe60..00000000000
--- a/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h 2016-06-24 10:09:07.000000000 +0200
-+++ Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h 2016-09-22 19:31:59.015774803 +0200
-@@ -5,6 +5,7 @@
- #pragma once
-
- #include <string>
-+#include <mbedtls/platform.h>
- #include <mbedtls/ctr_drbg.h>
- #include <mbedtls/entropy.h>
- #include <mbedtls/net.h>
diff --git a/srcpkgs/dolphin-emu/patches/musl.patch b/srcpkgs/dolphin-emu/patches/musl.patch
deleted file mode 100644
index 52a8164c16d..00000000000
--- a/srcpkgs/dolphin-emu/patches/musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Source/PCH/pch.h.orig 2016-06-26 08:53:16.021952803 +0200
-+++ Source/PCH/pch.h 2016-06-26 08:54:20.662712317 +0200
-@@ -19,7 +19,7 @@
- #include <ctype.h>
- #include <deque>
- #include <errno.h>
--#if !defined ANDROID && !defined _WIN32
-+#if defined(__linux__) && defined(__GLIBC__)
- #include <execinfo.h>
- #endif
- #include <fcntl.h>
---- Source/Core/Common/Thread.cpp.orig 2016-06-26 08:56:12.959031810 +0200
-+++ Source/Core/Common/Thread.cpp 2016-06-26 08:57:27.281905099 +0200
-@@ -135,7 +135,7 @@ void SetCurrentThreadName(const char* sz
- pthread_setname_np(szThreadName);
- #elif defined __FreeBSD__
- pthread_set_name_np(pthread_self(), szThreadName);
--#else
-+#elif defined __GLIBC__
- // linux doesn't allow to set more than 16 bytes, including \0.
- pthread_setname_np(pthread_self(), std::string(szThreadName).substr(0, 15).c_str());
- #endif
diff --git a/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch b/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
deleted file mode 100644
index a569ec7e1e6..00000000000
--- a/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- Source/Core/VideoBackends/OGL/RasterFont.cpp.orig 2017-04-20 13:02:30.087390930 +0300
-+++ Source/Core/VideoBackends/OGL/RasterFont.cpp 2017-04-20 13:02:49.036390127 +0300
-@@ -15,12 +15,12 @@
- namespace OGL
- {
-
--static const int CHAR_WIDTH = 8;
--static const int CHAR_HEIGHT = 13;
--static const int CHAR_OFFSET = 32;
--static const int CHAR_COUNT = 95;
-+static const int CHARACTER_WIDTH = 8;
-+static const int CHARACTER_HEIGHT = 13;
-+static const int CHARACTER_OFFSET = 32;
-+static const int CHARACTER_COUNT = 95;
-
--static const u8 rasters[CHAR_COUNT][CHAR_HEIGHT] = {
-+static const u8 rasters[CHARACTER_COUNT][CHARACTER_HEIGHT] = {
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36},
-@@ -146,27 +146,27 @@
- glGenTextures(1, &texture);
- glActiveTexture(GL_TEXTURE8);
- glBindTexture(GL_TEXTURE_2D, texture);
-- std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
-- for (int y = 0; y < CHAR_HEIGHT; y++)
-+ std::vector<u32> texture_data(CHARACTER_WIDTH * CHARACTER_COUNT * CHARACTER_HEIGHT);
-+ for (int y = 0; y < CHARACTER_HEIGHT; y++)
- {
-- for (int c = 0; c < CHAR_COUNT; c++)
-+ for (int c = 0; c < CHARACTER_COUNT; c++)
- {
-- for (int x = 0; x < CHAR_WIDTH; x++)
-+ for (int x = 0; x < CHARACTER_WIDTH; x++)
- {
-- bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1))));
-- texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0;
-+ bool pixel = (0 != (rasters[c][y] & (1 << (CHARACTER_WIDTH - x - 1))));
-+ texture_data[CHARACTER_WIDTH * CHARACTER_COUNT * y + CHARACTER_WIDTH * c + x] = pixel ? -1 : 0;
- }
- }
- }
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
-+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHARACTER_WIDTH * CHARACTER_COUNT, CHARACTER_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
-
- // generate shader
- ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
- s_shader.Bind();
-
- // bound uniforms
-- glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHAR_COUNT), 1.0f);
-+ glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHARACTER_COUNT), 1.0f);
- uniform_color_id = glGetUniformLocation(s_shader.glprogid,"color");
- glUniform4f(uniform_color_id, 1.0f, 1.0f, 1.0f, 1.0f);
- uniform_offset_id = glGetUniformLocation(s_shader.glprogid, "offset");
-@@ -196,8 +196,8 @@
- std::vector<GLfloat> vertices(text.length() * 6 * 4);
-
- int usage = 0;
-- GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
-- GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
-+ GLfloat delta_x = GLfloat(2 * CHARACTER_WIDTH) / GLfloat(bbWidth);
-+ GLfloat delta_y = GLfloat(2 * CHARACTER_HEIGHT) / GLfloat(bbHeight);
- GLfloat border_x = 2.0f / GLfloat(bbWidth);
- GLfloat border_y = 4.0f / GLfloat(bbHeight);
-
-@@ -220,37 +220,37 @@
- continue;
- }
-
-- if (c < CHAR_OFFSET || c >= CHAR_COUNT + CHAR_OFFSET)
-+ if (c < CHARACTER_OFFSET || c >= CHARACTER_COUNT + CHARACTER_OFFSET)
- continue;
-
- vertices[usage++] = x;
- vertices[usage++] = y;
-- vertices[usage++] = GLfloat(c - CHAR_OFFSET);
-+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
- vertices[usage++] = 0.0f;
-
- vertices[usage++] = x + delta_x;
- vertices[usage++] = y;
-- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
-+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
- vertices[usage++] = 0.0f;
-
- vertices[usage++] = x + delta_x;
- vertices[usage++] = y + delta_y;
-- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
-+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
- vertices[usage++] = 1.0f;
-
- vertices[usage++] = x;
- vertices[usage++] = y;
-- vertices[usage++] = GLfloat(c - CHAR_OFFSET);
-+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
- vertices[usage++] = 0.0f;
-
- vertices[usage++] = x + delta_x;
- vertices[usage++] = y + delta_y;
-- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
-+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
- vertices[usage++] = 1.0f;
-
- vertices[usage++] = x;
- vertices[usage++] = y + delta_y;
-- vertices[usage++] = GLfloat(c - CHAR_OFFSET);
-+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
- vertices[usage++] = 1.0f;
-
- x += delta_x + border_x;
diff --git a/srcpkgs/dolphin-emu/patches/soundtouch212.patch b/srcpkgs/dolphin-emu/patches/soundtouch212.patch
deleted file mode 100644
index b48c57d94f5..00000000000
--- a/srcpkgs/dolphin-emu/patches/soundtouch212.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS with SoundTouch 2.1.2
- Explicitly disable exceptions in SoundTouch headers because Dolphin
- is compiled with -fno-exceptions.
-Author: James Cowgill <jcowgill@debian.org>
-Bug-Debian: https://bugs.debian.org/917671
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- Source/Core/AudioCommon/OpenALStream.h
-+++ Source/Core/AudioCommon/OpenALStream.h
-@@ -32,6 +32,7 @@
- #define BOOL SoundTouch_BOOL
- #endif
-
-+#define ST_NO_EXCEPTION_HANDLING
- #include <soundtouch/SoundTouch.h>
- #include <soundtouch/STTypes.h>
-
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 0e38d8d25be..a577e9cc962 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,25 +1,26 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
-version=5.0
-revision=18
-archs="x86_64* ppc64le*"
-wrksrc="dolphin-${version}"
+version=5.0.13178
+revision=1
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+#Version/hash pair can be found at https://dolphin-emu.org/download/
+archs="x86_64* aarch64* ppc64le*"
+wrksrc="dolphin-${_commit}"
build_style=cmake
-configure_args="-DUSE_X11=1 -DUSE_EGL=0
- -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
-hostmakedepends="pkg-config"
+configure_args="-DUSE_SHARED_ENET=ON"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
makedepends="
- zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel libevdev-devel
+ zlib-devel glew-devel libusb-devel qt5-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel libgomp-devel libcurl-devel
- portaudio-devel libopenal-devel soundtouch-devel lzo-devel wxWidgets-devel
- mbedtls-devel SFML-devel libenet-devel"
+ portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
+ mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${version}.tar.gz"
-checksum=62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
nopie=yes
case "$XBPS_TARGET_MACHINE" in
From 3fc02764d6a54ec6a963b03ac00c10e415f5eaad Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 1 Feb 2021 15:31:23 +0000
Subject: [PATCH 558/634] xorg-util-macros: update to 1.19.3.
Also move homepage to new git repository.
Closes: #28391 [via git-merge-pr]
---
srcpkgs/xorg-util-macros/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template
index fb979ac898d..7d20e7035fb 100644
--- a/srcpkgs/xorg-util-macros/template
+++ b/srcpkgs/xorg-util-macros/template
@@ -1,16 +1,16 @@
# Template file for 'xorg-util-macros'
pkgname=xorg-util-macros
-version=1.19.2
-revision=2
+version=1.19.3
+revision=1
wrksrc="${pkgname/xorg-/}-${version}"
build_style=gnu-configure
hostmakedepends="pkg-config"
short_desc="X.org autotool macros"
-homepage="http://www.x.org/"
-license="MIT"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/xorg/util/macros/"
distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2"
-checksum=d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712
+checksum=0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971
post_install() {
vlicense COPYING
From 436154911d6097f19421f9b9821fd42f6be20d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:17:40 -0300
Subject: [PATCH 559/634] meson: update to 0.56.2.
Fix checkdepends and tests in general on musl.
Add bash completions.
---
srcpkgs/meson/patches/fix-unittest.patch | 77 ++++++++++++++++++++++++
srcpkgs/meson/template | 29 ++++++---
2 files changed, 99 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 00000000000..746de056ed7
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date: Mon Feb 1 00:26:49 2021 -0300
+
+ tests/common: fix " 37 has function" test on musl systems.
+
+ This commit fixes the test that asserts on whether the lchmod() function
+ should have been detected as available by Meson. It does so by assuming
+ that on Linux systems not using glibc, the function will be available.
+
+ - fix comment about lchmod on Linux: musl has implemented the function
+ correctly since 2013, so the assumption in the test wasn't correct.
+ Furthermore, musl doesn't use glibc's stub mechanism.
+ - fix include to receive __GLIBC__ definition: including almost any
+ header in glibc will end up defining __GLIBC__, since most headers
+ include <features.h>. The <gnu/libc-version.h> header was probably
+ chosen because of its name, but its actual purpose is defining functions
+ for checking glibc version at runtime (instead of what the binary was
+ built with), so it isn't necessary to use it. Since it is a completely
+ non standard header, including it makes the test suite fail on musl due
+ to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- test cases/common/39 has function/meson.build
++++ test cases/common/39 has function/meson.build
+@@ -44,11 +44,13 @@ foreach cc : compilers
+ error('Found non-existent function "hfkerhisadf".')
+ endif
+
+- # With glibc on Linux lchmod is a stub that will always return an error,
+- # we want to detect that and declare that the function is not available.
+- # We can't check for the C library used here of course, but if it's not
+- # implemented in glibc it's probably not implemented in any other 'slimmer'
+- # C library variants either, so the check should be safe either way hopefully.
++ # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++ # always return an error, we want to detect that and declare that the
++ # function is not available.
++ # We can't check for the C library used here of course, but the main
++ # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++ # also, it has implemented lchmod since 2013, so it should be safe to check
++ # that lchmod is available on Linux when not using glibc.
+ if host_system == 'linux' or host_system == 'darwin'
+ assert (cc.has_function('poll', prefix : '#include <poll.h>',
+ args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+ has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+
+ if host_system == 'linux'
+- glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+- glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+- glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+- message('GLIBC vetsion:', glibc_vers)
++ # __GLIBC__ macro can be retrieved by including almost any C library header
++ glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++ # __GLIBC__ will only be set for glibc
++ if glibc_major != ''
++ glibc_print = 'hi "@0@" hi'.format(glibc_major)
++ message(glibc_print)
++ glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++ glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++ message('GLIBC version:', glibc_vers)
+
+- # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+- if glibc_vers.version_compare('<2.32')
+- assert (not has_lchmod, '"lchmod" check should have failed')
++ # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++ if glibc_vers.version_compare('<2.32')
++ assert (not has_lchmod, '"lchmod" check should have failed')
++ else
++ assert (has_lchmod, '"lchmod" check should have succeeded')
++ endif
+ else
++ # Other C libraries for Linux should have lchmod
+ assert (has_lchmod, '"lchmod" check should have succeeded')
+ endif
+ else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 9a1afce0cfc..64a12e6d7a9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,20 +1,33 @@
# Template file for 'meson'
pkgname=meson
-version=0.55.3
-revision=3
+version=0.56.2
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
-checkdepends="glib-devel gobject-introspection libsanitizer-devel ninja
+checkdepends="glib-devel gobject-introspection ninja
gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="John <me@johnnynator.dev>"
license="Apache-2.0"
homepage="https://mesonbuild.com"
-changelog="https://github.com/mesonbuild/$pkgname/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
-distfiles="https://github.com/mesonbuild/$pkgname/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5
+changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
+distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+
+# XXX: sanitizers aren't available on musl
+if [ "$XBPS_TARGET_LIBC" = glibc ]; then
+ checkdepends+=" libsanitizer-devel"
+fi
+
+post_patch() {
+ if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ vsed -e 's/test_pch_with_address_sanitizer/_&/' \
+ -e 's/test_generate_gir_with_address_sanitizer/_&/' \
+ -i run_unittests.py
+ fi
+}
do_check() {
# meson depends on trillion of things to perform actual tests
@@ -35,5 +48,7 @@ post_install() {
done
vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp
- vinstall data/shell-completions/zsh/_meson 644 usr/share/zsh/site-functions
+
+ vcompletion data/shell-completions/bash/meson bash
+ vcompletion data/shell-completions/zsh/_meson zsh
}
From e4a67822c55e78ba8caca819a4874a3edc812223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 17:20:22 -0300
Subject: [PATCH 560/634] kanshi: add patch to fix ndebug build.
Caught by new warnings enabled by meson update.
---
srcpkgs/kanshi/patches/assert.patch | 37 +++++++++++++++++++++++++++++
srcpkgs/kanshi/template | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kanshi/patches/assert.patch
diff --git a/srcpkgs/kanshi/patches/assert.patch b/srcpkgs/kanshi/patches/assert.patch
new file mode 100644
index 00000000000..90e8e3c7bab
--- /dev/null
+++ b/srcpkgs/kanshi/patches/assert.patch
@@ -0,0 +1,37 @@
+commit 5ff7fad0a8391c0c3ef87f48e34e4e65c584d000
+Author: Érico Rolim <erico.erc@gmail.com>
+Date: Tue Feb 2 17:18:42 2021 -0300
+
+ parser: use abort() instead of assert(0).
+
+ assert(0) has no effect on NDEBUG builds, and means the program will
+ continue running in an unexpected state.
+
+diff --git parser.c parser.c
+index 40146e8..0ed1ba1 100644
+--- parser.c
++++ parser.c
+@@ -1,5 +1,4 @@
+ #define _POSIX_C_SOURCE 200809L
+-#include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <stdbool.h>
+@@ -24,7 +23,7 @@ static const char *token_type_str(enum kanshi_token_type t) {
+ case KANSHI_TOKEN_NEWLINE:
+ return "newline";
+ }
+- assert(0);
++ abort();
+ }
+
+ static int parser_read_char(struct kanshi_parser *parser) {
+@@ -333,7 +332,7 @@ static struct kanshi_profile_output *parse_profile_output(
+ }
+ break;
+ default:
+- assert(0);
++ abort();
+ }
+ has_key = false;
+ output->fields |= key;
diff --git a/srcpkgs/kanshi/template b/srcpkgs/kanshi/template
index fbef9a7e59b..e6fe40f4a69 100644
--- a/srcpkgs/kanshi/template
+++ b/srcpkgs/kanshi/template
@@ -1,7 +1,7 @@
# Template file for 'kanshi'
pkgname=kanshi
version=1.1.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config scdoc wayland-devel"
makedepends="wayland-devel"
From 1db2805371267192fc411532aff66ccddd7c4925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 18:05:10 -0300
Subject: [PATCH 561/634] wlroots: follow upstream recommendation for ndebug.
Assertions in this case are desirable at runtime.
Fix build for meson 0.56.x, since new warnings were added.
---
srcpkgs/wlroots/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index a73b5f21a13..c4d3bad99c6 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,11 +1,12 @@
# Template file for 'wlroots'
pkgname=wlroots
version=0.12.0
-revision=1
+revision=2
build_style=meson
+# enable assertions - upstream uses them only for unreachable situations
configure_args="-Dlogind=disabled -Dlibseat=enabled
-Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
- -Dx11-backend=enabled -Dexamples=false"
+ -Dx11-backend=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false"
hostmakedepends="pkg-config wayland-devel"
_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
From 8e27d738027b813f5095ccddda9e71c10588e7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 19:30:18 -0300
Subject: [PATCH 562/634] efl: don't build examples.
Avoids wasting build time.
Also gate tests, since they aren't working great yet.
---
srcpkgs/efl/template | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index a8b26fff25c..513cb4dfff4 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -4,6 +4,7 @@ version=1.24.4
revision=1
build_style=meson
configure_args="
+ -Dbuild-examples=false
-Dembedded-lz4=false
-Dcrypto=openssl
-Dnetwork-backend=none
@@ -46,6 +47,7 @@ makedepends="
$(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if lottie rlottie-devel)
$(vopt_if ibus ibus-devel)"
+checkdepends="dbus xvfb-run"
short_desc="Enlightenment Foundation Libraries"
maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.1-only"
@@ -104,6 +106,13 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
+do_check() {
+ if [ "$XBPS_CHECK_PKGS" = full ]; then
+ # FIXME: tests fail in weird places
+ xvfb-run dbus-run-session ninja -C build test
+ fi
+}
+
post_install() {
# don't want service file junk
rm -rf ${DESTDIR}/usr/lib/systemd
From 51454ddf745f32745fea0a6aea4a172e2ddd05e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 17:04:39 -0300
Subject: [PATCH 563/634] seatd: fix build with meson 0.56.x.
meson added some new warnings to the warning level used by seatd,
including for unused arguments. This made the build generate warnings,
and seatd's default of werror=true caused the build to fail.
---
srcpkgs/seatd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index d76d4d3a658..e6b6b387444 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,7 @@ pkgname=seatd
version=0.4.0
revision=1
build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled)"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
hostmakedepends="pkg-config scdoc"
makedepends="$(vopt_if elogind elogind-devel)"
short_desc="Minimal seat management daemon"
From 1372d6b98ed336ebe1e57b26023752bef3cb63d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 19:42:48 -0300
Subject: [PATCH 564/634] mako: fix build with meson 0.56.x.
---
srcpkgs/mako/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mako/template b/srcpkgs/mako/template
index 299305acd78..18c18def196 100644
--- a/srcpkgs/mako/template
+++ b/srcpkgs/mako/template
@@ -3,7 +3,7 @@ pkgname=mako
version=1.4.1
revision=1
build_style=meson
-configure_args="-Dzsh-completions=true -Dapparmor=true"
+configure_args="-Dzsh-completions=true -Dapparmor=true -Dwerror=false"
hostmakedepends="pkg-config scdoc wayland-devel wayland-protocols"
makedepends="wayland-devel wayland-protocols pango-devel cairo-devel
elogind-devel gdk-pixbuf-devel"
From 1e5157421466e355d064f8eed2fe007cbd6961dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 19:59:11 -0300
Subject: [PATCH 565/634] grim: fix build for meson 0.56.x.
---
srcpkgs/grim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index 896434db405..61844769456 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -3,7 +3,7 @@ pkgname=grim
version=1.3.1
revision=1
build_style=meson
-configure_args="-Djpeg=enabled"
+configure_args="-Djpeg=enabled -Dwerror=false"
hostmakedepends="pkg-config wayland-devel scdoc"
makedepends="wayland-devel wayland-protocols cairo-devel libjpeg-turbo-devel"
short_desc="Grab images from a Wayland compositor"
From 3b0e53d12c2e7d48e945701514b9f07b8248a508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 20:40:19 -0300
Subject: [PATCH 566/634] swayidle: fix build with meson 0.56.x.
---
srcpkgs/swayidle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swayidle/template b/srcpkgs/swayidle/template
index b6f51f47927..e415051946a 100644
--- a/srcpkgs/swayidle/template
+++ b/srcpkgs/swayidle/template
@@ -3,7 +3,7 @@ pkgname=swayidle
version=1.6
revision=1
build_style=meson
-configure_args="-Dlogind-provider=elogind"
+configure_args="-Dlogind-provider=elogind -Dwerror=false"
hostmakedepends="pkg-config wayland-devel scdoc"
makedepends="wayland-devel wayland-protocols elogind-devel"
short_desc="Idle management daemon for Wayland"
From c1a7fb09113ca5f0f88e37321ee78578d1e8bef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 17:57:20 -0300
Subject: [PATCH 567/634] pixman: fix potential build errors with meson 0.56.x.
I couldn't reproduce the errors, so this commit is not entirely
necessary. It still works as a precaution.
The below is slightly erroneous, since the issue didn't repeat itself.
Apparently meson detects OpenMP as available on cross builds because it
can find the omp.h header, even though the library seems to be
available.
For reference, what the configure output of a native build looks like:
WARNING: OpenMP found but omp.h missing.
Run-time dependency OpenMP found: NO
---
srcpkgs/pixman/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index ca5bf9632b0..26c65462af6 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -20,7 +20,11 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
if [ "$XBPS_CHECK_PKGS" ]; then
# libpng and openmp are used only for testing; the make-blue-noise.c file isn't built
# https://gitlab.freedesktop.org/pixman/pixman/-/blob/9b49f4e08751885289333fed652bf5e0f45976b4/pixman/dither/make-blue-noise.c
- configure_args+=" -Dlibpng=enabled -Dopenmp=enabled"
+ configure_args+=" -Dtests=enabled -Dlibpng=enabled -Dopenmp=enabled"
+else
+ # dynamic libgomp is available only when running tests, better to disable explicitly.
+ # -Dtests will only take effect on the next release.
+ configure_args+=" -Dtests=disabled -Dopenmp=disabled"
fi
post_install() {
From 58b6ab8186a5d5f0bbdda0c66c54f1e13ce684f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 21:51:21 -0300
Subject: [PATCH 568/634] nautilus: fix build after libdir changes.
Also gate tests.
---
srcpkgs/nautilus/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index f7108f9b062..e38755f0806 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -19,9 +19,23 @@ homepage="https://wiki.gnome.org/Nautilus"
distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz"
checksum=0a3e812b13b774b7fd6f222f55acd1f87fb2973d9af60c04b7d25cb52222d0fd
+if [ "$CROSS_BUILD" ]; then
+ # tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir:
+ # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
+ configure_args+=" -Dtests=none"
+fi
+
build_options="gir"
build_options_default="gir"
+do_check() {
+ if [ "$XBPS_CHECK_PKGS" = full ]; then
+ # tests timeout:
+ # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
+ ninja -C builddir test
+ fi
+}
+
libnautilus_package() {
short_desc+=" - shared libraries"
pkg_install() {
From d3cb45f270945fd172ff2227493f16903927787f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Feb 2021 21:50:26 -0300
Subject: [PATCH 569/634] grilo-plugins: fix build for libdir changes.
---
srcpkgs/grilo-plugins/template | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 2de976a082b..9631b2941a7 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -18,6 +18,14 @@ homepage="http://live.gnome.org/Grilo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=c6b6df086a164d65c206d70139ce80591f8feca3545612e45b823fb4fe4b2577
+post_patch() {
+ if [ "$CROSS_BUILD" ]; then
+ # tests try to use tracker-sandbox from the wrong path:
+ # "Program /usr/lib32/tracker-3.0/trackertestutils/tracker-sandbox found: NO"
+ vsed -e "/subdir('tests')/d" -i meson.build
+ fi
+}
+
# feel free to fix
do_check() {
:
From c017775adc3235f3aba6344097d35e1a5fac27a5 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 3 Feb 2021 00:54:14 -0500
Subject: [PATCH 570/634] xbps-src: dbulk-dump: remember to print bootstrap
---
xbps-src | 3 +++
1 file changed, 3 insertions(+)
diff --git a/xbps-src b/xbps-src
index 77969af84a1..009a145c1d6 100755
--- a/xbps-src
+++ b/xbps-src
@@ -893,6 +893,9 @@ case "$XBPS_TARGET" in
for x in pkgname version revision; do
printf '%s: %s\n' "$x" "${!x}"
done
+ for x in bootstrap; do
+ [[ ${!x} ]] && printf '%s: %s\n' "$x" "${!x}"
+ done
for x in hostmakedepends makedepends depends; do
arr=(${!x})
if [[ ${#arr} -gt 0 ]]; then
From 92bd9da74551aa1da053513e98ed2d3602dd3013 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Feb 2021 10:33:21 +0100
Subject: [PATCH 571/634] perl-Tree-DAG_Node: update to 1.32.
---
srcpkgs/perl-Tree-DAG_Node/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Tree-DAG_Node/template b/srcpkgs/perl-Tree-DAG_Node/template
index 8e942320569..9d690f6a36f 100644
--- a/srcpkgs/perl-Tree-DAG_Node/template
+++ b/srcpkgs/perl-Tree-DAG_Node/template
@@ -1,7 +1,7 @@
# Template build file for 'perl-Tree-DAG_Node'.
pkgname=perl-Tree-DAG_Node
-version=1.31
-revision=2
+version=1.32
+revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
homepage="https://metacpan.org/release/Tree-DAG_Node"
license="Artistic-2.0"
distfiles="${CPAN_SITE}/Tree/${pkgname/perl-/}-$version.tgz"
-checksum=1c8ba69772568b3758054247097512c550efe31517c329fb65eef7afccc9d304
+checksum=22d9de3d6e6f4afd89e6d825c664f9482878bd49e29cb81342a707af40542d3d
From e5badc17ab5a0ef5503d928be85f98fa0866bf80 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 11:36:43 +0100
Subject: [PATCH 572/634] xlbiff: update to 4.5.1.
---
srcpkgs/xlbiff/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index 25d93df6bf7..563bc583019 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
# Template file for 'xlbiff'
pkgname=xlbiff
-version=4.5
+version=4.5.1
revision=1
build_style=gnu-configure
configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="http://www.edsantiago.com/xlbiff/"
distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=efe4163a9b1ef8d7d4a472b2e719a5474022a1e32cc3f7ab1c0c17ee41c28b53
+checksum=96e72a0f30452d39ee9b37b4147cf89681b31546fb4fec607324349531f744cd
pre_configure() {
autoreconf -fi
From 33a8a3111750fde54e7dfc782fbf25e6b766fdeb Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 3 Feb 2021 10:18:23 -0300
Subject: [PATCH 573/634] texlive-science: fix typo in description.
---
srcpkgs/texlive-science/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/texlive-science/template b/srcpkgs/texlive-science/template
index c405043a463..17000ee36c2 100644
--- a/srcpkgs/texlive-science/template
+++ b/srcpkgs/texlive-science/template
@@ -1,10 +1,10 @@
# Template file for 'texlive-science'
pkgname=texlive-science
version=2020.57068
-revision=1
+revision=2
build_style="texmf"
depends="texlive-core"
-short_desc="TeX Live - Typesetting for mathematatics and science disciplines"
+short_desc="TeX Live - Typesetting for mathematics and science disciplines"
maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-2.0-or-later"
homepage="http://tug.org/texlive/"
From 2a49b6fdeb9d67ebb38230b66379f1ec6a359728 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 3 Feb 2021 10:02:46 +0100
Subject: [PATCH 574/634] google-chrome: update to 88.0.4324.146
---
srcpkgs/google-chrome/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index b182d2ce65e..e2cea8c2e7d 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
# Template file for 'google-chrome'
-_chromeVersion=88.0.4324.96
+_chromeVersion=88.0.4324.146
_chromeRevision=1
_channel=stable
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
_licenseUrl="https://www.google.com/intl/en/chrome/terms/"
distfiles="$_chromeUrl"
-checksum=4c3fca6ba917db4635368c99df61cd811c5138daa1ad890d4dc4271dd0014124
+checksum=2d9205f4f882c091ab9e5421e4d3f28d792479d073b1edce12632316b8f93c81
do_extract() {
mkdir -p ${DESTDIR}
From 669c05f18cd3d0a367acae7faabcc509f412adbf Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 3 Feb 2021 13:22:22 +0300
Subject: [PATCH 575/634] amfora: update to 1.7.2
---
srcpkgs/amfora/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index c19a4452657..2019ac482bd 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,6 +1,6 @@
# Template file for 'amfora'
pkgname=amfora
-version=1.7.1
+version=1.7.2
revision=1
build_style=go
go_import_path="github.com/makeworld-the-better-one/${pkgname}"
@@ -10,7 +10,7 @@ license="GPL-3.0-only"
homepage="https://github.com/makeworld-the-better-one/amfora"
changelog="https://raw.githubusercontent.com/makeworld-the-better-one/amfora/master/CHANGELOG.md"
distfiles="https://github.com/makeworld-the-better-one/${pkgname}/archive/v${version}.tar.gz"
-checksum=55a2d98e438ed3d41ad6bae6b4e04348a04e28a279fdc09866a1fdd5ee91d3ec
+checksum=3eb436a81b11b4db75dfb94e38eeaed994ce48a6a5f75ae02efd3f59cc76ec3e
post_install() {
vinstall amfora.desktop 644 usr/share/applications/
From 27742d133cb25a6d231be6ac0aea4de0f21dc8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 20:48:00 +0700
Subject: [PATCH 576/634] gst1-python: remove package
- Python 2 binding for gstreamer1
- Nothing depends on it
---
srcpkgs/gst1-python/template | 16 ----------------
srcpkgs/gst1-python/update | 2 --
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/gst1-python/template
delete mode 100644 srcpkgs/gst1-python/update
diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template
deleted file mode 100644
index 13a967a1703..00000000000
--- a/srcpkgs/gst1-python/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'gst1-python'
-pkgname=gst1-python
-version=1.18.3
-revision=1
-wrksrc="gst-python-${version}"
-build_style=meson
-hostmakedepends="pkg-config python"
-makedepends="libglib-devel python3-gobject-devel gst-plugins-base1-devel"
-depends="python3-gobject"
-checkdepends="$depends"
-short_desc="Python bindings for GStreamer 1.x"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://gstreamer.freedesktop.org"
-distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a
diff --git a/srcpkgs/gst1-python/update b/srcpkgs/gst1-python/update
deleted file mode 100644
index bfef6c041a7..00000000000
--- a/srcpkgs/gst1-python/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=${pkgname/1/}
-ignore="1.*[13579].*"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index cef8a752e46..f1847564501 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -40,6 +40,7 @@ replaces="
gksu<=2.0.2_4
go1.4-bootstrap<=20171003_2
goffice0.8<=0.8.17_6
+ gst1-python<=1.18.3_1
grv<=0.3.1_3
gtkhtml<=4.10.0_1
gtkhtml-devel<=4.10.0_1
From 235fc5db293131ef78836bfed9f76c8d36b5b066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 10:35:25 -0300
Subject: [PATCH 577/634] python3-Django: remove package.
Not maintained properly and a security risk.
---
srcpkgs/python3-Django/template | 21 ---------------------
srcpkgs/python3-Django/update | 1 -
2 files changed, 22 deletions(-)
delete mode 100644 srcpkgs/python3-Django/template
delete mode 100644 srcpkgs/python3-Django/update
diff --git a/srcpkgs/python3-Django/template b/srcpkgs/python3-Django/template
deleted file mode 100644
index 23a383b915d..00000000000
--- a/srcpkgs/python3-Django/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python3-Django'
-pkgname=python3-Django
-version=3.0.7
-revision=2
-wrksrc="Django-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytz python3-setuptools"
-short_desc="High-level Python3 Web framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.djangoproject.com/"
-distfiles="https://media.djangoproject.com/releases/3.0/Django-${version}.tar.gz"
-checksum=5052b34b34b3425233c682e0e11d658fd6efd587d11335a0203d827224ada8f2
-alternatives="django:django-admin:/usr/bin/django-admin3"
-
-post_install() {
- vlicense LICENSE
- rm -f ${DESTDIR}/usr/bin/django-admin.py*
- mv ${DESTDIR}/usr/bin/django-admin{,3}
-}
diff --git a/srcpkgs/python3-Django/update b/srcpkgs/python3-Django/update
deleted file mode 100644
index 25ef51d109a..00000000000
--- a/srcpkgs/python3-Django/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a* *b* *rc*"
From 741d789894fe3103be035e2ab1b2cf45dc7dddb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 10:42:27 -0300
Subject: [PATCH 578/634] removed-packages: add python3-Django.
---
srcpkgs/removed-packages/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f1847564501..229c78a6bcc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=21
+revision=22
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -183,6 +183,7 @@ replaces="
python-pyenet<=1.3.13.post7_2
python-pyside<=1.2.2_7
python-pytest-relaxed<=1.1.2_2
+ python3-Django<=3.0.7_2
python3-pyPEG2<=2.15.2_7
qimageblitz<=0.0.6_4
qucs<=0.0.19_2
From f2f2b35749757761be664a78ef9717d980988fdc Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 3 Feb 2021 16:27:00 +0300
Subject: [PATCH 579/634] element-desktop: update to 1.7.19
---
srcpkgs/element-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3dd6032b568..0a5204e7a6c 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'element-desktop'
pkgname=element-desktop
-version=1.7.18
+version=1.7.19
revision=1
wrksrc="element-web-${version}"
conf_files="/etc/${pkgname}/config.json"
@@ -18,8 +18,8 @@ _ghpage="https://github.com/vector-im"
_archive="archive/v${version}.tar.gz"
distfiles="${_ghpage}/element-desktop/${_archive}>element-desktop.tar.gz
${_ghpage}/element-web/${_archive}>element-web.tar.gz"
-checksum="364c6666cca3e8acee0f147fe8ac14825efa851bae4c89e2ce1cada5a817bff8
- 08ed3b659ebbe79fb749b49f18257024469e7d5f28d15d007529a12a9196d297"
+checksum="ab2543cf87614d82f3d070249c9890ac57b02a5ae1d7ed8140fcc56d1c1f8bd6
+ f2817b02b80106b8fee307cc7f0ecff1c735111407acd4fb92363a8457d5ea80"
export USE_SYSTEM_APP_BUILDER=true
From 34c5b2b4f9971ec71c2c48d652a0f0bf4b647b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 20:44:59 +0700
Subject: [PATCH 580/634] gstreamer1: remove gir patch
---
.../gstreamer1/patches/no-gir-automagic.patch | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/gstreamer1/patches/no-gir-automagic.patch
diff --git a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
deleted file mode 100644
index 53740b4bb04..00000000000
--- a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 225e87688f21a817224655372004eb512f862d43 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Sun, 15 Nov 2020 10:04:50 -0600
-Subject: [PATCH] no-gir-automatic
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git meson.build meson.build
-index 5a21823..5d1db37 100644
---- meson.build
-+++ meson.build
-@@ -503,7 +503,7 @@ rt_lib = cc.find_library('rt', required : false)
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
-
--build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
-+build_gir = gir.found() or get_option('introspection').enabled()
-
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
- 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
---
-2.29.2
-
From a834c5649a877708a10294caf306bb6f50a4537a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 21:02:33 +0700
Subject: [PATCH 581/634] gst-plugins-bad1: remove gir patch
---
.../patches/no-gir-automagic.patch | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
diff --git a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
deleted file mode 100644
index 38cc2f5edc1..00000000000
--- a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4cba6b214ff9a631cdfb845c07101f97510abff Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Sun, 15 Nov 2020 10:33:52 -0600
-Subject: [PATCH] no-gir-automatic
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git meson.build meson.build
-index 5d52ea9..4b2b5ea 100644
---- meson.build
-+++ meson.build
-@@ -445,7 +445,7 @@ python3 = import('python').find_installation()
-
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
--build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
-+build_gir = gir.found() or get_option('introspection').enabled()
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
- 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
- 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
---
-2.29.2
-
From de0e9e16a0b560547e3a65f1f666c281b0ba31a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 21:11:05 +0700
Subject: [PATCH 582/634] gst-plugins-base1: remove gir patch
---
.../patches/no-gir-automagic.patch | 25 -------------------
1 file changed, 25 deletions(-)
delete mode 100644 srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
diff --git a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
deleted file mode 100644
index 36483a10e06..00000000000
--- a/srcpkgs/gst-plugins-base1/patches/no-gir-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0d734eb2314fc60deee59de5f1440617e04e5125 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens@artixlinux.org>
-Date: Sun, 15 Nov 2020 10:25:30 -0600
-Subject: [PATCH] no-gir-automatic
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git meson.build meson.build
-index 5ecce7f..98f8113 100644
---- meson.build
-+++ meson.build
-@@ -416,7 +416,7 @@ endif
-
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
- gnome = import('gnome')
--build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
-+build_gir = gir.found() or get_option('introspection').enabled()
- gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
- 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
- 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
---
-2.29.2
-
From 31339d2979e0e1b1e41d3e648895629f7648182d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 22:46:52 +0700
Subject: [PATCH 583/634] i3: update to 4.19.1.
---
srcpkgs/i3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index f3d9d6c9d00..c8751cbbe01 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,6 +1,6 @@
# Template file for 'i3'
pkgname=i3
-version=4.19
+version=4.19.1
revision=1
build_style=meson
hostmakedepends="pkg-config perl"
@@ -15,7 +15,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
license="BSD-3-Clause"
homepage="https://i3wm.org/"
distfiles="${homepage}/downloads/${pkgname}-${version}.tar.xz"
-checksum=aca48b03c0c70607826a1a91333065ff44d61774c152ddc9210fbc1627355872
+checksum=2284c812fc689e0338d8fe9be0b8d1552e548fc168d165f795b26bf497c22b47
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" libglob-devel";;
From 8e645577036009c5e3ef9ba68d5b2740ab41b10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 3 Feb 2021 20:57:03 +0700
Subject: [PATCH 584/634] blanket: remove depends on python-gobject
I was surprised that blanket works. It's working only because
gst1-python3 pulls python3-gobject in.
---
srcpkgs/blanket/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 894455730b2..91fed55cbc1 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,10 +1,10 @@
# Template file for 'blanket'
pkgname=blanket
version=0.3.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext glib-devel"
-depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 python-gobject libhandy1"
+depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1"
short_desc="Improve focus and productivity by listening to different sounds"
maintainer="Reback00 <reback00@protonmail.com>"
license="GPL-3.0-or-later"
From fef88821ef7e469e1c5b5f36b125555578df2bbf Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Tue, 2 Feb 2021 22:14:46 -0800
Subject: [PATCH 585/634] x265: fixes distfile (#28424)
---
srcpkgs/x265/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index bba3e5dd14b..2b858bad487 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -2,7 +2,8 @@
pkgname=x265
version=3.4
revision=1
-wrksrc="x265_${version}"
+_commit="a4f320054d67"
+wrksrc="multicoreware-x265_git-${_commit}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
@@ -10,8 +11,8 @@ short_desc="Open Source H.265/HEVC video encoder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
-distfiles="https://bitbucket.org/multicoreware/x265/downloads/x265_${version}.tar.gz"
-checksum=c2047f23a6b729e5c70280d23223cb61b57bfe4ad4e8f1471eeee2a61d148672
+distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
build_options="altivec assembly"
From edaea9d3e9c045da8e8ed4c58d7ec79f9336196e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 17:08:23 +0100
Subject: [PATCH 586/634] hatari: update to 2.3.1, switch to python3
---
srcpkgs/hatari/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 82049108ece..e05e77961d6 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -1,9 +1,9 @@
# Template file for 'hatari'
pkgname=hatari
-version=2.2.1
+version=2.3.1
revision=1
build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config python3"
makedepends="SDL2-devel libpng-devel portaudio-devel zlib-devel"
depends="hicolor-icon-theme"
short_desc="Atari ST/STE/TT/Falcon emulator"
@@ -11,5 +11,5 @@ maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=11afef30a274be84696588583d5a1d65c8046934670f718c311c956ef7106f60
-python_version=2 #unverified
+checksum=44a2f62ca995e38d9e0874806956f0b9c3cc84ea89e0169a63849b63cd3b64bd
+python_version=3
From f4411265381e2f682a2995261c41e118f6501162 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 3 Feb 2021 11:24:24 -0300
Subject: [PATCH 587/634] rust-analyzer: update to 2021.02.01.
---
srcpkgs/rust-analyzer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index bde944787c7..716c1040d22 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
# Template file for 'rust-analyzer'
pkgname=rust-analyzer
-version=2021.01.18
+version=2021.02.01
revision=1
_ver=${version//./-}
wrksrc="${pkgname}-${_ver}"
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
license="Apache-2.0, MIT"
homepage="https://rust-analyzer.github.io/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
-checksum=009ab946848719bb05bcaddab1cf5a75a45c5a92ae6dc31763adb42c3229f7db
+checksum=8e977cff0d64bed30c5f1f7945889e3fa76e6e55bfed882d1b4a5d2ffd9efc2c
export RUST_ANALYZER_REV=${_ver}
From dad55dc8fe986663898ee1cf3b9be6475a060f73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 16:22:30 +0100
Subject: [PATCH 588/634] xar: add patch to fix compilation with OpenSSL > 1.1
---
srcpkgs/xar/patches/openssl1.1.patch | 54 ++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 srcpkgs/xar/patches/openssl1.1.patch
diff --git a/srcpkgs/xar/patches/openssl1.1.patch b/srcpkgs/xar/patches/openssl1.1.patch
new file mode 100644
index 00000000000..d718a3d4129
--- /dev/null
+++ b/srcpkgs/xar/patches/openssl1.1.patch
@@ -0,0 +1,54 @@
+Reason: The OpenSSL_add_all_ciphers api doesn't was removed in OpenSSL 1.1
+so we just replace the check with something that exists in OpenSSL and LibreSSL
+
+---
+--- configure 2012-09-17 13:30:07.000000000 +0200
++++ - 2021-02-03 16:20:59.395787656 +0100
+@@ -4878,9 +4878,9 @@
+
+ done
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL_add_all_ciphers in -lcrypto" >&5
+-$as_echo_n "checking for OpenSSL_add_all_ciphers in -lcrypto... " >&6; }
+-if ${ac_cv_lib_crypto_OpenSSL_add_all_ciphers+:} false; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_crypto in -lcrypto" >&5
++$as_echo_n "checking for OPENSSL_init_crypto in -lcrypto... " >&6; }
++if ${ac_cv_lib_crypto_OPENSSL_init_crypto+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -4894,27 +4894,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char OpenSSL_add_all_ciphers ();
++char OPENSSL_init_crypto ();
+ int
+ main ()
+ {
+-return OpenSSL_add_all_ciphers ();
++return OPENSSL_init_crypto ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes
++ ac_cv_lib_crypto_OPENSSL_init_crypto=yes
+ else
+- ac_cv_lib_crypto_OpenSSL_add_all_ciphers=no
++ ac_cv_lib_crypto_OPENSSL_init_crypto=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_OpenSSL_add_all_ciphers" >&5
+-$as_echo "$ac_cv_lib_crypto_OpenSSL_add_all_ciphers" >&6; }
+-if test "x$ac_cv_lib_crypto_OpenSSL_add_all_ciphers" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_OPENSSL_init_crypto" >&5
++$as_echo "$ac_cv_lib_crypto_OPENSSL_init_crypto" >&6; }
++if test "x$ac_cv_lib_crypto_OPENSSL_init_crypto" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
From 74bb5808ad23ea0ae03ba64fa9b1c519be6b26c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 3 Feb 2021 10:23:31 -0500
Subject: [PATCH 589/634] cpp-utilities: update to 5.10.1.
---
srcpkgs/cpp-utilities/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index a833b0ddd56..f79ec8e8a7e 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
# Template file for 'cpp-utilities'
pkgname=cpp-utilities
-version=5.10.0
+version=5.10.1
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/cpp-utilities"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a0eed2901eff3785bec7e8395f427c8fe206af75960ca628f5fe277043e5c0ed
+checksum=bba073117fe2a16fb2cb277e69a8f9e9584d991543c8cfd75921afdf39ea3ec5
cpp-utilities-devel_package() {
short_desc+=" - development files"
From 69e0d749c4174cf300e81390210cc3b91600c54e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 3 Feb 2021 10:23:35 -0500
Subject: [PATCH 590/634] python3-tifffile: update to 2021.2.1.
---
srcpkgs/python3-tifffile/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index ba57570b081..b7a4b5258ab 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
# Template file for 'python3-tifffile'
pkgname=python3-tifffile
-version=2021.1.14
+version=2021.2.1
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://github.com/cgohlke/tifffile"
changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5af5c4e49ad2d6f0b04c43937b64a7e8101a9af306b6087181d8785c854792cb
+checksum=9ca215bbe6640b64d1c1f9d2762310f1e3e496630b00c51b7e0e9f9b4a993537
post_install() {
vlicense LICENSE
From 67388fb4db0822cc8038e6ddd3309b1360772ff1 Mon Sep 17 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, 24 Jan 2021 16:32:38 +0700
Subject: [PATCH 591/634] dracut: update to 051.
---
...-ask-no-warn-if-run-cryptsetup-exist.patch | 39 -------------
.../patches/99squash-no-systemd-error.patch | 13 +++++
.../dracut/patches/better-arch-regex.patch | 32 -----------
.../patches/fix-early-microcode-non-x86.patch | 57 -------------------
srcpkgs/dracut/patches/fix-ia32-uefi.patch | 25 --------
.../patches/ppcmac-respect-dracut-arch.patch | 37 ------------
srcpkgs/dracut/template | 11 ++--
7 files changed, 18 insertions(+), 196 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
create mode 100644 srcpkgs/dracut/patches/99squash-no-systemd-error.patch
delete mode 100644 srcpkgs/dracut/patches/better-arch-regex.patch
delete mode 100644 srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
delete mode 100644 srcpkgs/dracut/patches/fix-ia32-uefi.patch
delete mode 100644 srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
diff --git a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch b/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
deleted file mode 100644
index 396fb7c05d4..00000000000
--- a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2edc52848eaf2331cdcce64f92d8e76947c01a66 Mon Sep 17 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, 14 Mar 2020 11:44:47 +0700
-Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In either case:
-- encrypted device is decrypted, udev will trigger device changes again,
-- multiple encrypted device,
-
-cryptroot-ask will run multiple time, then report:
-> mkdir: cannot create directory '/run/cryptsetup': File exists
-
-Pass `-p` into mkdir to ignore that warning.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- modules.d/90crypt/cryptroot-ask.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git modules.d/90crypt/cryptroot-ask.sh modules.d/90crypt/cryptroot-ask.sh
-index e1f17975..97047ae9 100755
---- modules.d/90crypt/cryptroot-ask.sh
-+++ modules.d/90crypt/cryptroot-ask.sh
-@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
-
- . /lib/dracut-lib.sh
-
--mkdir -m 0700 /run/cryptsetup
-+mkdir -p -m 0700 /run/cryptsetup
-
- # if device name is /dev/dm-X, convert to /dev/mapper/name
- if [ "${1##/dev/dm-}" != "$1" ]; then
---
-2.26.0.rc1.191.g7acaab7404
-
diff --git a/srcpkgs/dracut/patches/99squash-no-systemd-error.patch b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
new file mode 100644
index 00000000000..d93f6d895b1
--- /dev/null
+++ b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
@@ -0,0 +1,13 @@
+diff --git modules.d/99squash/module-setup.sh modules.d/99squash/module-setup.sh
+index 9a61a59d..96543a58 100644
+--- modules.d/99squash/module-setup.sh
++++ modules.d/99squash/module-setup.sh
+@@ -2,8 +2,7 @@
+
+ check() {
+ if ! dracut_module_included "systemd-initrd"; then
+- derror "dracut-squash only supports systemd bases initramfs"
+ return 1
+ fi
+
+ if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then
diff --git a/srcpkgs/dracut/patches/better-arch-regex.patch b/srcpkgs/dracut/patches/better-arch-regex.patch
deleted file mode 100644
index 75d51034dff..00000000000
--- a/srcpkgs/dracut/patches/better-arch-regex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e6859c98a90a1b44abc6f29ba64628afc1be7cb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:29:23 +0200
-Subject: [PATCH 3/4] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz
- for i686
-
-Previously this would not catch ppc64le, now it does; same with
-i686.
----
- mkinitrd-dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git mkinitrd-dracut.sh mkinitrd-dracut.sh
-index 82d90684..1ea3e514 100755
---- mkinitrd-dracut.sh
-+++ mkinitrd-dracut.sh
-@@ -57,10 +57,10 @@ default_kernel_images() {
- s390|s390x)
- regex='image'
- ;;
-- ppc|ppc64)
-+ ppc*)
- regex='vmlinux'
- ;;
-- i386|x86_64)
-+ i*86|x86_64)
- regex='vmlinuz'
- ;;
- arm*)
---
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch b/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
deleted file mode 100644
index 406e695f9a2..00000000000
--- a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d690d736a71e18711b94098da24f56b392c7e6f7 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:28:16 +0200
-Subject: [PATCH 2/4] dracut.sh: fix early microcode detection logic
-
-This fixes two issues:
-
-1) on non-x86 systems in non-hostonly config this would cause
- an annoying warning on every initramfs generation
-2) on non-x86 systems in hostonly config this would result in
- early microcode not getting disabled
----
- dracut.sh | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git dracut.sh dracut.sh
-index 58ff24d1..cd3fcbe2 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1194,19 +1194,26 @@ fi
-
- if [[ $early_microcode = yes ]]; then
- if [[ $hostonly ]]; then
-- [[ $(get_cpu_vendor) == "AMD" ]] \
-- && ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && unset early_microcode
-- [[ $(get_cpu_vendor) == "Intel" ]] \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-- && unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" ]]; then
-+ check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-+ elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ else
-+ unset early_microcode
-+ fi
- else
- ! check_kernel_config CONFIG_MICROCODE_AMD \
- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
- && unset early_microcode
- fi
-- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ # Do not complain on non-x86 architectures as it makes no sense
-+ case $(uname -m) in
-+ x86_64|i*86)
-+ [[ $early_microcode != yes ]] \
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ ;;
-+ *) ;;
-+ esac
- fi
-
- # Need to be able to have non-root users read stuff (rpcbind etc)
---
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-ia32-uefi.patch b/srcpkgs/dracut/patches/fix-ia32-uefi.patch
deleted file mode 100644
index b4a79092d69..00000000000
--- a/srcpkgs/dracut/patches/fix-ia32-uefi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1bce654f1bd739cf1f975ff0a1f766221c3d4ee Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:20:40 +0200
-Subject: [PATCH 1/4] dracut.sh: fix ia32 detection for uefi executables
-
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git dracut.sh dracut.sh
-index e3195499..58ff24d1 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
- case $(uname -m) in
- x86_64)
- EFI_MACHINE_TYPE_NAME=x64;;
-- ia32)
-+ i*86)
- EFI_MACHINE_TYPE_NAME=ia32;;
- *)
- dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
---
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch b/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
deleted file mode 100644
index b569572a6bc..00000000000
--- a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c26b5c7559c297aaa6c78787fa8de18bbf090205 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:47:00 +0200
-Subject: [PATCH 4/4] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
-
----
- modules.d/90ppcmac/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git modules.d/90ppcmac/module-setup.sh modules.d/90ppcmac/module-setup.sh
-index 59221ec4..7199dd9b 100644
---- modules.d/90ppcmac/module-setup.sh
-+++ modules.d/90ppcmac/module-setup.sh
-@@ -17,9 +17,9 @@
-
- # called by dracut
- check() {
-- local _arch="$(uname -m)"
-+ local _arch=${DRACUT_ARCH:-$(uname -m)}
- # only for PowerPC Macs
-- [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
-+ [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
- return 0
- }
-
-@@ -36,7 +36,7 @@ installkernel() {
- }
-
- # only PowerMac3,6 has a module, special case
-- if [[ "$(uname -m)" == ppc ]]; then
-+ if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
- if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
- instmods therm_windtunnel
- fi
---
-2.27.0
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 53cee6c4ff2..d58e168497d 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,19 @@
# Template file for 'dracut'
pkgname=dracut
-version=050
-revision=10
+version=051
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
-# XXX: docbook-xml was added to sort builders out, can be removed
-hostmakedepends="asciidoc docbook-xml pkg-config"
+hostmakedepends="pkg-config"
makedepends="libkmod-devel"
depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="q66 <daniel@octaforge.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
-distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
-checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
+distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
+checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
subpackages="dracut-network"
make_dirs="
From f0ad55e77cf0b415d3911b56ede6aebc866b20a9 Mon Sep 17 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, 24 Jan 2021 16:41:25 +0700
Subject: [PATCH 592/634] nvme-cli: fix dracut 051 warning
---
srcpkgs/nvme-cli/patches/dracut-warning.patch | 5 +++++
srcpkgs/nvme-cli/template | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch
diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
new file mode 100644
index 00000000000..966ce6c0ec9
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/dracut-warning.patch
@@ -0,0 +1,5 @@
+--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in.orig 2021-01-24 16:37:06.346511231 +0700
++++ nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in 2021-01-24 16:38:01.351158511 +0700
+@@ -1 +1 @@
+-install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
++install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8a731eae208..0da50f2663e 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,7 +1,7 @@
# Template file for 'nvme-cli'
pkgname=nvme-cli
version=1.13
-revision=1
+revision=2
build_style=gnu-makefile
# yeah, it must be 0 to enable
make_build_args="LIBUUID=0"
From b771e879d5ea698601e287a5b9d6ccddcf8056e7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Feb 2021 16:45:00 +0100
Subject: [PATCH 593/634] bottom: update to 0.5.7.
---
srcpkgs/bottom/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index b7065802fa7..9d5fbd8dbfd 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
# Template file for 'bottom'
pkgname=bottom
-version=0.5.6
+version=0.5.7
revision=1
build_style=cargo
short_desc="Yet another cross-platform graphical process/system monitor"
@@ -8,7 +8,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
license="MIT"
homepage="https://github.com/ClementTsang/bottom"
distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=e6b41796cd54dcf67c8b265a81db8275d8557c6b41a48b9ded0a99ce9f9c0d2c
+checksum=49e01a2930d913dba2a1329389faddb4b3971a6b0c08f7482d2759475d5cc27c
post_install() {
vdoc README.md
From 45487fef78eedb55081f043e56f59f90c27c1967 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 17:14:25 +0100
Subject: [PATCH 594/634] wvstreams: update patchset to also support OpenSSL
1.1
---
srcpkgs/wvstreams/patches/libressl.patch | 52 --
srcpkgs/wvstreams/patches/tripledes.patch | 19 -
.../wvstreams-4.6.1-openssl-1.1.0.patch | 533 ++++++++++++++++++
3 files changed, 533 insertions(+), 71 deletions(-)
delete mode 100644 srcpkgs/wvstreams/patches/libressl.patch
delete mode 100644 srcpkgs/wvstreams/patches/tripledes.patch
create mode 100644 srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.1.0.patch
diff --git a/srcpkgs/wvstreams/patches/libressl.patch b/srcpkgs/wvstreams/patches/libressl.patch
deleted file mode 100644
index e6e51b2e7a6..00000000000
--- a/srcpkgs/wvstreams/patches/libressl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- crypto/wvx509.cc.orig 2019-05-16 20:25:58.171570222 +0200
-+++ crypto/wvx509.cc 2019-05-16 20:26:15.784410788 +0200
-@@ -974,7 +974,7 @@
- sk_ACCESS_DESCRIPTION_push(ainfo, acc);
- acc->method = OBJ_txt2obj(type.cstr(), 0);
- acc->location->type = GEN_URI;
-- acc->location->d.ia5 = M_ASN1_IA5STRING_new();
-+ acc->location->d.ia5 = ASN1_IA5STRING_new();
- unsigned char *cident
- = reinterpret_cast<unsigned char *>(identifier.edit());
- ASN1_STRING_set(acc->location->d.ia5, cident, identifier.len());
-@@ -1059,7 +1059,7 @@
- GENERAL_NAMES *uris = GENERAL_NAMES_new();
- GENERAL_NAME *uri = GENERAL_NAME_new();
- uri->type = GEN_URI;
-- uri->d.ia5 = M_ASN1_IA5STRING_new();
-+ uri->d.ia5 = ASN1_IA5STRING_new();
- unsigned char *cident
- = reinterpret_cast<unsigned char *>(i().edit());
- ASN1_STRING_set(uri->d.ia5, cident, i().len());
-@@ -1130,7 +1130,7 @@
- pol->qualifiers = sk_POLICYQUALINFO_new_null();
- qual = POLICYQUALINFO_new();
- qual->pqualid = OBJ_nid2obj(NID_id_qt_cps);
-- qual->d.cpsouri = M_ASN1_IA5STRING_new();
-+ qual->d.cpsouri = ASN1_IA5STRING_new();
- ASN1_STRING_set(qual->d.cpsuri, url.edit(), url.len());
- sk_POLICYQUALINFO_push(pol->qualifiers, qual);
- }
-@@ -1450,19 +1450,19 @@
- {
- CHECK_CERT_EXISTS_SET("ski");
-
-- ASN1_OCTET_STRING *oct = M_ASN1_OCTET_STRING_new();
-+ ASN1_OCTET_STRING *oct = ASN1_OCTET_STRING_new();
- ASN1_BIT_STRING *pk = cert->cert_info->key->public_key;
- unsigned char pkey_dig[EVP_MAX_MD_SIZE];
- unsigned int diglen;
-
- EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL);
-
-- M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
-+ ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
- X509_EXTENSION *ext = X509V3_EXT_i2d(NID_subject_key_identifier, 0,
- oct);
- X509_add_ext(cert, ext, -1);
- X509_EXTENSION_free(ext);
-- M_ASN1_OCTET_STRING_free(oct);
-+ ASN1_OCTET_STRING_free(oct);
- }
-
-
diff --git a/srcpkgs/wvstreams/patches/tripledes.patch b/srcpkgs/wvstreams/patches/tripledes.patch
deleted file mode 100644
index a1e6df691b6..00000000000
--- a/srcpkgs/wvstreams/patches/tripledes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/wvtripledes.h.old 2014-12-11 01:53:28.157613918 +0100
-+++ include/wvtripledes.h 2014-12-11 01:53:46.005612583 +0100
-@@ -70,11 +70,11 @@ protected:
-
- private:
- Mode mode;
-- des_cblock key;
-- des_key_schedule deskey1;
-- des_key_schedule deskey2;
-- des_key_schedule deskey3;
-- des_cblock ivec; // initialization vector
-+ DES_cblock key;
-+ DES_key_schedule deskey1;
-+ DES_key_schedule deskey2;
-+ DES_key_schedule deskey3;
-+ DES_cblock ivec; // initialization vector
- int ivecoff; // current offset into initvec
- };
-
diff --git a/srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.1.0.patch b/srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.1.0.patch
new file mode 100644
index 00000000000..d080f69f9af
--- /dev/null
+++ b/srcpkgs/wvstreams/patches/wvstreams-4.6.1-openssl-1.1.0.patch
@@ -0,0 +1,533 @@
+diff --git crypto/wvcrl.cc crypto/wvcrl.cc
+index fa00c76..880ad85 100644
+--- crypto/wvcrl.cc
++++ crypto/wvcrl.cc
+@@ -357,31 +357,19 @@ bool WvCRL::isrevoked(WvStringParm serial_number) const
+ ASN1_INTEGER *serial = serial_to_int(serial_number);
+ if (serial)
+ {
+- X509_REVOKED mayberevoked;
+- mayberevoked.serialNumber = serial;
+- if (crl->crl->revoked)
+- {
+- int idx = sk_X509_REVOKED_find(crl->crl->revoked,
+- &mayberevoked);
+- ASN1_INTEGER_free(serial);
+- if (idx >= 0)
+- {
+- debug("Certificate is revoked.\n");
+- return true;
+- }
+- else
+- {
+- debug("Certificate is not revoked.\n");
+- return false;
+- }
+- }
+- else
+- {
+- ASN1_INTEGER_free(serial);
+- debug("CRL does not have revoked list.\n");
+- return false;
+- }
+-
++ X509_REVOKED *revoked_entry = NULL;
++ int idx = X509_CRL_get0_by_serial(crl, &revoked_entry, serial);
++ ASN1_INTEGER_free(serial);
++ if (idx >= 1 || revoked_entry)
++ {
++ debug("Certificate is revoked.\n");
++ return true;
++ }
++ else
++ {
++ debug("Certificate is not revoked.\n");
++ return false;
++ }
+ }
+ else
+ debug(WvLog::Warning, "Can't convert serial number to ASN1 format. "
+diff --git crypto/wvdiffiehellman.cc crypto/wvdiffiehellman.cc
+index 7c0bf32..15cd104 100644
+--- crypto/wvdiffiehellman.cc
++++ crypto/wvdiffiehellman.cc
+@@ -39,24 +39,25 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
+ {
+ int problems;
+ int check;
+- {
++
+ info = DH_new();
+- info->p = BN_bin2bn(_key, _keylen, NULL);
++ BIGNUM *p = BN_bin2bn(_key, _keylen, NULL);
+ // info->p->top = 0;
+ // info->p->dmax = _keylen * 8 / BN_BITS2;
+ // info->p->neg = 0;
+ // info->p->flags = 0;
+
+- info->g = BN_new();
+- BN_set_word(info->g, generator);
++ BIGNUM *g = BN_new();
++ BN_set_word(g, generator);
+ // info->g->d = &generator;
+ // info->g->top = 0;
+ // info->g->dmax = 1;
+ // info->g->neg = 0;
+ // info->g->flags = 0;
+- }
+
+- check = BN_mod_word(info->p, 24);
++ DH_set0_pqg(info, p, NULL, g);
++
++ check = BN_mod_word(p, 24);
+ DH_check(info, &problems);
+ if (problems & DH_CHECK_P_NOT_PRIME)
+ log(WvLog::Error, "Using a composite number for authentication.\n");
+@@ -64,7 +65,7 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
+ log(WvLog::Error,"Using an unsafe prime number for authentication.\n");
+ if (problems & DH_NOT_SUITABLE_GENERATOR)
+ log(WvLog::Error, "Can you just use 2 instead of %s (%s)!!\n",
+- BN_bn2hex(info->g), check);
++ BN_bn2hex(g), check);
+ if (problems & DH_UNABLE_TO_CHECK_GENERATOR)
+ log(WvLog::Notice, "Using a strange argument for diffie-hellman.\n");
+ DH_generate_key(info);
+@@ -72,18 +73,23 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
+
+ int WvDiffieHellman::pub_key_len()
+ {
+- return BN_num_bytes(info->pub_key);
++ const BIGNUM *pub_key = NULL;
++ DH_get0_key(info, &pub_key, NULL);
++ return BN_num_bytes(pub_key);
+ }
+
+ int WvDiffieHellman::get_public_value(WvBuf &outbuf, int len)
+ {
+- int key_len = BN_num_bytes(info->pub_key);
++ const BIGNUM *pub_key = NULL;
++ DH_get0_key(info, &pub_key, NULL);
++
++ int key_len = BN_num_bytes(pub_key);
+ if (key_len < len)
+ len = key_len;
+
+ // alloca is stack allocated, don't free it.
+ unsigned char *foo = (unsigned char*)alloca(key_len);
+- BN_bn2bin(info->pub_key, foo);
++ BN_bn2bin(pub_key, foo);
+ outbuf.put(foo, len);
+
+ return len;
+@@ -91,8 +97,10 @@ int WvDiffieHellman::get_public_value(WvBuf &outbuf, int len)
+
+ bool WvDiffieHellman::create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf)
+ {
++ const BIGNUM *pub_key = NULL;
++ DH_get0_key(info, &pub_key, NULL);
+ unsigned char *foo = (unsigned char *)alloca(DH_size(info));
+- log("My public value\n%s\nYour public value\n%s\n",BN_bn2hex(info->pub_key),
++ log("My public value\n%s\nYour public value\n%s\n",BN_bn2hex(pub_key),
+ hexdump_buffer(inbuf.peek(0, in_len), in_len, false));
+ int len = DH_compute_key (foo, BN_bin2bn(inbuf.get(in_len), in_len, NULL),
+ info);
+diff --git crypto/wvdigest.cc crypto/wvdigest.cc
+index 150edee..73ebb5d 100644
+--- crypto/wvdigest.cc
++++ crypto/wvdigest.cc
+@@ -13,10 +13,10 @@
+
+ /***** WvEVPMDDigest *****/
+
+-WvEVPMDDigest::WvEVPMDDigest(const env_md_st *_evpmd) :
++WvEVPMDDigest::WvEVPMDDigest(const EVP_MD*_evpmd) :
+ evpmd(_evpmd), active(false)
+ {
+- evpctx = new EVP_MD_CTX;
++ evpctx = EVP_MD_CTX_new();
+ _reset();
+ }
+
+@@ -24,7 +24,7 @@ WvEVPMDDigest::WvEVPMDDigest(const env_md_st *_evpmd) :
+ WvEVPMDDigest::~WvEVPMDDigest()
+ {
+ cleanup();
+- delete evpctx;
++ EVP_MD_CTX_free(evpctx);
+ }
+
+
+@@ -60,7 +60,7 @@ bool WvEVPMDDigest::_reset()
+ // the typecast is necessary for API compatibility with different
+ // versions of openssl. None of them *actually* change the contents of
+ // the pointer.
+- EVP_DigestInit(evpctx, (env_md_st *)evpmd);
++ EVP_DigestInit(evpctx, evpmd);
+ active = true;
+ return true;
+ }
+@@ -79,7 +79,7 @@ void WvEVPMDDigest::cleanup()
+
+ size_t WvEVPMDDigest::digestsize() const
+ {
+- return EVP_MD_size((env_md_st *)evpmd);
++ return EVP_MD_size(evpmd);
+ }
+
+
+@@ -104,14 +104,14 @@ WvHMACDigest::WvHMACDigest(WvEVPMDDigest *_digest,
+ {
+ key = new unsigned char[keysize];
+ memcpy(key, _key, keysize);
+- hmacctx = new HMAC_CTX;
++ hmacctx = HMAC_CTX_new();
+ _reset();
+ }
+
+ WvHMACDigest::~WvHMACDigest()
+ {
+ cleanup();
+- delete hmacctx;
++ HMAC_CTX_free(hmacctx);
+ deletev key;
+ delete digest;
+ }
+@@ -145,7 +145,7 @@ bool WvHMACDigest::_finish(WvBuf &outbuf)
+ bool WvHMACDigest::_reset()
+ {
+ cleanup();
+- HMAC_Init(hmacctx, key, keysize, (env_md_st *)digest->getevpmd());
++ HMAC_Init(hmacctx, key, keysize, digest->getevpmd());
+ active = true;
+ return true;
+ }
+diff --git crypto/wvocsp.cc crypto/wvocsp.cc
+index ddb2de4..8325ff2 100644
+--- crypto/wvocsp.cc
++++ crypto/wvocsp.cc
+@@ -118,9 +118,10 @@ bool WvOCSPResp::check_nonce(const WvOCSPReq &req) const
+
+ bool WvOCSPResp::signedbycert(const WvX509 &cert) const
+ {
+- EVP_PKEY *skey = X509_get_pubkey(cert.cert);
+- int i = OCSP_BASICRESP_verify(bs, skey, 0);
+- EVP_PKEY_free(skey);
++ STACK_OF(X509) *sk = sk_X509_new_null();
++ sk_X509_push(sk, cert.cert);
++ int i = OCSP_basic_verify(bs, sk, NULL, OCSP_NOVERIFY);
++ sk_X509_free(sk);
+
+ if(i > 0)
+ return true;
+@@ -131,6 +132,7 @@ bool WvOCSPResp::signedbycert(const WvX509 &cert) const
+
+ WvX509 WvOCSPResp::get_signing_cert() const
+ {
++#ifdef LIBRESSL_VERSION_NUMBER
+ if (!bs || !sk_X509_num(bs->certs))
+ return WvX509();
+
+@@ -159,6 +161,18 @@ WvX509 WvOCSPResp::get_signing_cert() const
+ }
+
+ return WvX509();
++#else
++ const STACK_OF(X509) *certs = OCSP_resp_get0_certs(bs);
++ if (!bs || !sk_X509_num(certs))
++ return WvX509();
++
++ X509 *signer = NULL;
++ if (OCSP_resp_get0_signer(bs, &signer, NULL) == 1) {
++ return WvX509(X509_dup(signer));
++ }
++
++ return WvX509();
++#endif
+ }
+
+
+diff --git crypto/wvx509.cc crypto/wvx509.cc
+index e9dad0b..a9a47bc 100644
+--- crypto/wvx509.cc
++++ crypto/wvx509.cc
+@@ -974,7 +974,7 @@ static void add_aia(WvStringParm type, WvString identifier,
+ sk_ACCESS_DESCRIPTION_push(ainfo, acc);
+ acc->method = OBJ_txt2obj(type.cstr(), 0);
+ acc->location->type = GEN_URI;
+- acc->location->d.ia5 = M_ASN1_IA5STRING_new();
++ acc->location->d.ia5 = ASN1_IA5STRING_new();
+ unsigned char *cident
+ = reinterpret_cast<unsigned char *>(identifier.edit());
+ ASN1_STRING_set(acc->location->d.ia5, cident, identifier.len());
+@@ -1059,7 +1059,7 @@ void WvX509::set_crl_urls(WvStringList &urls)
+ GENERAL_NAMES *uris = GENERAL_NAMES_new();
+ GENERAL_NAME *uri = GENERAL_NAME_new();
+ uri->type = GEN_URI;
+- uri->d.ia5 = M_ASN1_IA5STRING_new();
++ uri->d.ia5 = ASN1_IA5STRING_new();
+ unsigned char *cident
+ = reinterpret_cast<unsigned char *>(i().edit());
+ ASN1_STRING_set(uri->d.ia5, cident, i().len());
+@@ -1162,10 +1162,11 @@ WvString WvX509::get_extension(int nid) const
+ #else
+ X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
+ #endif
++ ASN1_OCTET_STRING *ext_data_str = X509_EXTENSION_get_data(ext);
+ if (!method)
+ {
+ WvDynBuf buf;
+- buf.put(ext->value->data, ext->value->length);
++ buf.put(ext_data_str->data, ext_data_str->length);
+ retval = buf.getstr();
+ }
+ else
+@@ -1176,21 +1177,21 @@ WvString WvX509::get_extension(int nid) const
+ // even though it's const (at least as of version 0.9.8e).
+ // gah.
+ #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+- const unsigned char * ext_value_data = ext->value->data;
++ const unsigned char * ext_value_data = ext_data_str->data;
+ #else
+ unsigned char *ext_value_data = ext->value->data;
+ #endif
+ if (method->it)
+ {
+ ext_data = ASN1_item_d2i(NULL, &ext_value_data,
+- ext->value->length,
++ ext_data_str->length,
+ ASN1_ITEM_ptr(method->it));
+ TRACE("Applied generic conversion!\n");
+ }
+ else
+ {
+ ext_data = method->d2i(NULL, &ext_value_data,
+- ext->value->length);
++ ext_data_str->length);
+ TRACE("Applied method specific conversion!\n");
+ }
+
+@@ -1325,13 +1326,13 @@ bool WvX509::verify(WvBuf &original, WvStringParm signature) const
+ return false;
+
+ /* Verify the signature */
+- EVP_MD_CTX sig_ctx;
+- EVP_VerifyInit(&sig_ctx, EVP_sha1());
+- EVP_VerifyUpdate(&sig_ctx, original.peek(0, original.used()),
++ EVP_MD_CTX *sig_ctx = EVP_MD_CTX_new();
++ EVP_VerifyInit(sig_ctx, EVP_sha1());
++ EVP_VerifyUpdate(sig_ctx, original.peek(0, original.used()),
+ original.used());
+- int sig_err = EVP_VerifyFinal(&sig_ctx, sig_buf, sig_size, pk);
++ int sig_err = EVP_VerifyFinal(sig_ctx, sig_buf, sig_size, pk);
+ EVP_PKEY_free(pk);
+- EVP_MD_CTX_cleanup(&sig_ctx); // Again, not my fault...
++ EVP_MD_CTX_free(sig_ctx); // Again, not my fault...
+ if (sig_err != 1)
+ {
+ debug("Verify failed!\n");
+@@ -1450,19 +1451,19 @@ void WvX509::set_ski()
+ {
+ CHECK_CERT_EXISTS_SET("ski");
+
+- ASN1_OCTET_STRING *oct = M_ASN1_OCTET_STRING_new();
+- ASN1_BIT_STRING *pk = cert->cert_info->key->public_key;
++ ASN1_OCTET_STRING *oct = ASN1_OCTET_STRING_new();
++ ASN1_BIT_STRING *pk = X509_get0_pubkey_bitstr(cert);
+ unsigned char pkey_dig[EVP_MAX_MD_SIZE];
+ unsigned int diglen;
+
+ EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL);
+
+- M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
++ ASN1_OCTET_STRING_set(oct, pkey_dig, diglen);
+ X509_EXTENSION *ext = X509V3_EXT_i2d(NID_subject_key_identifier, 0,
+ oct);
+ X509_add_ext(cert, ext, -1);
+ X509_EXTENSION_free(ext);
+- M_ASN1_OCTET_STRING_free(oct);
++ ASN1_OCTET_STRING_free(oct);
+ }
+
+
+diff --git crypto/wvx509mgr.cc crypto/wvx509mgr.cc
+index f249eec..b504a9f 100644
+--- crypto/wvx509mgr.cc
++++ crypto/wvx509mgr.cc
+@@ -350,6 +350,13 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
+ return false;
+ }
+
++#ifdef LIBRESSL_VERSION_NUMBER
++ uint32_t ex_flags = cert->ex_flags;
++ uint32_t ex_kusage = cert->ex_kusage;
++#else
++ uint32_t ex_flags = X509_get_extension_flags(cert);
++ uint32_t ex_kusage = X509_get_key_usage(cert);
++#endif
+ if (cert == unsignedcert.cert)
+ {
+ debug("Self Signing!\n");
+@@ -362,8 +369,8 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
+ return false;
+ }
+ #endif
+- else if (!((cert->ex_flags & EXFLAG_KUSAGE) &&
+- (cert->ex_kusage & KU_KEY_CERT_SIGN)))
++ else if (!((ex_flags & EXFLAG_KUSAGE) &&
++ (ex_kusage & KU_KEY_CERT_SIGN)))
+ {
+ debug("This Certificate is not allowed to sign certificates!\n");
+ return false;
+@@ -390,6 +397,13 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
+
+ bool WvX509Mgr::signcrl(WvCRL &crl) const
+ {
++#ifdef LIBRESSL_VERSION_NUMBER
++ uint32_t ex_flags = cert->ex_flags;
++ uint32_t ex_kusage = cert->ex_kusage;
++#else
++ uint32_t ex_flags = X509_get_extension_flags(cert);
++ uint32_t ex_kusage = X509_get_key_usage(cert);
++#endif
+ if (!isok() || !crl.isok())
+ {
+ debug(WvLog::Warning, "Asked to sign CRL, but certificate or CRL (or "
+@@ -403,12 +417,12 @@ bool WvX509Mgr::signcrl(WvCRL &crl) const
+ "CRLs!\n");
+ return false;
+ }
+- else if (!((cert->ex_flags & EXFLAG_KUSAGE) &&
+- (cert->ex_kusage & KU_CRL_SIGN)))
++ else if (!((ex_flags & EXFLAG_KUSAGE) &&
++ (ex_kusage & KU_CRL_SIGN)))
+ {
+ debug("Certificate not allowed to sign CRLs! (%s %s)\n",
+- (cert->ex_flags & EXFLAG_KUSAGE),
+- (cert->ex_kusage & KU_CRL_SIGN));
++ (ex_flags & EXFLAG_KUSAGE),
++ (ex_kusage & KU_CRL_SIGN));
+ return false;
+ }
+ #endif
+@@ -454,7 +468,6 @@ WvString WvX509Mgr::sign(WvBuf &data) const
+ {
+ assert(rsa);
+
+- EVP_MD_CTX sig_ctx;
+ unsigned char sig_buf[4096];
+
+ EVP_PKEY *pk = EVP_PKEY_new();
+@@ -467,20 +480,22 @@ WvString WvX509Mgr::sign(WvBuf &data) const
+ return WvString::null;
+ }
+
+- EVP_SignInit(&sig_ctx, EVP_sha1());
+- EVP_SignUpdate(&sig_ctx, data.peek(0, data.used()), data.used());
++ EVP_MD_CTX *sig_ctx = EVP_MD_CTX_new();
++ EVP_SignInit(sig_ctx, EVP_sha1());
++ EVP_SignUpdate(sig_ctx, data.peek(0, data.used()), data.used());
+ unsigned int sig_len = sizeof(sig_buf);
+- int sig_err = EVP_SignFinal(&sig_ctx, sig_buf,
++ int sig_err = EVP_SignFinal(sig_ctx, sig_buf,
+ &sig_len, pk);
+ if (sig_err != 1)
+ {
+ debug("Error while signing.\n");
+ EVP_PKEY_free(pk);
++ EVP_MD_CTX_free(sig_ctx);
+ return WvString::null;
+ }
+
+ EVP_PKEY_free(pk);
+- EVP_MD_CTX_cleanup(&sig_ctx); // this isn't my fault ://
++ EVP_MD_CTX_free(sig_ctx); // this isn't my fault ://
+ WvDynBuf buf;
+ buf.put(sig_buf, sig_len);
+ debug("Signature size: %s\n", buf.used());
+diff --git include/wvdiffiehellman.h include/wvdiffiehellman.h
+index af75ffa..a2d001f 100644
+--- include/wvdiffiehellman.h
++++ include/wvdiffiehellman.h
+@@ -27,7 +27,7 @@ public:
+ bool create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf);
+
+ protected:
+- struct dh_st *info;
++ DH *info;
+ BN_ULONG generator;
+
+ private:
+diff --git include/wvdigest.h include/wvdigest.h
+index fdc39bd..ce41dd8 100644
+--- include/wvdigest.h
++++ include/wvdigest.h
+@@ -9,10 +9,8 @@
+
+ #include "wvencoder.h"
+ #include <stdint.h>
+-
+-struct env_md_st;
+-struct env_md_ctx_st;
+-struct hmac_ctx_st;
++#include <openssl/evp.h>
++#include <openssl/hmac.h>
+
+ /**
+ * Superclass for all message digests.
+@@ -45,8 +43,8 @@ public:
+ class WvEVPMDDigest : public WvDigest
+ {
+ friend class WvHMACDigest;
+- const env_md_st *evpmd;
+- env_md_ctx_st *evpctx;
++ const EVP_MD *evpmd;
++ EVP_MD_CTX *evpctx;
+ bool active;
+
+ public:
+@@ -54,13 +52,13 @@ public:
+ virtual size_t digestsize() const;
+
+ protected:
+- WvEVPMDDigest(const env_md_st *_evpmd);
++ WvEVPMDDigest(const EVP_MD *_evpmd);
+ virtual bool _encode(WvBuf &inbuf, WvBuf &outbuf,
+ bool flush); // consumes input
+ virtual bool _finish(WvBuf &outbuf); // outputs digest
+ virtual bool _reset(); // supported: resets digest value
+
+- const env_md_st *getevpmd()
++ const EVP_MD *getevpmd()
+ { return evpmd; }
+
+ private:
+@@ -104,7 +102,7 @@ class WvHMACDigest : public WvDigest
+ WvEVPMDDigest *digest;
+ unsigned char *key;
+ size_t keysize;
+- hmac_ctx_st *hmacctx;
++ HMAC_CTX *hmacctx;
+ bool active;
+
+ public:
+diff --git include/wvtripledes.h include/wvtripledes.h
+index 185fe8a..a442e7a 100644
+--- include/wvtripledes.h
++++ include/wvtripledes.h
+@@ -70,11 +70,11 @@ protected:
+
+ private:
+ Mode mode;
+- des_cblock key;
+- des_key_schedule deskey1;
+- des_key_schedule deskey2;
+- des_key_schedule deskey3;
+- des_cblock ivec; // initialization vector
++ DES_cblock key;
++ DES_key_schedule deskey1;
++ DES_key_schedule deskey2;
++ DES_key_schedule deskey3;
++ DES_cblock ivec; // initialization vector
+ int ivecoff; // current offset into initvec
+ };
+
From 9505b0bae3407879d932340b56e85e5abf8062ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 17:25:34 +0100
Subject: [PATCH 595/634] vpn-ws: add OpenSSL patch
---
srcpkgs/vpn-ws/patches/openssl.patch | 52 ++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
create mode 100644 srcpkgs/vpn-ws/patches/openssl.patch
diff --git a/srcpkgs/vpn-ws/patches/openssl.patch b/srcpkgs/vpn-ws/patches/openssl.patch
new file mode 100644
index 00000000000..65c421a2f00
--- /dev/null
+++ b/srcpkgs/vpn-ws/patches/openssl.patch
@@ -0,0 +1,52 @@
+From a9d297969457e4f1a835e7481ddcbb4a2241692b Mon Sep 17 00:00:00 2001
+From: Peter Nikolow <peter@mobiliodevelopment.com>
+Date: Fri, 29 Jan 2021 13:24:58 +0200
+Subject: [PATCH 2/3] Update ssl.c
+
+Fixing OpenSSL 1.1 deprecation of OPENSSL_config
+---
+ src/ssl.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/ssl.c b/src/ssl.c
+index 4f0405c..996e9b0 100644
+--- src/ssl.c
++++ src/ssl.c
+@@ -225,7 +225,11 @@ static SSL_CTX *ssl_ctx = NULL;
+
+ void *vpn_ws_ssl_handshake(vpn_ws_peer *peer, char *sni, char *key, char *crt) {
+ if (!ssl_initialized) {
+- OPENSSL_config(NULL);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ OPENSSL_config(NULL);
++#else
++ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG,NULL);
++#endif
+ SSL_library_init();
+ SSL_load_error_strings();
+ OpenSSL_add_all_algorithms();
+
+From ec10c3526b115ea32775f495abd449948cc1d807 Mon Sep 17 00:00:00 2001
+From: Peter Nikolow <peter@mobiliodevelopment.com>
+Date: Fri, 29 Jan 2021 13:30:22 +0200
+Subject: [PATCH 3/3] Update ssl.c
+
+Adding default locations for trusted CA certificates.
+
+This helps is your server uses 3rd party certificate like Let's Encrypt.
+---
+ src/ssl.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ssl.c b/src/ssl.c
+index 996e9b0..3759d5b 100644
+--- src/ssl.c
++++ src/ssl.c
+@@ -254,6 +254,7 @@ void *vpn_ws_ssl_handshake(vpn_ws_peer *peer, char *sni, char *key, char *crt) {
+ SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_NONE, NULL);
+ }
+ else {
++ SSL_CTX_load_verify_locations(ssl_ctx, "/etc/ssl/certs/ca-certificates.crt", "/etc/ssl/certs/");
+ SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL);
+ }
+ ssl_peer_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, NULL);
From feaf0c1d91a143c1a3e587af5d605063153bdfe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 3 Feb 2021 17:20:51 +0100
Subject: [PATCH 596/634] exiftool: update to 12.17.
---
srcpkgs/exiftool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index a94bce3d740..8c81c61209d 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
# Template file for 'exiftool'
pkgname=exiftool
-version=12.16
+version=12.17
revision=1
wrksrc="Image-ExifTool-${version}"
build_style=perl-module
@@ -13,4 +13,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://exiftool.org/"
changelog="https://exiftool.org/history.html"
distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=c140797d72acdaf04f7ce0629867353510b56fbe99ceaac0742bbc379610756a
+checksum=6580b143a1d07257f4ef08d7c6abb79ec653cd7112fe19e757d7b5a8635b96ff
From bd57c70b854e4401d31dc108ffc3e9418c84210a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 3 Feb 2021 19:09:38 +0100
Subject: [PATCH 597/634] syncthing: update to 1.13.1.
---
srcpkgs/syncthing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 1d27cf82139..8bfb1673213 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.13.0
+version=1.13.1
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -18,7 +18,7 @@ license="MPL-2.0"
homepage="http://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=b31d4a323c6c970c580ecab3fd2327c5ba2709286b766b157139a5e393795bc2
+checksum=f4632a062f75d01629e625ccef9625313f5d371c5f9bee744b0b811d47b92e25
pre_build() {
GOARCH= go generate \
From 3cf25fecbce83a37042e0b555a46e5bb44640645 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 18:51:10 +0100
Subject: [PATCH 598/634] virtuoso: add OpenSSL patches
---
srcpkgs/virtuoso/patches/ssl1.1.patch | 1400 ++++++++++++++++++++
srcpkgs/virtuoso/patches/ssl1.1_more.patch | 20 +
2 files changed, 1420 insertions(+)
create mode 100644 srcpkgs/virtuoso/patches/ssl1.1.patch
create mode 100644 srcpkgs/virtuoso/patches/ssl1.1_more.patch
diff --git a/srcpkgs/virtuoso/patches/ssl1.1.patch b/srcpkgs/virtuoso/patches/ssl1.1.patch
new file mode 100644
index 00000000000..a055404e9a2
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/ssl1.1.patch
@@ -0,0 +1,1400 @@
+Description: Fix FTBFS with openssl 1.1
+Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Bug-Debian: https://bugs.debian.org/828594
+Forwarded: https://github.com/openlink/virtuoso-opensource/pull/583
+Last-Update: Mo 11. Feb 13:50:17 CET 2019 (by Andreas Tille <tille@debian.org>)
+
+---
+
+From 823092cccbd8e2ab9bfad6c3d3df791a7ffa76fc Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Date: Mon, 5 Sep 2016 10:49:54 +0000
+Subject: [PATCH] virtuoso-opensource: build against openssl 1.1.0
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+---
+ libsrc/Dk/Dkernel.c | 6 +-
+ libsrc/Wi/bif_crypto.c | 120 ++++++++++--------
+ libsrc/Wi/http.c | 2 +-
+ libsrc/Wi/xmlenc.c | 319 +++++++++++++++++++++++++++--------------------
+ libsrc/Wi/xmlenc.h | 193 ++++++++++++++++++++++++++--
+ libsrc/Wi/xmlenc_algos.c | 132 +++++++++++---------
+ libsrc/util/sslengine.c | 6 +-
+ 7 files changed, 524 insertions(+), 254 deletions(-)
+
+--- libsrc/Wi/bif_crypto.c
++++ libsrc/Wi/bif_crypto.c
+@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
+ unsigned char temp[EVP_MAX_MD_SIZE];
+ unsigned int size = 0;
+ caddr_t res = NULL;
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+ const EVP_MD *md = EVP_sha1 ();
+
+ if (alg == 1)
+ md = EVP_ripemd160 ();
+
+- HMAC_Init (&ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md);
+- box_hmac_1 (box, &ctx);
+- HMAC_Final (&ctx, temp, &size);
++ ctx = HMAC_CTX_new();
++ if (!ctx)
++ return res;
++
++ HMAC_Init_ex (ctx, key, box_length (key) - DV_STRINGP (key) ? 1 : 0, md, NULL);
++ box_hmac_1 (box, ctx);
++ HMAC_Final (ctx, temp, &size);
+ if (size)
+ {
+ res = dk_alloc_box (size + 1, DV_SHORT_STRING);
+ memcpy (res, temp, size);
+ res[size] = 0;
+ }
++ HMAC_CTX_free(ctx);
+ return res;
+ }
+
+@@ -347,14 +352,12 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
+ {
+ int ii;
+
+- opp = op;
+- ii = d2i_ASN1_BOOLEAN (NULL, (const unsigned char **)&opp, len + hl);
+- if (ii < 0)
++ if (len + hl < 1)
+ {
+ if (BIO_write (bp, "Bad boolean\n", 12))
+ goto end;
+ }
+- BIO_printf (bp, "%d", ii);
++ BIO_printf (bp, "%d", p[0]);
+ }
+ else if (tag == V_ASN1_BMPSTRING)
+ {
+@@ -415,7 +418,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
+ }
+ if (os != NULL)
+ {
+- M_ASN1_OCTET_STRING_free (os);
++ ASN1_STRING_free (os);
+ os = NULL;
+ }
+ }
+@@ -448,7 +451,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
+ if (BIO_write (bp, "BAD INTEGER", 11) <= 0)
+ goto end;
+ }
+- M_ASN1_INTEGER_free (bs);
++ ASN1_STRING_free (bs);
+ }
+ else if (tag == V_ASN1_ENUMERATED)
+ {
+@@ -479,7 +482,7 @@ asn1_parse_to_xml (BIO * bp, unsigned ch
+ if (BIO_write (bp, "BAD ENUMERATED", 11) <= 0)
+ goto end;
+ }
+- M_ASN1_ENUMERATED_free (bs);
++ ASN1_STRING_free (bs);
+ }
+ else if (len > 0 && dump)
+ {
+@@ -515,7 +518,7 @@ end:
+ if (o != NULL)
+ ASN1_OBJECT_free (o);
+ if (os != NULL)
+- M_ASN1_OCTET_STRING_free (os);
++ ASN1_STRING_free (os);
+ *pp = p;
+ return (ret);
+ }
+@@ -723,7 +726,7 @@ bio_to_strses (BIO * out_bio)
+ int len = BIO_get_mem_data (out_bio, &ptr);
+ int to_read = len, readed = 0;
+
+- to_free = ((BUF_MEM *) out_bio->ptr)->data;
++ to_free = ((BUF_MEM *) BIO_get_data(out_bio))->data;
+ BIO_set_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
+ CATCH_WRITE_FAIL (ses)
+ {
+@@ -735,7 +738,7 @@ bio_to_strses (BIO * out_bio)
+ } while (to_read > 0);
+ }
+ END_WRITE_FAIL (ses);
+- ((BUF_MEM *) out_bio->ptr)->data = to_free;
++ ((BUF_MEM *) BIO_get_data(out_bio))->data = to_free;
+ BIO_clear_flags (out_bio, BIO_FLAGS_MEM_RDONLY);
+ return ses;
+ }
+@@ -770,7 +773,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
+ if (DV_TYPE_OF (msg) == DV_STRING_SESSION)
+ {
+ in_bio = strses_to_bio ((dk_session_t *) msg);
+- to_free = ((BUF_MEM *) in_bio->ptr)->data;
++ to_free = ((BUF_MEM *) BIO_get_data(in_bio))->data;
+ BIO_set_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
+ }
+ else
+@@ -780,7 +783,7 @@ bif_smime_verify (caddr_t * qst, caddr_t
+ p7 = SMIME_read_PKCS7 (in_bio, &data_bio);
+ if (to_free)
+ {
+- ((BUF_MEM *) in_bio->ptr)->data = to_free;
++ ((BUF_MEM *) BIO_get_data(in_bio))->data = to_free;
+ BIO_clear_flags (in_bio, BIO_FLAGS_MEM_RDONLY);
+ }
+ BIO_free (in_bio);
+@@ -924,16 +927,20 @@ bif_smime_sign (caddr_t * qst, caddr_t *
+ }
+
+ certs = sk_X509_new_null ();
+- if (store && store->objs)
++
++ if (store && X509_STORE_get0_objects(store))
+ {
+- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
++ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
++
++ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
+ {
+- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
+- if (obj->type == X509_LU_X509)
+- sk_X509_push (certs, X509_dup (obj->data.x509));
++ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
++ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
++ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
+ }
+
+ }
++
+ if (store)
+ X509_STORE_free (store);
+ in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
+@@ -1005,15 +1012,19 @@ bif_smime_encrypt (caddr_t * qst, caddr_
+ sqlr_new_error ("42000", "CR006", "No recipient certificates");
+
+ certs = sk_X509_new_null ();
+- if (store && store->objs)
++
++ if (store && X509_STORE_get0_objects(store))
+ {
+- for (inx = 0; inx < sk_X509_OBJECT_num (store->objs); inx++)
++ STACK_OF(X509_OBJECT) *store_objs = X509_STORE_get0_objects(store);
++
++ for (inx = 0; inx < sk_X509_OBJECT_num (store_objs); inx++)
+ {
+- X509_OBJECT *obj = sk_X509_OBJECT_value (store->objs, inx);
+- if (obj->type == X509_LU_X509)
+- sk_X509_push (certs, X509_dup (obj->data.x509));
++ X509_OBJECT *obj = sk_X509_OBJECT_value (store_objs, inx);
++ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
++ sk_X509_push (certs, X509_dup (X509_OBJECT_get0_X509(obj)));
+ }
+ }
++
+ if (store)
+ X509_STORE_free (store);
+ in_bio = BIO_new_mem_buf (msg, box_length (msg) - 1);
+@@ -1181,7 +1192,7 @@ x509_certificate_verify_cb (int ok, X509
+ char *opts = (char *) X509_STORE_CTX_get_app_data (ctx);
+ if (!ok && opts)
+ {
+- switch (ctx->error)
++ switch (X509_STORE_CTX_get_error(ctx))
+ {
+ case X509_V_ERR_CERT_HAS_EXPIRED:
+ if (strstr (opts, "expired"))
+@@ -1287,7 +1298,7 @@ bif_x509_certificate_verify (caddr_t * q
+ if (!i)
+ {
+ const char *err_str;
+- err_str = X509_verify_cert_error_string (csc->error);
++ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(csc));
+ *err_ret = srv_make_new_error ("22023", "CR015", "X509 error: %s", err_str);
+ }
+
+@@ -1308,20 +1319,16 @@ err_ret:
+ #define VIRT_CERT_EXT "2.16.840.1.1113.1"
+
+ static caddr_t
+-BN_box (BIGNUM * x)
++BN_box (const BIGNUM *x)
+ {
+ size_t buf_len, n;
+ caddr_t buf;
+ buf_len = (size_t) BN_num_bytes (x);
+- if (buf_len <= BN_BYTES)
+- buf = box_num ((unsigned long) x->d[0]);
+- else
+- {
+- buf = dk_alloc_box (buf_len, DV_BIN);
+- n = BN_bn2bin (x, (unsigned char *) buf);
+- if (n != buf_len)
+- GPF_T;
+- }
++ /* did not figure out where buf is free()ed */
++ buf = dk_alloc_box (buf_len, DV_BIN);
++ n = BN_bn2bin (x, (unsigned char *) buf);
++ if (n != buf_len)
++ GPF_T;
+ return buf;
+ }
+
+@@ -1498,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst,
+ int i;
+ char tmp[1024];
+ char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
+- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
++ const STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
+ for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
+ {
+ X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
+@@ -1510,7 +1517,7 @@ bif_get_certificate_info (caddr_t * qst,
+ char *data_ptr;
+ BIO *mem = BIO_new (BIO_s_mem ());
+ if (!X509V3_EXT_print (mem, ex, 0, 0))
+- M_ASN1_OCTET_STRING_print (mem, ex->value);
++ ASN1_STRING_print (mem, X509_EXTENSION_get_data(ex));
+ len = BIO_get_mem_data (mem, &data_ptr);
+ if (len > 0 && data_ptr)
+ {
+@@ -1537,18 +1544,23 @@ bif_get_certificate_info (caddr_t * qst,
+ if (k)
+ {
+ #ifdef EVP_PKEY_RSA
+- if (k->type == EVP_PKEY_RSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ {
+- RSA *x = k->pkey.rsa;
+- ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (x->e), BN_box (x->n));
++ const BIGNUM *n, *e;
++
++ RSA_get0_key(EVP_PKEY_get0_RSA(k), &n, &e, NULL);
++
++ ret = list (3, box_dv_short_string ("RSAPublicKey"), BN_box (e), BN_box (n));
+ }
+ else
+ #endif
+ #ifdef EVP_PKEY_DSA
+- if (k->type == EVP_PKEY_DSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
+ {
+- DSA *x = k->pkey.dsa;
+- ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (x->pub_key));
++ const BIGNUM *pub_key;
++
++ DSA_get0_key(EVP_PKEY_get0_DSA(k), &pub_key, NULL);
++ ret = list (2, box_dv_short_string ("DSAPublicKey"), BN_box (pub_key));
+ }
+ else
+ #endif
+@@ -1567,13 +1579,13 @@ bif_get_certificate_info (caddr_t * qst,
+ int n, i, len;
+ char *s, *data_ptr;
+ BIO *mem = BIO_new (BIO_s_mem ());
+- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
++ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
+ {
+- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
+- n = OBJ_obj2nid (ne->object);
++ ne = X509_NAME_get_entry(subj, i);
++ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
+ if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
+ {
+- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
++ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
+ s = buffer;
+ }
+ if (!strcmp (s, attr))
+@@ -1582,9 +1594,10 @@ bif_get_certificate_info (caddr_t * qst,
+ break;
+ }
+ }
++
+ if (ne_ret)
+ {
+- ASN1_STRING_print (mem, ne_ret->value);
++ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
+ len = BIO_get_mem_data (mem, &data_ptr);
+ if (len > 0 && data_ptr)
+ {
+@@ -1605,17 +1618,17 @@ bif_get_certificate_info (caddr_t * qst,
+ dk_set_t set = NULL;
+ caddr_t val;
+ BIO *mem = BIO_new (BIO_s_mem ());
+- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
++ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
+ {
+ val = NULL;
+- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
+- n = OBJ_obj2nid (ne->object);
++ ne = X509_NAME_get_entry(subj, i);
++ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
+ if ((n == NID_undef) || ((s = (char *) OBJ_nid2sn (n)) == NULL))
+ {
+- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
++ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
+ s = buffer;
+ }
+- ASN1_STRING_print (mem, ne->value);
++ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
+ len = BIO_get_mem_data (mem, &data_ptr);
+ if (len > 0 && data_ptr)
+ {
+@@ -1629,18 +1642,22 @@ bif_get_certificate_info (caddr_t * qst,
+ }
+ BIO_free (mem);
+ ret = list_to_array (dk_set_nreverse (set));
++
+ break;
+ }
+ case 12:
+ {
+ const unsigned char *s;
+ int i, n;
+- const ASN1_STRING *sig = cert->signature;
+- X509_ALGOR *sigalg = cert->sig_alg;
++ const ASN1_STRING *sig;
++ const X509_ALGOR *sigalg;
++ const ASN1_OBJECT *sig_alg_algorithm;
+ char buf[80];
+ caddr_t val;
+
+- i2t_ASN1_OBJECT(buf,sizeof (buf), sigalg->algorithm);
++ X509_get0_signature(&sig, &sigalg, cert);
++ X509_ALGOR_get0(&sig_alg_algorithm, NULL, NULL, sigalg);
++ i2t_ASN1_OBJECT(buf,sizeof (buf), sig_alg_algorithm);
+
+ n = sig->length;
+ s = sig->data;
+@@ -1660,11 +1677,11 @@ bif_get_certificate_info (caddr_t * qst,
+ if (k)
+ {
+ #ifdef EVP_PKEY_RSA
+- if (k->type == EVP_PKEY_RSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ {
+ char *data_ptr;
+ int len;
+- RSA *x = k->pkey.rsa;
++ RSA *x = EVP_PKEY_get0_RSA(k);
+ b = BIO_new (BIO_s_mem());
+ i2d_RSA_PUBKEY_bio (b, x);
+ len = BIO_get_mem_data (b, &data_ptr);
+--- libsrc/Wi/xmlenc.c
++++ libsrc/Wi/xmlenc.c
+@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
+ }
+
+
+-static void
+-genrsa_cb(int p, int n, void *arg)
+-{
+-#ifdef LINT
+- p=n;
+-#endif
+-}
+-
+ int
+ __xenc_key_rsa_init (char *name)
+ {
+ RSA *rsa = NULL;
+- int num=1024;
+- unsigned long f4=RSA_F4;
++ BIGNUM *bn = NULL;
+ int r;
++
+ xenc_key_t * pkey = xenc_get_key_by_name (name, 1);
+ if (NULL == pkey)
+ SQLR_NEW_KEY_ERROR (name);
+
+- rsa=RSA_generate_key(num,f4,genrsa_cb,NULL);
++ rsa = RSA_new();
++ if (!rsa)
++ goto out;
++ bn = BN_new();
++ if (!bn)
++ goto out;
++ if (!BN_set_word(bn, RSA_F4))
++ goto out;
++
++ if (!RSA_generate_key_ex(rsa, 1024, bn, NULL))
++ goto out;
++
+ r = RSA_check_key(rsa);
++ if (r != 1)
++ goto out;
+ pkey->ki.rsa.pad = RSA_PKCS1_PADDING;
+- if (rsa == NULL)
+- {
+- sqlr_new_error ("42000", "XENC06",
+- "RSA parameters generation error");
+- }
+ pkey->xek_rsa = rsa;
+ pkey->xek_private_rsa = rsa;
++ BN_free(bn);
+ return 0;
++out:
++ if (bn)
++ BN_free(bn);
++ if (rsa)
++ RSA_free(rsa);
++ sqlr_new_error ("42000", "XENC06",
++ "RSA parameters generation error");
++ return -1;
+ }
+
+
+@@ -1455,19 +1464,19 @@ xenc_key_t * xenc_key_create_from_x509_c
+
+ if (pkey)
+ {
+- switch (EVP_PKEY_type (pkey->type))
++ switch (EVP_PKEY_type (EVP_PKEY_id(pkey)))
+ {
+ case EVP_PKEY_DSA:
+ sign_algoname = DSIG_DSA_SHA1_ALGO;
+ enc_algoname = XENC_DSA_ALGO;
+- dsa = pkey->pkey.dsa;
+- private_dsa = private_key ? private_key->pkey.dsa : 0;
++ dsa = EVP_PKEY_get0_DSA(pkey);
++ private_dsa = private_key ? EVP_PKEY_get0_DSA(private_key) : 0;
+ break;
+ case EVP_PKEY_RSA:
+ sign_algoname = DSIG_RSA_SHA1_ALGO;
+ enc_algoname = XENC_RSA_ALGO;
+- rsa = pkey->pkey.rsa;
+- private_rsa = private_key ? private_key->pkey.rsa : 0;
++ rsa = EVP_PKEY_get0_RSA(pkey);
++ private_rsa = private_key ? EVP_PKEY_get0_RSA(private_key) : 0;
+ break;
+ default:
+ goto finish;
+@@ -1516,13 +1525,6 @@ xenc_key_t * xenc_key_create_from_x509_c
+ return k;
+ }
+
+-static void dh_cb(int p, int n, void *arg)
+-{
+-#ifdef LINT
+- p=n;
+-#endif
+-}
+-
+ static /*xenc_key_DSA_create */
+ caddr_t bif_xenc_key_dsa_create (caddr_t * qst, caddr_t * err_r, state_slot_t ** args)
+ {
+@@ -1588,15 +1590,21 @@ caddr_t bif_xenc_key_DH_create (caddr_t
+ dh = DH_new ();
+ bn_p = BN_bin2bn ((unsigned char *)mod, p_len, NULL);
+ bn_g = BN_bin2bn (g_bin, 1, NULL);
+- dh->p = bn_p;
+- dh->g = bn_g;
++ if (dh)
++ DH_set0_pqg(dh, bn_p, NULL, bn_g);
+
+ dk_free_box (mod_b64);
+ dk_free_box (mod);
+ }
+ else
+ {
+- dh = DH_generate_parameters (num, g, dh_cb, NULL);
++ dh = DH_new();
++ if (dh) {
++ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
++ DH_free(dh);
++ dh = NULL;
++ }
++ }
+ }
+ if (!dh)
+ {
+@@ -1626,7 +1634,7 @@ caddr_t bif_xenc_DH_get_params (caddr_t
+ int n, len;
+ caddr_t buf = NULL, ret, b64;
+ DH *dh;
+- BIGNUM *num;
++ const BIGNUM *num;
+
+ mutex_enter (xenc_keys_mtx);
+ key = xenc_get_key_by_name (name, 0);
+@@ -1641,19 +1649,19 @@ caddr_t bif_xenc_DH_get_params (caddr_t
+ switch (param)
+ {
+ case 1:
+- num = dh->p;
++ DH_get0_pqg(dh, &num, NULL, NULL);
+ break;
+ case 2:
+- num = dh->g;
++ DH_get0_pqg(dh, NULL, NULL, &num);
+ break;
+ case 3:
+- num = dh->pub_key;
++ DH_get0_key(dh, &num, NULL);
+ break;
+ case 4:
+- num = dh->priv_key;
++ DH_get0_key(dh, NULL, &num);
+ break;
+ default:
+- num = dh->pub_key;
++ DH_get0_key(dh, &num, NULL);
+ }
+
+ buf_len = (size_t)BN_num_bytes(num);
+@@ -1811,7 +1819,15 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
+ xenc_key_t * k;
+ caddr_t name = bif_string_arg (qst, args, 0, "xenc_key_RSA_create");
+ int num = (int) bif_long_arg (qst, args, 1, "xenc_key_RSA_create");
+- RSA *rsa = NULL;
++ RSA *rsa;
++ BIGNUM *bn;
++
++ rsa = RSA_new();
++ bn = BN_new();
++ if (!rsa || !bn)
++ goto out;
++ if (!BN_set_word(bn, RSA_F4))
++ goto out;
+
+ mutex_enter (xenc_keys_mtx);
+ if (NULL == (k = xenc_key_create (name, XENC_RSA_ALGO , DSIG_RSA_SHA1_ALGO, 0)))
+@@ -1820,12 +1836,11 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
+ SQLR_NEW_KEY_EXIST_ERROR (name);
+ }
+
+- rsa = RSA_generate_key (num, RSA_F4, NULL, NULL);
+-
+- if (rsa == NULL)
+- {
+- sqlr_new_error ("42000", "XENC06", "RSA generation error");
+- }
++ if (!RSA_generate_key_ex (rsa, num, bn, NULL)) {
++ mutex_leave (xenc_keys_mtx);
++ goto out;
++ }
++ BN_free(bn);
+
+ k->xek_rsa = RSAPublicKey_dup (rsa);
+ k->xek_private_rsa = rsa;
+@@ -1839,6 +1854,13 @@ caddr_t bif_xenc_key_rsa_create (caddr_t
+
+ mutex_leave (xenc_keys_mtx);
+ return NULL;
++out:
++ if (bn)
++ BN_free(bn);
++ if (rsa)
++ RSA_free(rsa);
++ sqlr_new_error ("42000", "XENC06", "RSA generation error");
++ return NULL;
+ }
+
+ xenc_key_t *
+@@ -2034,7 +2056,13 @@ int __xenc_key_dsa_init (char *name, int
+ SQLR_NEW_KEY_ERROR (name);
+
+ RAND_poll ();
+- dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, NULL);
++ dsa = DSA_new();
++ if (dsa) {
++ if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, NULL)) {
++ DSA_free(dsa);
++ dsa = NULL;
++ }
++ }
+ if (dsa == NULL)
+ {
+ sqlr_new_error ("42000", "XENC11",
+@@ -2058,7 +2086,13 @@ int __xenc_key_dh_init (char *name, int
+ if (NULL == pkey)
+ SQLR_NEW_KEY_ERROR (name);
+
+- dh = DH_generate_parameters (num, g, dh_cb, NULL);
++ dh = DH_new();
++ if (dh) {
++ if (!DH_generate_parameters_ex(dh, num, g, NULL)) {
++ DH_free(dh);
++ dh = NULL;
++ }
++ }
+ if (!dh)
+ {
+ sqlr_new_error ("42000", "XENC11",
+@@ -2280,12 +2314,12 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
+ {
+ in = BIO_new_mem_buf (key_base64, len);
+ pkey = d2i_PUBKEY_bio (in, NULL);
+- if (pkey && pkey->type == EVP_PKEY_RSA)
+- p = pkey->pkey.rsa;
++ if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_RSA)
++ p = EVP_PKEY_get0_RSA(pkey);
+ BIO_reset (in);
+ pkkey = d2i_PrivateKey_bio (in, NULL);
+- if (pkkey && pkkey->type == EVP_PKEY_RSA)
+- r = pkkey->pkey.rsa;
++ if (pkkey && EVP_PKEY_id(pkkey) == EVP_PKEY_RSA)
++ r = EVP_PKEY_get0_RSA(pkkey);
+ BIO_free (in);
+ }
+ else
+@@ -2304,9 +2338,11 @@ bif_xenc_key_rsa_read (caddr_t * qst, ca
+
+ if (!p)
+ {
++ const BIGNUM *n, *e;
++
++ RSA_get0_key(r, &n, &e, NULL);
+ p = RSA_new ();
+- p->n = BN_dup (r->n);
+- p->e = BN_dup (r->e);
++ RSA_set0_key(p, BN_dup(n), BN_dup(e), NULL);
+ }
+
+ mutex_enter (xenc_keys_mtx);
+@@ -2355,14 +2391,13 @@ bif_xenc_key_rsa_construct (caddr_t * qs
+ p = RSA_new ();
+ n = BN_bin2bn ((unsigned char *) mod, box_length (mod) - 1, NULL);
+ e = BN_bin2bn ((unsigned char *) exp, box_length (exp) - 1, NULL);
+- p->n = n;
+- p->e = e;
++ RSA_set0_key(p, n, e, NULL);
+ if (pexp)
+ {
+ pk = RSA_new ();
+- pk->d = BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL);
+- pk->n = BN_dup (n);
+- pk->e = BN_dup (e);
++ RSA_set0_key(p, BN_dup(n),
++ BN_dup(e),
++ BN_bin2bn ((unsigned char *) pexp, box_length (pexp) - 1, NULL));
+ }
+ mutex_enter (xenc_keys_mtx);
+ k = xenc_key_create (name, XENC_RSA_ALGO, DSIG_RSA_SHA1_ALGO, 0);
+@@ -4086,7 +4121,7 @@ void xenc_tag_free (xenc_tag_t * t)
+ #endif
+ }
+
+-xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, BIGNUM * bn)
++static xenc_tag_t * xenc_tag_add_child_BN (xenc_tag_t * tag, const BIGNUM * bn)
+ {
+ char * buffer = dk_alloc_box (BN_num_bytes (bn), DV_BIN);
+ char * buffer_base64 = dk_alloc_box (box_length (buffer) * 2, DV_STRING);
+@@ -4111,12 +4146,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
+ caddr_t ** array;
+ if (key->xek_type == DSIG_KEY_RSA)
+ {
++ const BIGNUM *rsa_n, *rsa_e;
++
++ RSA_get0_key(key->ki.rsa.rsa_st, &rsa_n, &rsa_e, NULL);
+ xenc_tag_t * rsakeyval = xenc_tag_create (DSIG_URI, ":RSAKeyValue");
+ xenc_tag_t * rsamodulus = xenc_tag_create (DSIG_URI, ":Modulus");
+ xenc_tag_t * rsaexponent = xenc_tag_create (DSIG_URI, ":Exponent");
+
+- xenc_tag_add_child_BN (rsamodulus, key->ki.rsa.rsa_st->n);
+- xenc_tag_add_child_BN (rsaexponent, key->ki.rsa.rsa_st->e);
++ xenc_tag_add_child_BN (rsamodulus, rsa_n);
++ xenc_tag_add_child_BN (rsaexponent, rsa_e);
+
+ xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsamodulus));
+ xenc_tag_add_child (rsakeyval, xenc_tag_finalize (rsaexponent));
+@@ -4135,12 +4173,15 @@ caddr_t ** xenc_generate_ext_info (xenc_
+ xenc_tag_t * g = xenc_tag_create (DSIG_URI, ":G");
+ xenc_tag_t * y = xenc_tag_create (DSIG_URI, ":Y");
+ DSA * dsa = key->ki.dsa.dsa_st;
++ const BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_pub_key;
+
++ DSA_get0_pqg(dsa, &dsa_p, &dsa_q, &dsa_g);
++ DSA_get0_key(dsa, &dsa_pub_key, NULL);
+
+- xenc_tag_add_child_BN (p, dsa->p);
+- xenc_tag_add_child_BN (p, dsa->q);
+- xenc_tag_add_child_BN (p, dsa->g);
+- xenc_tag_add_child_BN (p, dsa->pub_key);
++ xenc_tag_add_child_BN (p, dsa_p);
++ xenc_tag_add_child_BN (p, dsa_q);
++ xenc_tag_add_child_BN (p, dsa_g);
++ xenc_tag_add_child_BN (p, dsa_pub_key);
+
+ xenc_tag_add_child (dsakeyval, xenc_tag_finalize (p));
+ xenc_tag_add_child (dsakeyval, xenc_tag_finalize (q));
+@@ -6187,7 +6228,7 @@ caddr_t xenc_x509_get_key_identifier (X5
+
+ ret = dk_alloc_box (ikeyid->length, DV_BIN);
+ memcpy (ret, ikeyid->data, ikeyid->length);
+- M_ASN1_OCTET_STRING_free(ikeyid);
++ ASN1_STRING_free(ikeyid);
+ return ret;
+ }
+
+@@ -6247,7 +6288,7 @@ bif_x509_get_subject (caddr_t * qst, cad
+
+ ret = dk_alloc_box (ikeyid->length, DV_BIN);
+ memcpy (ret, ikeyid->data, ikeyid->length);
+- M_ASN1_OCTET_STRING_free(ikeyid);
++ ASN1_STRING_free(ikeyid);
+ return ret;
+ }
+
+@@ -6806,7 +6847,7 @@ bif_xenc_x509_csr_generate (caddr_t * qs
+ sk_X509_EXTENSION_push(st_exts, ex);
+ }
+ X509_REQ_add_extensions(x, st_exts);
+- if (!X509_REQ_sign (x, pk, (pk->type == EVP_PKEY_RSA ? EVP_md5() : EVP_dss1())))
++ if (!X509_REQ_sign (x, pk, (EVP_PKEY_id(pk) == EVP_PKEY_RSA ? EVP_md5() : EVP_sha1())))
+ {
+ pk = NULL; /* keep one in the xenc_key */
+ *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate : %s", get_ssl_error_text (buf, sizeof (buf)));
+@@ -6945,17 +6986,17 @@ bif_xenc_x509_from_csr (caddr_t * qst, c
+ *err_ret = srv_make_new_error ("42000", "XECXX", "Can not sign certificate");
+ goto err;
+ }
+- switch (EVP_PKEY_type (cli_pk->type))
++ switch (EVP_PKEY_type (EVP_PKEY_id(cli_pk)))
+ {
+ case EVP_PKEY_DSA:
+ sign_algoname = DSIG_DSA_SHA1_ALGO;
+ enc_algoname = XENC_DSA_ALGO;
+- dsa = cli_pk->pkey.dsa;
++ dsa = EVP_PKEY_get0_DSA(cli_pk);
+ break;
+ case EVP_PKEY_RSA:
+ sign_algoname = DSIG_RSA_SHA1_ALGO;
+ enc_algoname = XENC_RSA_ALGO;
+- rsa = cli_pk->pkey.rsa;
++ rsa = EVP_PKEY_get0_RSA(cli_pk);
+ break;
+ default:
+ *err_ret = srv_make_new_error ("42000", "XECXX", "The type of public key is not supported mus tbe RSA or DSA");
+@@ -7032,19 +7073,19 @@ bif_xenc_pkcs12_export (caddr_t * qst, c
+ if (export_chain)
+ {
+ int i;
+- X509_STORE_CTX store_ctx;
+- X509_STORE_CTX_init (&store_ctx, CA_certs, x, NULL);
+- if (X509_verify_cert (&store_ctx) > 0)
+- chain = X509_STORE_CTX_get1_chain (&store_ctx);
++ X509_STORE_CTX *ctx;
++ X509_STORE_CTX_init (ctx, CA_certs, x, NULL);
++ if (X509_verify_cert (ctx) > 0)
++ chain = X509_STORE_CTX_get1_chain (ctx);
+ else
+ {
+ const char *err_str;
+- err_str = X509_verify_cert_error_string (store_ctx.error);
++ err_str = X509_verify_cert_error_string (X509_STORE_CTX_get_error(ctx));
+ *err_ret = srv_make_new_error ("22023", "XENCX", "X509 error: %s", err_str);
+- X509_STORE_CTX_cleanup (&store_ctx);
++ X509_STORE_CTX_cleanup (ctx);
+ goto err;
+ }
+- X509_STORE_CTX_cleanup (&store_ctx);
++ X509_STORE_CTX_cleanup (ctx);
+ if (chain)
+ {
+ certs = sk_X509_new_null ();
+@@ -7152,16 +7193,16 @@ bif_xenc_pubkey_pem_export (caddr_t * qs
+ {
+ k = X509_get_pubkey (key->xek_x509);
+ #ifdef EVP_PKEY_RSA
+- if (k->type == EVP_PKEY_RSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ {
+- RSA * x = k->pkey.rsa;
++ RSA *x = EVP_PKEY_get0_RSA(k);
+ PEM_write_bio_RSA_PUBKEY (b, x);
+ }
+ #endif
+ #ifdef EVP_PKEY_DSA
+- if (k->type == EVP_PKEY_DSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
+ {
+- DSA * x = k->pkey.dsa;
++ DSA * x = EVP_PKEY_get0_DSA(k);
+ PEM_write_bio_DSA_PUBKEY (b, x);
+ }
+ #endif
+@@ -7208,16 +7249,16 @@ bif_xenc_pubkey_der_export (caddr_t * qs
+ {
+ k = X509_get_pubkey (key->xek_x509);
+ #ifdef EVP_PKEY_RSA
+- if (k->type == EVP_PKEY_RSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ {
+- RSA * x = k->pkey.rsa;
++ RSA * x = EVP_PKEY_get0_RSA(k);
+ i2d_RSA_PUBKEY_bio (b, x);
+ }
+ #endif
+ #ifdef EVP_PKEY_DSA
+- if (k->type == EVP_PKEY_DSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_DSA)
+ {
+- DSA * x = k->pkey.dsa;
++ DSA * x = EVP_PKEY_get0_DSA(k);
+ i2d_DSA_PUBKEY_bio (b, x);
+ }
+ #endif
+@@ -7245,7 +7286,7 @@ err:
+ }
+
+ static caddr_t
+-BN2binbox (BIGNUM * x)
++BN2binbox (const BIGNUM * x)
+ {
+ size_t buf_len, n;
+ caddr_t buf;
+@@ -7280,8 +7321,14 @@ static caddr_t
+ xenc_rsa_pub_magic (RSA * x)
+ {
+ caddr_t ret;
+- caddr_t n = BN2binbox (x->n); /* modulus */
+- caddr_t e = BN2binbox (x->e); /* public exponent */
++ caddr_t n;
++ caddr_t e;
++ const BIGNUM *rsa_n, *rsa_e;
++
++ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
++ n = BN2binbox (rsa_n); /* modulus */
++ e = BN2binbox (rsa_e); /* public exponent */
++
+ n = xenc_encode_base64_binbox (n, 1);
+ e = xenc_encode_base64_binbox (e, 1);
+ ret = dk_alloc_box (box_length (n) + box_length (e) + 4 /* two dots - one trailing zero + RSA prefix */, DV_STRING);
+@@ -7306,9 +7353,9 @@ bif_xenc_pubkey_magic_export (caddr_t *
+ {
+ k = X509_get_pubkey (key->xek_x509);
+ #ifdef EVP_PKEY_RSA
+- if (k->type == EVP_PKEY_RSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ {
+- RSA * x = k->pkey.rsa;
++ RSA * x = EVP_PKEY_get0_RSA(k);
+ ret = xenc_rsa_pub_magic (x);
+ }
+ #endif
+@@ -7349,10 +7396,16 @@ static caddr_t
+ xenc_rsa_pub_ssh_export (RSA * x)
+ {
+ static char * ssh_header = "\x00\x00\x00\x07ssh-rsa";
++ const BIGNUM *rsa_n, *rsa_e;
+ caddr_t ret;
+ int len, pos;
+- caddr_t n = BN2binbox (x->n); /* modulus */
+- caddr_t e = BN2binbox (x->e); /* public exponent */
++ caddr_t n;
++ caddr_t e;
++
++ RSA_get0_key(x, &rsa_n, &rsa_e, NULL);
++ n = BN2binbox (rsa_n); /* modulus */
++ e = BN2binbox (rsa_e); /* public exponent */
++
+ len = 11 + 8 + box_length (n) + box_length (e);
+ if (n[0] & 0x80)
+ len ++;
+@@ -7383,9 +7436,9 @@ bif_xenc_pubkey_ssh_export (caddr_t * qs
+ {
+ k = X509_get_pubkey (key->xek_x509);
+ #ifdef EVP_PKEY_RSA
+- if (k->type == EVP_PKEY_RSA)
++ if (EVP_PKEY_id(k) == EVP_PKEY_RSA)
+ {
+- RSA * x = k->pkey.rsa;
++ RSA * x = EVP_PKEY_get0_RSA(k);
+ ret = xenc_rsa_pub_ssh_export (x);
+ }
+ #endif
+@@ -7418,7 +7471,7 @@ bif_xenc_SPKI_read (caddr_t * qst, caddr
+ return NULL;
+ }
+ pk = NETSCAPE_SPKI_get_pubkey (spki);
+- if (!pk || pk->type != EVP_PKEY_RSA)
++ if (!pk || EVP_PKEY_id(pk) != EVP_PKEY_RSA)
+ {
+ NETSCAPE_SPKI_free (spki);
+ *err_ret = srv_make_new_error ("42000", "XECXX", "Can not retrieve RSA key");
+@@ -7595,14 +7648,14 @@ bif_xenc_x509_ca_certs_list (caddr_t * q
+ sec_check_dba ((QI*)qst, me);
+ in = BIO_new (BIO_s_mem ());
+ mutex_enter (xenc_keys_mtx);
+- certs = CA_certs->objs;
++ certs = X509_STORE_get0_objects(CA_certs);
+ len = sk_X509_OBJECT_num (certs);
+ for (i = 0; i < len; i++)
+ {
+ X509_OBJECT * obj = sk_X509_OBJECT_value (certs, i);
+- if (obj->type == X509_LU_X509)
++ if (X509_OBJECT_get_type(obj) == X509_LU_X509)
+ {
+- X509 *x = obj->data.x509;
++ X509 *x = X509_OBJECT_get0_X509(obj);
+ caddr_t itm;
+ int blen;
+ BIO_reset (in);
+--- libsrc/Wi/xmlenc.h
++++ libsrc/Wi/xmlenc.h
+@@ -38,6 +38,7 @@
+ #include <openssl/dsa.h>
+ #include <openssl/rsa.h>
+ #include <openssl/des.h>
++#include <openssl/hmac.h>
+
+ #ifdef AES_ENC_ENABLE
+ #include <openssl/aes.h>
+@@ -631,5 +632,183 @@ caddr_t * xml_find_any_child (caddr_t *
+
+ extern dk_mutex_t * xenc_keys_mtx;
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++
++static inline HMAC_CTX *HMAC_CTX_new(void)
++{
++ HMAC_CTX *p;
++
++ p = calloc(1, sizeof(HMAC_CTX));
++ if (!p)
++ return p;
++ HMAC_CTX_init(p);
++ return p;
++}
++
++static inline void HMAC_CTX_free(HMAC_CTX *ctx)
++{
++ HMAC_CTX_cleanup(ctx);
++ free(ctx);
++}
++
++static inline void RSA_get0_key(const RSA *r, const BIGNUM **n,
++ const BIGNUM **e, const BIGNUM **d)
++{
++ if (n != NULL)
++ *n = r->n;
++ if (e != NULL)
++ *e = r->e;
++ if (d != NULL)
++ *d = r->d;
++}
++
++static inline void RSA_get0_factors(const RSA *r, const BIGNUM **p,
++ const BIGNUM **q)
++{
++ if (p != NULL)
++ *p = r->p;
++ if (q != NULL)
++ *q = r->q;
++}
++
++static inline RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
++{
++ if (pkey->type != EVP_PKEY_RSA)
++ return NULL;
++ return pkey->pkey.rsa;
++}
++
++static inline void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
++ const BIGNUM **priv_key)
++{
++ if (pub_key != NULL)
++ *pub_key = dh->pub_key;
++ if (priv_key != NULL)
++ *priv_key = dh->priv_key;
++}
++
++
++static inline void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q,
++ const BIGNUM **g)
++{
++ if (p != NULL)
++ *p = dh->p;
++ if (q != NULL)
++ *q = dh->q;
++ if (g != NULL)
++ *g = dh->g;
++}
++
++static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
++{
++ if (pkey->type != EVP_PKEY_DSA)
++ return NULL;
++ return pkey->pkey.dsa;
++}
++
++static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
++{
++ /* If the fields p and g in d are NULL, the corresponding input
++ * parameters MUST be non-NULL. q may remain NULL.
++ */
++ if ((dh->p == NULL && p == NULL)
++ || (dh->g == NULL && g == NULL))
++ return 0;
++
++ if (p != NULL) {
++ BN_free(dh->p);
++ dh->p = p;
++ }
++ if (q != NULL) {
++ BN_free(dh->q);
++ dh->q = q;
++ }
++ if (g != NULL) {
++ BN_free(dh->g);
++ dh->g = g;
++ }
++
++ if (q != NULL) {
++ dh->length = BN_num_bits(q);
++ }
++
++ return 1;
++}
++
++static inline int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
++{
++ /* If the fields n and e in r are NULL, the corresponding input
++ * parameters MUST be non-NULL for n and e. d may be
++ * left NULL (in case only the public key is used).
++ */
++ if ((r->n == NULL && n == NULL)
++ || (r->e == NULL && e == NULL))
++ return 0;
++
++ if (n != NULL) {
++ BN_free(r->n);
++ r->n = n;
++ }
++ if (e != NULL) {
++ BN_free(r->e);
++ r->e = e;
++ }
++ if (d != NULL) {
++ BN_free(r->d);
++ r->d = d;
++ }
++
++ return 1;
++}
++
++static inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
++ const BIGNUM **q, const BIGNUM **g)
++{
++ if (p != NULL)
++ *p = d->p;
++ if (q != NULL)
++ *q = d->q;
++ if (g != NULL)
++ *g = d->g;
++}
++
++static inline void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
++ const BIGNUM **priv_key)
++{
++ if (pub_key != NULL)
++ *pub_key = d->pub_key;
++ if (priv_key != NULL)
++ *priv_key = d->priv_key;
++}
++
++static inline const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x)
++{
++ return x->cert_info->extensions;
++}
++
++static inline int X509_up_ref(X509 *x)
++{
++ return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
++}
++
++static inline STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v)
++{
++ return v->objs;
++}
++
++static inline int X509_OBJECT_get_type(const X509_OBJECT *a)
++{
++ return a->type;
++}
++
++static inline X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a)
++{
++ if (a == NULL || a->type != X509_LU_X509)
++ return NULL;
++ return a->data.x509;
++}
++
++#endif
++
+ #endif
+
+--- libsrc/Wi/xmlenc_algos.c
++++ libsrc/Wi/xmlenc_algos.c
+@@ -1149,7 +1149,7 @@ int
+ dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
+ {
+ unsigned char * data;
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+ unsigned char key_data[32 * 8];
+ unsigned char md [SHA256_DIGEST_LENGTH + 1];
+ unsigned char md64 [SHA256_DIGEST_LENGTH * 2 + 1];
+@@ -1182,7 +1182,9 @@ dsig_hmac_sha256_digest (dk_session_t *
+ default:
+ return 0;
+ }
+-
++ ctx = HMAC_CTX_new();
++ if (!ctx)
++ return 0;
+
+ data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
+ CATCH_READ_FAIL (ses_in)
+@@ -1192,14 +1194,15 @@ dsig_hmac_sha256_digest (dk_session_t *
+ FAILED
+ {
+ dk_free_box ((box_t) data);
++ HMAC_CTX_free(ctx);
+ return 0;
+ }
+ END_READ_FAIL (ses_in);
+
+- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
+- HMAC_Update(&ctx, data, len);
+- HMAC_Final(&ctx, md, &hmac_len);
+- HMAC_cleanup(&ctx);
++ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
++ HMAC_Update(ctx, data, len);
++ HMAC_Final(ctx, md, &hmac_len);
++ HMAC_CTX_free(ctx);
+
+ if (hmac_len != SHA256_DIGEST_LENGTH)
+ GPF_T;
+@@ -1220,7 +1223,7 @@ dsig_hmac_sha256_digest (dk_session_t *
+ int
+ dsig_hmac_sha256_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
+ {
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+ unsigned char * data;
+ unsigned char key_data[3 * 8];
+ unsigned char md [SHA256_DIGEST_LENGTH + 1];
+@@ -1249,6 +1252,9 @@ dsig_hmac_sha256_verify (dk_session_t *
+ return 0;
+ }
+
++ ctx = HMAC_CTX_new();
++ if (!ctx)
++ return 0;
+
+ data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
+ CATCH_READ_FAIL (ses_in)
+@@ -1258,14 +1264,15 @@ dsig_hmac_sha256_verify (dk_session_t *
+ FAILED
+ {
+ dk_free_box ((box_t) data);
++ HMAC_CTX_free(ctx);
+ return 0;
+ }
+ END_READ_FAIL (ses_in);
+
+- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha256 ());
+- HMAC_Update(&ctx, data, len);
+- HMAC_Final(&ctx, md, &hmac_len);
+- HMAC_cleanup(&ctx);
++ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha256 (), NULL);
++ HMAC_Update(ctx, data, len);
++ HMAC_Final(ctx, md, &hmac_len);
++ HMAC_CTX_free(ctx);
+ dk_free_box ((box_t) data);
+
+ len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
+@@ -1586,7 +1593,7 @@ int
+ dsig_hmac_sha1_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
+ {
+ unsigned char * data;
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+ unsigned char key_data[32 * 8];
+ unsigned char md [SHA_DIGEST_LENGTH + 1];
+ unsigned char md64 [SHA_DIGEST_LENGTH * 2 + 1];
+@@ -1620,6 +1627,9 @@ dsig_hmac_sha1_digest (dk_session_t * se
+ return 0;
+ }
+
++ ctx = HMAC_CTX_new();
++ if (!ctx)
++ return 0;
+
+ data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
+ CATCH_READ_FAIL (ses_in)
+@@ -1629,14 +1639,15 @@ dsig_hmac_sha1_digest (dk_session_t * se
+ FAILED
+ {
+ dk_free_box ((box_t) data);
++ HMAC_CTX_free(ctx);
+ return 0;
+ }
+ END_READ_FAIL (ses_in);
+
+- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
+- HMAC_Update(&ctx, data, len);
+- HMAC_Final(&ctx, md, &hmac_len);
+- HMAC_cleanup(&ctx);
++ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
++ HMAC_Update(ctx, data, len);
++ HMAC_Final(ctx, md, &hmac_len);
++ HMAC_CTX_free(ctx);
+
+ if (hmac_len != SHA_DIGEST_LENGTH)
+ GPF_T;
+@@ -1657,7 +1668,7 @@ dsig_hmac_sha1_digest (dk_session_t * se
+ int
+ dsig_hmac_sha1_verify (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t digest)
+ {
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+ unsigned char * data;
+ unsigned char key_data[3 * 8];
+ unsigned char md [SHA_DIGEST_LENGTH + 1];
+@@ -1686,6 +1697,9 @@ dsig_hmac_sha1_verify (dk_session_t * se
+ return 0;
+ }
+
++ ctx = HMAC_CTX_new();
++ if (!ctx)
++ return 0;
+
+ data = (unsigned char *) dk_alloc_box (len, DV_C_STRING);
+ CATCH_READ_FAIL (ses_in)
+@@ -1695,14 +1709,15 @@ dsig_hmac_sha1_verify (dk_session_t * se
+ FAILED
+ {
+ dk_free_box ((box_t) data);
++ HMAC_CTX_free(ctx);
+ return 0;
+ }
+ END_READ_FAIL (ses_in);
+
+- HMAC_Init(&ctx, (void*) key_data , key_len, EVP_sha1 ());
+- HMAC_Update(&ctx, data, len);
+- HMAC_Final(&ctx, md, &hmac_len);
+- HMAC_cleanup(&ctx);
++ HMAC_Init_ex(ctx, (void*) key_data , key_len, EVP_sha1 (), NULL);
++ HMAC_Update(ctx, data, len);
++ HMAC_Final(ctx, md, &hmac_len);
++ HMAC_CTX_free(ctx);
+ dk_free_box ((box_t) data);
+
+ len1 = xenc_encode_base64 ((char *)md, md64, hmac_len);
+@@ -1763,7 +1778,7 @@ int xenc_aes_encryptor (dk_session_t * s
+ caddr_t outbuf_beg;
+ int len;
+ caddr_t encoded_out;
+- EVP_CIPHER_CTX ctx;
++ EVP_CIPHER_CTX *ctx;
+ unsigned char * ivec = &key->ki.aes.iv[0];
+
+ CATCH_READ_FAIL (ses_in)
+@@ -1778,7 +1793,7 @@ int xenc_aes_encryptor (dk_session_t * s
+ END_READ_FAIL (ses_in);
+
+ #if 1
+- EVP_CIPHER_CTX_init(&ctx);
++ ctx = EVP_CIPHER_CTX_new();
+ outbuf_beg = dk_alloc_box (box_length (text) + 16, DV_BIN);
+ memcpy (outbuf_beg, ivec, 16);
+ outbuf = outbuf_beg + 16;
+@@ -1786,20 +1801,19 @@ int xenc_aes_encryptor (dk_session_t * s
+ switch (key->ki.aes.bits)
+ {
+ case 128:
+- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key->ki.aes.k, ivec);
+ break;
+ case 192:
+- EVP_EncryptInit_ex(&ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
++ EVP_EncryptInit_ex(ctx, EVP_aes_192_cbc(), NULL, key->ki.aes.k, ivec);
+ break;
+ case 256:
+- EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
++ EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, key->ki.aes.k, ivec);
+ break;
+ default:
+ GPF_T1 ("Unsupported key size");
+ }
+- if(!EVP_EncryptUpdate(&ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
++ if(!EVP_EncryptUpdate(ctx, (unsigned char *)outbuf, &outlen, (unsigned char *)text, box_length (text)))
+ {
+- EVP_CIPHER_CTX_cleanup(&ctx);
+ dk_free_box (text);
+ dk_free_box (outbuf_beg);
+ xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #2");
+@@ -1812,7 +1826,7 @@ int xenc_aes_encryptor (dk_session_t * s
+ xenc_report_error (t, 500, XENC_ENC_ERR, "AES encryption internal error #3");
+ } */
+ /* outlen += tmplen; */
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_free(ctx);
+
+ #else
+ outbuf_beg = dk_alloc_box (box_length (text) + 16 /* iv */, DV_BIN);
+@@ -2050,6 +2064,7 @@ xenc_rsa_decryptor (dk_session_t * ses_i
+ int len = 0;
+ int keysize;
+ RSA * rsa = key->xek_private_rsa;
++ const BIGNUM *p, *q;
+
+ if (!seslen)
+ {
+@@ -2062,9 +2077,9 @@ xenc_rsa_decryptor (dk_session_t * ses_i
+ xenc_report_error (t, 500 + strlen (key->xek_name), XENC_ENC_ERR, "could not make RSA decryption [key %s is not RSA]", key->xek_name);
+ return 0;
+ }
++ RSA_get0_factors(rsa, &p, &q);
+ if (!rsa ||
+- !rsa->p ||
+- !rsa->q)
++ !p || !q)
+ {
+ if (key->xek_x509_KI)
+ key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
+--- libsrc/util/sslengine.c
++++ libsrc/util/sslengine.c
+@@ -29,7 +29,11 @@
+ int
+ ssl_engine_startup (void)
+ {
+- CRYPTO_malloc_init ();
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined LIBRESSL_VERSION_NUMBER
++ CRYPTO_malloc_init ();
++#else
++ OPENSSL_malloc_init();
++#endif
+ ERR_load_crypto_strings();
+ OpenSSL_add_all_algorithms();
+
+--- libsrc/Wi/http.c
++++ libsrc/Wi/http.c
+@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
+ log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
+ break;
+ }
+- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
++ X509_up_ref(k->xek_x509);
+ tok = strtok_r (NULL, ",", &tok_s);
+ }
+ dk_free_box (str);
+--- libsrc/Dk/Dkernel.c
++++ libsrc/Dk/Dkernel.c
+@@ -5280,7 +5280,11 @@ ssl_server_init ()
+ }
+ #endif
+
+- SSLeay_add_all_algorithms ();
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++ SSLeay_add_all_algorithms();
++#else
++ OpenSSL_add_all_algorithms();
++#endif
+ PKCS12_PBE_add (); /* stub */
+
+ #ifdef NO_THREAD
diff --git a/srcpkgs/virtuoso/patches/ssl1.1_more.patch b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
new file mode 100644
index 00000000000..c494297ec6d
--- /dev/null
+++ b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
@@ -0,0 +1,20 @@
+Description: Comment unknown definition in ssl1.1 - please review!
+Author: Andreas Tille <tille@debian.org>
+Bug-Debian: https://bugs.debian.org/828594
+Last-Update: Mo 11. Feb 13:50:17 CET 2019
+
+--- libsrc/Dk/Dkernel.c
++++ libsrc/Dk/Dkernel.c
+@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
+ else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
+ opt = SSL_PROTOCOL_TLSV1_2;
+ #endif
++/*
+ #if defined (SSL_OP_NO_TLSv1_3)
+ else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
+ opt = SSL_PROTOCOL_TLSV1_3;
+ #endif
++*/
+ else if (!strcasecmp (name, "ALL"))
+ opt = SSL_PROTOCOL_ALL;
+ else
From fca1d8b054b78a626ca738449cf076e0b1ac299b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 19:35:28 +0100
Subject: [PATCH 599/634] turbovnc: Update LibreSSL patch to not break OpenSSL
---
srcpkgs/turbovnc/patches/fix-libressl.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
index 0584ff6a858..f63c1a82c6e 100644
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ b/srcpkgs/turbovnc/patches/fix-libressl.patch
@@ -5,7 +5,7 @@
#define __RFB_H__
+/* Fix for libressl */
-+#ifndef OPENSSL_INIT_SETTINGS
++#ifdef LIBRESSL_VERSION_NUMBER
+#define OPENSSL_INIT_SETTINGS void
+#endif
From 8db5c8faa17156df170200e727f622042afc2dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 3 Feb 2021 18:57:58 +0100
Subject: [PATCH 600/634] osm2pgsql: update to 1.4.1.
---
srcpkgs/osm2pgsql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index fdbdc30bf7c..56b9dfe075e 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
-version=1.4.0
+version=1.4.1
revision=1
build_style=cmake
hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
license="GPL-3.0-or-later"
homepage="https://osm2pgsql.org"
distfiles="https://github.com/openstreetmap/${pkgname}/archive/${version}.tar.gz"
-checksum=403e25a0310d088183a868d80e5325dceee88617d0df570056e50a2930905369
+checksum=33c4817dceed99764b089ead0e8e2f67c4c6675e761772339b635800970e66e2
From de80f3cc5f0ccd3da6873636f285d628dc7e97ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 15:45:03 -0300
Subject: [PATCH 601/634] manpages-pt-br: fix update file.
Should ignore pre-releases.
---
srcpkgs/manpages-pt-br/update | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/manpages-pt-br/update b/srcpkgs/manpages-pt-br/update
index 43c7e78b44e..f8d78a09457 100644
--- a/srcpkgs/manpages-pt-br/update
+++ b/srcpkgs/manpages-pt-br/update
@@ -1,2 +1,3 @@
pkgname=manpages-l10n
site="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/tags"
+ignore="*pre*"
From 991aec23a4156f3a070c315a9444eccdce8e1116 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 20:34:12 +0100
Subject: [PATCH 602/634] ugrep: update to 3.1.7.
AVX2 support is checked at runtime, so safe to enable.
---
srcpkgs/ugrep/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index ca570f52187..31f08f28e94 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,13 +1,16 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.1.6
+version=3.1.7
revision=1
build_style=gnu-configure
-configure_args="--disable-avx"
makedepends="bzip2-devel liblz4-devel liblzma-devel pcre2-devel zlib-devel"
short_desc="Ultra fast grep with interactive query UI"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=5e494bccabebfa91b4ac34b0c44ac6e36fe8604e78ef4b22c099f68e82e32e35
+checksum=1b9fed98ea97992c98c9ca0d409da0c1f89bf54fd410ddbfdee1c57e01d4a85a
+
+post_install() {
+ vlicense LICENSE.txt LICENSE
+}
From 11da2ff4b512cddb30801fc38e83bed9afe37821 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 15:33:38 +0100
Subject: [PATCH 603/634] busybox: fix tests.
---
srcpkgs/busybox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 707dac57d2d..c7c2e9ebbb9 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -87,7 +87,7 @@ do_check() {
cp src/scripts/echo.c "${t}/scripts"
# Run the testsuite
(
- cd "${t}"
+ cd "${t}/testsuite"
SKIP_KNOWN_BUGS=yes ./runtest -v
)
done
From e84551a5acff5cde77e7ff3fe9b67d1d0f8053f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 14:25:20 +0100
Subject: [PATCH 604/634] busybox: add more applets to busybox-huge.
---
srcpkgs/busybox/files/dotconfig.d/huge.patch | 421 +++++++++++++++++++
srcpkgs/busybox/template | 4 +-
2 files changed, 423 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/busybox/files/dotconfig.d/huge.patch
diff --git a/srcpkgs/busybox/files/dotconfig.d/huge.patch b/srcpkgs/busybox/files/dotconfig.d/huge.patch
new file mode 100644
index 00000000000..1ef1465cffd
--- /dev/null
+++ b/srcpkgs/busybox/files/dotconfig.d/huge.patch
@@ -0,0 +1,421 @@
+@@ -93,7 +93,7 @@
+ CONFIG_PASSWORD_MINLEN=6
+ CONFIG_MD5_SMALL=1
+ CONFIG_SHA3_SMALL=1
+-# CONFIG_FEATURE_FAST_TOP is not set
++CONFIG_FEATURE_FAST_TOP=y
+ # CONFIG_FEATURE_ETC_NETWORKS is not set
+ # CONFIG_FEATURE_ETC_SERVICES is not set
+ CONFIG_FEATURE_EDITING=y
+@@ -124,7 +124,7 @@
+ CONFIG_FEATURE_USE_SENDFILE=y
+ CONFIG_FEATURE_COPYBUF_KB=4
+ CONFIG_FEATURE_SKIP_ROOTFS=y
+-# CONFIG_MONOTONIC_SYSCALL is not set
++CONFIG_MONOTONIC_SYSCALL=y
+ # CONFIG_IOCTL_HEX2STR_ERROR is not set
+ # CONFIG_FEATURE_HWIB is not set
+
+@@ -158,9 +158,9 @@
+ CONFIG_BZIP2=y
+ CONFIG_BZIP2_SMALL=8
+ CONFIG_FEATURE_BZIP2_DECOMPRESS=y
+-# CONFIG_CPIO is not set
+-# CONFIG_FEATURE_CPIO_O is not set
+-# CONFIG_FEATURE_CPIO_P is not set
++CONFIG_CPIO=y
++CONFIG_FEATURE_CPIO_O=y
++CONFIG_FEATURE_CPIO_P=y
+ # CONFIG_DPKG is not set
+ # CONFIG_DPKG_DEB is not set
+ CONFIG_GZIP=y
+@@ -191,7 +191,7 @@
+ CONFIG_FEATURE_UNZIP_BZIP2=y
+ CONFIG_FEATURE_UNZIP_LZMA=y
+ CONFIG_FEATURE_UNZIP_XZ=y
+-# CONFIG_FEATURE_LZMA_FAST is not set
++CONFIG_FEATURE_LZMA_FAST=y
+
+ #
+ # Coreutils
+@@ -205,7 +205,7 @@
+ CONFIG_CHOWN=y
+ CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
+ CONFIG_CHROOT=y
+-# CONFIG_CKSUM is not set
++CONFIG_CKSUM=y
+ CONFIG_COMM=y
+ CONFIG_CP=y
+ CONFIG_FEATURE_CP_LONG_OPTIONS=y
+@@ -213,11 +213,11 @@
+ CONFIG_CUT=y
+ CONFIG_DATE=y
+ CONFIG_FEATURE_DATE_ISOFMT=y
+-# CONFIG_FEATURE_DATE_NANO is not set
++CONFIG_FEATURE_DATE_NANO=y
+ CONFIG_FEATURE_DATE_COMPAT=y
+ CONFIG_DD=y
+ CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
++CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+ CONFIG_FEATURE_DD_IBS_OBS=y
+ CONFIG_FEATURE_DD_STATUS=y
+ CONFIG_DF=y
+@@ -267,7 +266,7 @@
+ #
+ # Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
+ #
+-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
++CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+ CONFIG_MKDIR=y
+ CONFIG_MKFIFO=y
+ CONFIG_MKNOD=y
+@@ -313,7 +313,7 @@
+ CONFIG_TEST1=y
+ CONFIG_TEST2=y
+ CONFIG_FEATURE_TEST_64=y
+-# CONFIG_TIMEOUT is not set
++CONFIG_TIMEOUT=y
+ CONFIG_TOUCH=y
+ CONFIG_FEATURE_TOUCH_NODEREF=y
+ CONFIG_FEATURE_TOUCH_SUSV3=y
+@@ -328,7 +328,7 @@
+ CONFIG_BB_ARCH=y
+ CONFIG_UNIQ=y
+ CONFIG_UNLINK=y
+-# CONFIG_USLEEP is not set
++CONFIG_USLEEP=y
+ CONFIG_UUDECODE=y
+ CONFIG_BASE64=y
+ CONFIG_UUENCODE=y
+@@ -371,7 +371,7 @@
+ # CONFIG_FEATURE_LOADFONT_PSF2 is not set
+ # CONFIG_FEATURE_LOADFONT_RAW is not set
+ CONFIG_LOADKMAP=y
+-# CONFIG_OPENVT is not set
++CONFIG_OPENVT=y
+ CONFIG_RESET=y
+ # CONFIG_RESIZE is not set
+ # CONFIG_FEATURE_RESIZE_PRINT is not set
+@@ -543,7 +543,7 @@
+ #
+ CONFIG_CHATTR=y
+ # CONFIG_FSCK is not set
+-# CONFIG_LSATTR is not set
++CONFIG_LSATTR=y
+ # CONFIG_TUNE2FS is not set
+
+ #
+@@ -586,7 +586,7 @@
+ CONFIG_BLKID=y
+ CONFIG_FEATURE_BLKID_TYPE=y
+ # CONFIG_BLOCKDEV is not set
+-# CONFIG_CAL is not set
++CONFIG_CAL=y
+ # CONFIG_CHRT is not set
+ CONFIG_DMESG=y
+ CONFIG_FEATURE_DMESG_PRETTY=y
+@@ -639,13 +639,13 @@
+ CONFIG_FEATURE_MDEV_DAEMON=y
+ # CONFIG_MESG is not set
+ # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
+-# CONFIG_MKE2FS is not set
+-# CONFIG_MKFS_EXT2 is not set
++CONFIG_MKE2FS=y
++CONFIG_MKFS_EXT2=y
+ # CONFIG_MKFS_MINIX is not set
+ # CONFIG_FEATURE_MINIX2 is not set
+ # CONFIG_MKFS_REISER is not set
+-# CONFIG_MKDOSFS is not set
+-# CONFIG_MKFS_VFAT is not set
++CONFIG_MKDOSFS=y
++CONFIG_MKFS_VFAT=y
+ CONFIG_MKSWAP=y
+ CONFIG_FEATURE_MKSWAP_UUID=y
+ CONFIG_MORE=y
+@@ -654,24 +654,24 @@
+ CONFIG_FEATURE_MOUNT_VERBOSE=y
+ CONFIG_FEATURE_MOUNT_HELPERS=y
+ CONFIG_FEATURE_MOUNT_LABEL=y
+-CONFIG_FEATURE_MOUNT_NFS=n
++# CONFIG_FEATURE_MOUNT_NFS is not set
+ CONFIG_FEATURE_MOUNT_CIFS=y
+ CONFIG_FEATURE_MOUNT_FLAGS=y
+ CONFIG_FEATURE_MOUNT_FSTAB=y
+ CONFIG_FEATURE_MOUNT_OTHERTAB=y
+-# CONFIG_MOUNTPOINT is not set
++CONFIG_MOUNTPOINT=y
+ # CONFIG_NOLOGIN is not set
+ # CONFIG_NOLOGIN_DEPENDENCIES is not set
+ CONFIG_NSENTER=y
+ CONFIG_PIVOT_ROOT=y
+-# CONFIG_RDATE is not set
++CONFIG_RDATE=y
+ # CONFIG_RDEV is not set
+ # CONFIG_READPROFILE is not set
+ CONFIG_RENICE=y
+-# CONFIG_REV is not set
++CONFIG_REV=y
+ # CONFIG_RTCWAKE is not set
+-# CONFIG_SCRIPT is not set
+-# CONFIG_SCRIPTREPLAY is not set
++CONFIG_SCRIPT=y
++CONFIG_SCRIPTREPLAY=y
+ CONFIG_SETARCH=y
+ CONFIG_LINUX32=y
+ CONFIG_LINUX64=y
+@@ -686,8 +686,8 @@
+ CONFIG_SWAPOFF=y
+ CONFIG_FEATURE_SWAPONOFF_LABEL=y
+ CONFIG_SWITCH_ROOT=y
+-# CONFIG_TASKSET is not set
+-# CONFIG_FEATURE_TASKSET_FANCY is not set
++CONFIG_TASKSET=y
++CONFIG_FEATURE_TASKSET_FANCY=y
+ CONFIG_UEVENT=y
+ CONFIG_UMOUNT=y
+ CONFIG_FEATURE_UMOUNT_ALL=y
+@@ -737,7 +737,12 @@
+ # CONFIG_ADJTIMEX is not set
+ # CONFIG_BBCONFIG is not set
+ # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+-# CONFIG_BC is not set
++CONFIG_BC=y
++CONFIG_DC=y
++CONFIG_FEATURE_DC_BIG=y
++# CONFIG_FEATURE_DC_LIBM is not set
++CONFIG_FEATURE_BC_INTERACTIVE=y
++CONFIG_FEATURE_BC_LONG_OPTIONS=y
+ # CONFIG_BEEP is not set
+ CONFIG_FEATURE_BEEP_FREQ=0
+ CONFIG_FEATURE_BEEP_LENGTH_MS=0
+@@ -756,9 +761,6 @@
+ # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set
+ CONFIG_FEATURE_CROND_DIR=""
+ # CONFIG_CRONTAB is not set
+-CONFIG_DC=y
+-# CONFIG_FEATURE_DC_BIG is not set
+-CONFIG_FEATURE_DC_LIBM=y
+ # CONFIG_DEVFSD is not set
+ # CONFIG_DEVFSD_MODLOAD is not set
+ # CONFIG_DEVFSD_FG_NP is not set
+@@ -802,7 +804,7 @@
+ # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+ # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+ # CONFIG_MAN is not set
+-# CONFIG_MICROCOM is not set
++CONFIG_MICROCOM=y
+ # CONFIG_MT is not set
+ # CONFIG_NANDWRITE is not set
+ # CONFIG_NANDDUMP is not set
+@@ -813,7 +815,7 @@
+ # CONFIG_RUNLEVEL is not set
+ # CONFIG_RX is not set
+ CONFIG_SETFATTR=y
+-# CONFIG_SETSERIAL is not set
++CONFIG_SETSERIAL=y
+ CONFIG_STRINGS=y
+ CONFIG_TIME=y
+ CONFIG_TS=y
+@@ -836,20 +838,20 @@
+ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+ # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+ # CONFIG_FEATURE_TLS_SHA1 is not set
+-# CONFIG_ARP is not set
+-# CONFIG_ARPING is not set
++CONFIG_ARP=y
++CONFIG_ARPING=y
+ CONFIG_BRCTL=y
+ CONFIG_FEATURE_BRCTL_FANCY=y
+ CONFIG_FEATURE_BRCTL_SHOW=y
+ # CONFIG_DNSD is not set
+-# CONFIG_ETHER_WAKE is not set
+-# CONFIG_FTPD is not set
+-# CONFIG_FEATURE_FTPD_WRITE is not set
+-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+-# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
+-# CONFIG_FTPGET is not set
+-# CONFIG_FTPPUT is not set
+-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
++CONFIG_ETHER_WAKE=y
++CONFIG_FTPD=y
++CONFIG_FEATURE_FTPD_WRITE=y
++CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
++CONFIG_FEATURE_FTPD_AUTHENTICATION=y
++CONFIG_FTPGET=y
++CONFIG_FTPPUT=y
++CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+ CONFIG_HOSTNAME=y
+ CONFIG_DNSDOMAINNAME=y
+ CONFIG_HTTPD=y
+@@ -880,12 +882,12 @@
+ # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+ # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+ # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+-# CONFIG_INETD is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
++CONFIG_INETD=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+ # CONFIG_FEATURE_INETD_RPC is not set
+ CONFIG_IP=y
+ CONFIG_IPADDR=y
+@@ -906,11 +908,11 @@
+ # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+ # CONFIG_FEATURE_IPCALC_FANCY is not set
+ # CONFIG_FAKEIDENTD is not set
+-# CONFIG_NAMEIF is not set
+-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+-# CONFIG_NBDCLIENT is not set
++CONFIG_NAMEIF=y
++CONFIG_FEATURE_NAMEIF_EXTENDED=y
++CONFIG_NBDCLIENT=y
+ CONFIG_NC=y
+-# CONFIG_NETCAT is not set
++CONFIG_NETCAT=y
+ CONFIG_NC_SERVER=y
+ CONFIG_NC_EXTRA=y
+ # CONFIG_NC_110_COMPAT is not set
+@@ -928,13 +930,13 @@
+ CONFIG_PING6=y
+ CONFIG_FEATURE_FANCY_PING=y
+ # CONFIG_PSCAN is not set
+-# CONFIG_ROUTE is not set
++CONFIG_ROUTE=y
+ # CONFIG_SLATTACH is not set
+ CONFIG_SSL_CLIENT=y
+ CONFIG_TC=y
+ CONFIG_FEATURE_TC_INGRESS=y
+-# CONFIG_TCPSVD is not set
+-# CONFIG_UDPSVD is not set
++CONFIG_TCPSVD=y
++CONFIG_UDPSVD=y
+ CONFIG_TELNET=y
+ CONFIG_FEATURE_TELNET_TTYPE=y
+ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+@@ -942,20 +944,21 @@
+ # CONFIG_TELNETD is not set
+ # CONFIG_FEATURE_TELNETD_STANDALONE is not set
+ # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+-# CONFIG_TFTP is not set
+-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+-# CONFIG_TFTPD is not set
+-# CONFIG_FEATURE_TFTP_GET is not set
+-# CONFIG_FEATURE_TFTP_PUT is not set
+-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
++CONFIG_TFTP=y
++CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
++CONFIG_FEATURE_TFTP_HPA_COMPAT=y
++CONFIG_TFTPD=y
++CONFIG_FEATURE_TFTP_GET=y
++CONFIG_FEATURE_TFTP_PUT=y
++CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+ # CONFIG_TFTP_DEBUG is not set
+ CONFIG_TLS=y
+-# CONFIG_TRACEROUTE is not set
+-# CONFIG_TRACEROUTE6 is not set
+-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+-# CONFIG_TUNCTL is not set
+-# CONFIG_FEATURE_TUNCTL_UG is not set
++CONFIG_TRACEROUTE=y
++CONFIG_TRACEROUTE6=y
++CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
++CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
++CONFIG_TUNCTL=y
++CONFIG_FEATURE_TUNCTL_UG=y
+ # CONFIG_VCONFIG is not set
+ CONFIG_WGET=y
+ CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+@@ -966,21 +969,21 @@
+ CONFIG_FEATURE_WGET_OPENSSL=y
+ CONFIG_WHOIS=y
+ # CONFIG_ZCIP is not set
+-# CONFIG_UDHCPD is not set
++CONFIG_UDHCPD=y
+ # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+-CONFIG_DHCPD_LEASES_FILE=""
++CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
++CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+ # CONFIG_DUMPLEASES is not set
+ # CONFIG_DHCPRELAY is not set
+ CONFIG_UDHCPC=y
+ CONFIG_FEATURE_UDHCPC_ARPING=y
+ CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
+ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+-# CONFIG_UDHCPC6 is not set
+-# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
+-# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
+-# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
+-# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
++CONFIG_UDHCPC6=y
++CONFIG_FEATURE_UDHCPC6_RFC3646=y
++CONFIG_FEATURE_UDHCPC6_RFC4704=y
++CONFIG_FEATURE_UDHCPC6_RFC4833=y
++CONFIG_FEATURE_UDHCPC6_RFC5970=y
+
+ #
+ # Common options for DHCP applets
+@@ -1002,13 +1005,13 @@
+ #
+ # Mail Utilities
+ #
+-# CONFIG_MAKEMIME is not set
++CONFIG_MAKEMIME=y
+ # CONFIG_POPMAILDIR is not set
+ # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+-# CONFIG_REFORMIME is not set
+-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+-# CONFIG_SENDMAIL is not set
+-CONFIG_FEATURE_MIME_CHARSET=""
++CONFIG_REFORMIME=y
++CONFIG_FEATURE_REFORMIME_COMPAT=y
++CONFIG_SENDMAIL=y
++CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+
+ #
+ # Process Utilities
+@@ -1021,7 +1024,7 @@
+ CONFIG_KILLALL5=y
+ CONFIG_LSOF=y
+ CONFIG_MPSTAT=y
+-# CONFIG_NMETER is not set
++CONFIG_NMETER=y
+ CONFIG_PGREP=y
+ CONFIG_PKILL=y
+ CONFIG_PIDOF=y
+@@ -1037,7 +1040,7 @@
+ CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y
+ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
+ CONFIG_PSTREE=y
+-# CONFIG_PWDX is not set
++CONFIG_PWDX=y
+ # CONFIG_SMEMCAP is not set
+ CONFIG_BB_SYSCTL=y
+ CONFIG_TOP=y
+@@ -1050,7 +1053,7 @@
+ CONFIG_FEATURE_TOPMEM=y
+ CONFIG_UPTIME=y
+ # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+-# CONFIG_WATCH is not set
++CONFIG_WATCH=y
+ CONFIG_FEATURE_SHOW_THREADS=y
+
+ #
+@@ -1068,7 +1071,7 @@
+ CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
+ # CONFIG_SVC is not set
+ CONFIG_SVOK=y
+-# CONFIG_SVLOGD is not set
++CONFIG_SVLOGD=y
+ # CONFIG_CHCON is not set
+ # CONFIG_GETENFORCE is not set
+ # CONFIG_GETSEBOOL is not set
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index c7c2e9ebbb9..63d7aeb7ceb 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,7 +1,7 @@
# Template file for 'busybox'
pkgname=busybox
version=1.31.1
-revision=4
+revision=5
hostmakedepends="perl"
checkdepends="zip"
short_desc="Swiss Army Knife of Embedded Linux"
@@ -60,7 +60,7 @@ do_configure() {
_patch_config busybox udhcpc ntpd
_patch_config busybox-static udhcpc ntpd static
- _patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd
+ _patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd huge
for t in busybox-core busybox busybox-static busybox-huge; do
make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" prepare "${makejobs}"
From d03835c50bc3f41eb38508ac0fc65013f0e94173 Mon Sep 17 00:00:00 2001
From: xolophreny <xolophreny@protonmail.ch>
Date: Thu, 4 Feb 2021 01:00:14 +0500
Subject: [PATCH 605/634] vkBasalt: update to 0.3.2.4
---
srcpkgs/vkBasalt/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/vkBasalt/template b/srcpkgs/vkBasalt/template
index 63661ed4e5b..b7f93dd8803 100644
--- a/srcpkgs/vkBasalt/template
+++ b/srcpkgs/vkBasalt/template
@@ -1,13 +1,13 @@
# Template file for 'vkBasalt'
pkgname=vkBasalt
-version=0.3.2.2
+version=0.3.2.4
revision=1
build_style=meson
hostmakedepends="glslang pkg-config"
-makedepends="libX11-devel"
+makedepends="libX11-devel SPIRV-Headers Vulkan-Headers"
short_desc="Vulkan post-processing layer"
-maintainer="xolophreny <lowranker@protonmail.com>"
+maintainer="xolophreny <xolophreny@protonmail.ch>"
license="Zlib"
homepage="https://github.com/DadSchoorse/vkBasalt"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=dd2c714b3569d5da0bc2f058d85cfc7683c8a9bc6d6255b80b3e968c902e1913
+checksum=f45d513d9f212e9a1e1ec49448e72c5f2510d62303c38fdb5015b9a3afd42b26
From e048caa2faba7f3a1fb17ea053fab33f5ce8e1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 16:00:43 -0300
Subject: [PATCH 606/634] horizon: update to 1.4.0.
Also add changelog.
---
srcpkgs/horizon/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 7daf6b6154d..95e87bf0b75 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
build_style=gnu-makefile
make_build_args="GOLD="
make_use_env=yes
@@ -13,8 +13,9 @@ short_desc="Free EDA package"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-only"
homepage="https://horizon-eda.org/"
+changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md"
distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz"
-checksum=407ae0022d354d173dc9f75549c68f4d26c195375c28a41ea7c6edee6bfd9bab
+checksum=a0fbbbca903594975dd468af10581be8d52256ad441e7f8c71d1e70b341dbfe4
if [ "$CROSS_BUILD" ]; then
make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"
From f213812ca69e5c051af6862122a029db3b65bedc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 3 Feb 2021 18:48:43 +0200
Subject: [PATCH 607/634] doctest: update to 2.4.5.
---
srcpkgs/doctest/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/doctest/template b/srcpkgs/doctest/template
index 16538dd2c69..cd1e36e7912 100644
--- a/srcpkgs/doctest/template
+++ b/srcpkgs/doctest/template
@@ -1,6 +1,6 @@
# Template file for 'doctest'
pkgname=doctest
-version=2.4.4
+version=2.4.5
revision=1
build_style=cmake
short_desc="Doctest C++ testing framework"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/onqtam/doctest"
changelog="https://raw.githubusercontent.com/onqtam/doctest/master/CHANGELOG.md"
distfiles="https://github.com/onqtam/doctest/archive/${version}.tar.gz"
-checksum=3bcb62ad316bf4230873a336fcc6eb6292116568a6e19ab8cdd37a1610773d70
+checksum=b76ece19f0e473e3afa5c545dbdce2dd70bfef98ed0f383443b2f9fd9f86d5b4
post_install() {
vlicense LICENSE.txt
From 088ebf93147c861bf6e6ef91af7c5c712b8092cb Mon Sep 17 00:00:00 2001
From: Felix Kleinschmidt <fk@bsrd.io>
Date: Wed, 3 Feb 2021 09:54:08 -0300
Subject: [PATCH 608/634] keepassxc: update to 2.6.4.
Also fix changelog.
Closes: #28430 [via git-merge-pr]
---
srcpkgs/keepassxc/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index d110e2fd043..54c33553b87 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
-version=2.6.3
-revision=2
+version=2.6.4
+revision=1
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
@@ -23,9 +23,9 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
LGPL-3.0-or-later, Nokia-Qt-exception-1.1, MIT, BSL-1.0"
homepage="https://keepassxc.org/"
-changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/blob/${version}/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/blob/develop/CHANGELOG.md"
distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz"
-checksum=e7e0b6ed8f3881c5b9579074bc3cde3991b28c1a3d1c852c46f2b7930a10f7d1
+checksum=e536e2a71c90fcf264eb831fb1a8b518ee1b03829828f862eeea748d3310f82b
# https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46
build_options="autotype browser fdosecrets keeshare network sshagent yubikey"
From dd78f5fa20c84a55bc2adfee5d31ad18a2841255 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Wed, 3 Feb 2021 06:34:12 +1100
Subject: [PATCH 609/634] libopenmpt: update to 0.5.5 - remove obsolete build
options - make PortAudio a build option - build with SDL2 by default - add
option descriptions
---
srcpkgs/libopenmpt/template | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 9b82c7e90b2..55e49689fef 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,33 +1,31 @@
# Template file for 'libopenmpt'
pkgname=libopenmpt
-version=0.5.4
+version=0.5.5
revision=1
wrksrc="libopenmpt-${version}+release.autotools"
build_style=gnu-configure
-configure_args="$(vopt_with pulseaudio)
- $(vopt_with sdl) $(vopt_with sdl2)
- $(vopt_enable libopenmpt_modplug) $(vopt_enable libmodplug)"
+configure_args="$(vopt_with pulseaudio) $(vopt_with sdl2)
+ $(vopt_with portaudio) $(vopt_with portaudio portaudiocpp)"
hostmakedepends="pkg-config"
-makedepends="zlib-devel mpg123-devel libogg-devel libvorbis-devel
- portaudio-devel portaudio-cpp-devel libsndfile-devel libflac-devel
+makedepends="zlib-devel libsndfile-devel
+ libflac-devel mpg123-devel libogg-devel libvorbis-devel
$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if sdl SDL-devel)"
+ $(vopt_if portaudio portaudio-cpp-devel)"
short_desc="Cross-platform C & C++ library to decode tracked music files (modules)"
maintainer="a dinosaur <nick@a-dinosaur.com>"
license="BSD-3-Clause"
homepage="https://lib.openmpt.org/libopenmpt/"
distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=f34d06b9daa7bca111625369e5bbc2e7c0e0e04737a439b0e6320811babcef40
-conflicts="$(vopt_if libmodplug libmodplug)"
+checksum=f1e01483ebf1a680d9ec030c9af20f5f2a5ac0f1e0642c18bd5593cfaa9ceb6b
post_install() {
vlicense LICENSE
}
# Package build options
-build_options="pulseaudio sdl2 sdl libopenmpt_modplug libmodplug"
-build_options_default="pulseaudio"
-vopt_conflict sdl2 sdl
+build_options="pulseaudio sdl2 portaudio"
+build_options_default="pulseaudio sdl2 portaudio"
+desc_option_portaudio="Enable support for the PortAudio backend"
libopenmpt-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
From b1532ffcb1f3b7619eca91f6a8d1a742296bec9f Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 4 Nov 2020 15:11:11 +0100
Subject: [PATCH 610/634] prometheus: update to 2.24.1
---
srcpkgs/prometheus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2de044b8fe8..dcc9ddd2802 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,6 +1,6 @@
# Template file for 'prometheus'
pkgname=prometheus
-version=2.21.0
+version=2.24.1
revision=1
build_style=go
go_import_path="github.com/prometheus/prometheus"
@@ -16,8 +16,9 @@ short_desc="Monitoring system and time series database"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="Apache-2.0"
homepage="https://prometheus.io/"
+changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=afafed1be631a53ada60e2b2f12cfdb51dcaee5e539fb65e9983f3276c99f5af
+checksum=9e08bacde869c6c4b68a9e34c7074b812be1391b33d033d3072a5e1ad2debd87
system_accounts="_prometheus"
@@ -28,7 +29,6 @@ pre_build() {
}
post_install() {
- vlicense LICENSE
vlicense NOTICE
vmkdir etc/prometheus
vmkdir usr/share/doc/prometheus
From 3a30b22d5d91232c141879012877df9e642b81a1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 3 Feb 2021 16:24:49 -0500
Subject: [PATCH 611/634] build-style/python3-pep517: make sure ./build exists
in do_install
This allows templates to override do_build and not have to create the
build subdirectory used as TMPDIR in do_install; failure to create this
directory will cause pip to use (and pollute) /tmp in the masterdir.
---
common/build-style/python3-pep517.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index 1a3c6d31eed..4051185a28e 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -25,6 +25,8 @@ do_install() {
# As with do_build, no need to accommodate cross compilation here
: ${make_install_target:=${pkgname#python3-}-${version}-*-*-*.whl}
+ # If do_build was overridden, make sure the TMPDIR exists
+ mkdir -p build
TMPDIR=build python3 -m pip install --use-pep517 --prefix /usr \
--root ${DESTDIR} --no-deps --no-build-isolation \
--no-clean ${make_install_args} ${make_install_target}
From 72d94ac16dabee737662e8c8bce48c24ef818951 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 23:05:28 +0100
Subject: [PATCH 612/634] fzf: update to 0.25.1.
---
srcpkgs/fzf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 6c43ea9a0be..b0b841a7a6a 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
# Template file for 'fzf'
pkgname=fzf
-version=0.25.0
+version=0.25.1
revision=1
build_style=go
go_import_path="github.com/junegunn/fzf"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/junegunn/fzf"
changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=ccbe13733d692dbc4f0e4c0d40c053cba8d22f309955803692569fb129e42eb0
+checksum=b97cf9ab528391a49dfa45b459c767fb2626ade9f3a3f99d0108d7274f2eca8b
post_install() {
cd ${wrksrc}
From 5c21db1863c322aa26bb802b5e68b12d24dcb8f0 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 Feb 2021 22:14:24 +0000
Subject: [PATCH 613/634] supermin: update to 5.2.1.
---
srcpkgs/supermin/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 0a038892340..ff5304205bc 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
_release_series=5.2-stable
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later"
homepage="http://people.redhat.com/~rjones/supermin/"
distfiles="http://download.libguestfs.org/supermin/${_release_series}/supermin-${version}.tar.gz"
-checksum=fac7e128198b9b05afca99041fa9d5256cc80c1e3cd97eb3130a794b185cf107
+checksum=c45d8479b6da8ea55ca2c4b82b2c8bc7c2e6f724cf59c980df1dec93fb578ffb
nocross=yes
From a5f13756b376892c380c0bbb6875429a6c6c906d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 Feb 2021 22:30:13 +0000
Subject: [PATCH 614/634] terragrunt: update to 0.28.1.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index a7dc8ef4686..2215e7ab727 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.27.3
+version=0.28.1
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/$pkgname"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=a9d2c8457ba532ca2bbf06312a7b1eb34789119af8ee5b867a11a217d3877272
+checksum=d72f24dd94d3ec7112766c0b5defb67863f52d9bb41bd06b707312dcfb11a246
post_install() {
vlicense LICENSE.txt
From 1c42e82971056dc1d2d0043ae34bd18b86ad2944 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Wed, 3 Feb 2021 09:41:07 +1000
Subject: [PATCH 615/634] kops: update to 1.19.0
Closes: #28421 [via git-merge-pr]
---
srcpkgs/kops/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 4959d6aa79c..28d8cee3885 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
# Template file for 'kops'
pkgname=kops
-version=1.15.1
+version=1.19.0
revision=1
archs="x86_64*"
build_wrksrc=src/k8s.io/kops
@@ -18,7 +18,7 @@ do_fetch() {
# process expects the directory to be a git repository
rm -rf $wrksrc
mkdir -p $wrksrc/src/k8s.io
- git clone -b ${version} https://github.com/kubernetes/kops \
+ git clone -b v${version} https://github.com/kubernetes/kops \
$wrksrc/src/k8s.io/kops
}
From 9b3266e91bade74e47afbe8b0b4d1efb27f7b996 Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Tue, 2 Feb 2021 23:42:05 +0100
Subject: [PATCH 616/634] kdevelop: update to 5.6.2
---
srcpkgs/kdevelop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index e805fed956f..57466b22a5e 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,6 +1,6 @@
# Template file for 'kdevelop'
pkgname=kdevelop
-version=5.6.1
+version=5.6.2
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -18,7 +18,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.kdevelop.org/"
distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9e4488522275ebef9d68eebb68523a99e1c58d35e8d75127f7d749784c2e370a
+checksum=0f86bc3fe53f761c1e3e3f7544577a0c41433be8bff310cf2e729f76f4363bf6
build_options="webengine"
desc_option_webengine="Use Qt5 WebEngine for documentation"
From c3350897b8c76924bd15162e120970fc5d76e153 Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Wed, 3 Feb 2021 21:50:14 +0100
Subject: [PATCH 617/634] kdevelop-python: update to 5.6.2
---
srcpkgs/kdevelop-python/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template
index d3aec9f4cdf..6d2f53fd0e6 100644
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@@ -1,6 +1,6 @@
# Template file for 'kdevelop-python'
pkgname=kdevelop-python
-version=5.6.1
+version=5.6.2
revision=1
wrksrc="kdev-python-${version}"
build_style=cmake
@@ -16,7 +16,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://www.kdevelop.org/"
distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-python-${version}.tar.xz"
-checksum=00d5db9596b7db9a6dd109fd3605dc155ac849b1b88328e038d4cf7b7fd575f3
+checksum=20f9b771b961262ded986a4f32b8d259ad9f7bc48bb29eac0a5d5853be1d917f
python_version=3
post_install() {
From 1a2c6262932e8c1c7acf5cf054c3a941997b4449 Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Wed, 3 Feb 2021 21:51:15 +0100
Subject: [PATCH 618/634] kdevelop-php: update to 5.6.2
---
srcpkgs/kdevelop-php/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template
index f54a9dd7c9c..e31d301d7b0 100644
--- a/srcpkgs/kdevelop-php/template
+++ b/srcpkgs/kdevelop-php/template
@@ -1,6 +1,6 @@
# Template file for 'kdevelop-php'
pkgname=kdevelop-php
-version=5.6.1
+version=5.6.2
revision=1
wrksrc="kdev-php-${version}"
build_style=cmake
@@ -15,4 +15,4 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://www.kdevelop.org/"
distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-php-${version}.tar.xz"
-checksum=702f12a1ad0caadd020ac30294b70ec6426e7961ac439d270f3010748b3f7a5a
+checksum=f1083daec2b8c752de1a0441d0f9f72274b1e2d29c723005ed78dcf8ba717e0c
From 25f43e74a655f7c60f7a03fc74f88c32bd80c1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 22:31:54 -0300
Subject: [PATCH 619/634] COPYING: move to 2021.
---
COPYING | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/COPYING b/COPYING
index ec7edd5ca70..dd28569f0cb 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
Copyright (c) 2008-2020 Juan Romero Pardines and contributors
- Copyright (c) 2017-2020 The Void Linux team and contributors
+ Copyright (c) 2017-2021 The Void Linux team and contributors
All rights reserved.
Redistribution and use in source and binary forms, with or without
From 1f51e5f2a3c01623abf7bb3af5b63196e4abf460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 21:03:42 +0700
Subject: [PATCH 620/634] evolution-data-server: update to 3.38.3, enable gir
on cross
---
.../files/disableRuntimeTests.cmake | 45 -------------------
.../files/iconv-detect.h | 5 ---
.../evolution-data-server/patches/gir.patch | 11 +++++
srcpkgs/evolution-data-server/template | 45 +++++++------------
4 files changed, 28 insertions(+), 78 deletions(-)
delete mode 100644 srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
delete mode 100644 srcpkgs/evolution-data-server/files/iconv-detect.h
create mode 100644 srcpkgs/evolution-data-server/patches/gir.patch
diff --git a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake b/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
deleted file mode 100644
index 8be55b42070..00000000000
--- a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-# This file was generated by CMake because it detected TRY_RUN() commands
-# in crosscompiling mode. It will be overwritten by the next CMake run.
-# Copy it to a safe location, set the variables to appropriate values
-# and use it then to preset the CMake cache (using -C).
-
-
-# _correct_iconv_EXITCODE
-# indicates whether the executable would have been able to run on its
-# target platform. If so, set _correct_iconv_EXITCODE to
-# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
-# The _correct_iconv_COMPILED variable holds the build result for this TRY_RUN().
-#
-# Source file : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c
-# Executable : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_315ee-_correct_iconv_EXITCODE
-# Run arguments :
-# Called from: [2] /usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake
-# [1] /builddir/evolution-data-server-3.26.0/CMakeLists.txt
-
-set( _correct_iconv_EXITCODE
- 0
- CACHE INTERNAL "Result from TRY_RUN" FORCE)
-set(_correct_iconv_EXITCODE__TRYRUN_OUTPUT
- 0
- CACHE INTERNAL "Result from TRY_RUN" FORCE)
-
-
-# HAVE_LKSTRFTIME_EXITCODE
-# indicates whether the executable would have been able to run on its
-# target platform. If so, set HAVE_LKSTRFTIME_EXITCODE to
-# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
-# The HAVE_LKSTRFTIME_COMPILED variable holds the build result for this TRY_RUN().
-#
-# Source file : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c
-# Executable : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_d2897-HAVE_LKSTRFTIME_EXITCODE
-# Run arguments :
-# Called from: [2] /usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake
-# [1] /builddir/evolution-data-server-3.26.0/CMakeLists.txt
-
-set( HAVE_LKSTRFTIME_EXITCODE
- 0
- CACHE INTERNAL "Result from TRY_RUN" FORCE)
-set( HAVE_LKSTRFTIME_EXITCODE__TRYRUN_OUTPUT
- 0
- CACHE INTERNAL "Result from TRY_RUN" FORCE)
-
diff --git a/srcpkgs/evolution-data-server/files/iconv-detect.h b/srcpkgs/evolution-data-server/files/iconv-detect.h
deleted file mode 100644
index 46f476d5bc9..00000000000
--- a/srcpkgs/evolution-data-server/files/iconv-detect.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_D_FORMAT "iso-%d-%d"
-#define ICONV_ISO_S_FORMAT "iso-%d-%s"
-#define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/evolution-data-server/patches/gir.patch b/srcpkgs/evolution-data-server/patches/gir.patch
new file mode 100644
index 00000000000..c6a5832e2a4
--- /dev/null
+++ b/srcpkgs/evolution-data-server/patches/gir.patch
@@ -0,0 +1,11 @@
+--- cmake/modules/GObjectIntrospection.cmake
++++ cmake/modules/GObjectIntrospection.cmake
+@@ -122,7 +122,7 @@
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
+
+ add_custom_command(
+- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
++ COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'"
+ ${INTROSPECTION_SCANNER_ENV}
+ ${G_IR_SCANNER}
+ ${INTROSPECTION_SCANNER_ARGS}
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8ccf9cb6eb0..2c8be82e872 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,12 +1,14 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.38.0
+version=3.38.3
revision=1
build_style=cmake
build_helper="gir qemu"
configure_args="-DENABLE_UOA=OFF
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
$(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
-hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel"
+hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
+ $(vopt_if gir vala)"
makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel
$(vopt_if gir vala-devel)"
@@ -15,47 +17,34 @@ short_desc="Centralized access to appointments and contacts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-36/NEWS"
+changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=13689a7b55765806c4d5f3b05ef6c24b0bf9957b9ed9240c2dd09a2cdb13b0af
+checksum=9732f690b252aa7c0932c761740b5098a19705d1b6e4a5de2fad3a16e57e3ca7
build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="gir"
-fi
+build_options_default="gir"
+
+pre_build() {
+ # Only affect g-ir-scanner, which is fine
+ LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/camel"
+ LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/libebackend"
+ LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/libedataserver"
+ LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/private"
+}
# problematic
do_check() {
:
}
-# cmake perfomrms 2 checks using binary runtime, about iconv and sfrtime.
-# musl (1.1.16) does not support "ISO-2022-JP" encoding (see its roadmap),
-# although evolution-data-server is fine with musl.
-# If crossbuild, cmake let disabling runtime checks via specific directives.
-# test iconv-detect.c also generates iconv-detect.h that is required for build.
-# So completly disable test from iconv-detect.c (cmake.patch file) and
-# use a cmake cache file on crossbuild to disable sfrtime running test.
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" -C disableRuntimeTests.cmake"
-fi
-
-pre_configure() {
- mkdir -p build
- cp ${FILESDIR}/iconv-detect.h ${wrksrc}/build/.
- if [ "$CROSS_BUILD" ]; then
- cp ${FILESDIR}/disableRuntimeTests.cmake ${wrksrc}/build/.
- fi
-}
-
post_install() {
rm -rf ${DESTDIR}/usr/lib/systemd
}
evolution-data-server-devel_package() {
depends="sqlite-devel mit-krb5-devel nss-devel nspr-devel libical-devel
- libldap-devel libgdata-devel>=0.15 libsecret-devel libglib-devel
- libsoup-devel gtk+3-devel libxml2-devel gnome-desktop-devel
+ libgdata-devel>=0.15 libsecret-devel libglib-devel
+ libsoup-devel gtk+3-devel libxml2-devel
${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
From cf1cd120ec1f8880c59978a9f02922f37c3e538c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 21:22:21 +0700
Subject: [PATCH 621/634] evolution: update to 3.38.3.
---
srcpkgs/evolution/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 103eaa8383a..442d4769e52 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,12 +1,13 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.38.0
-revision=2
+version=3.38.3
+revision=1
build_style=cmake
-build_helper="gir qemu"
-configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
+build_helper="qemu"
+configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
-DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON"
-hostmakedepends="gobject-introspection intltool itstool pkg-config glib-devel"
+hostmakedepends="intltool itstool pkg-config glib-devel"
makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
evolution-data-server-devel gspell-devel libcanberra-devel
libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
@@ -18,15 +19,10 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f81cc40f54aa2d059da4f3a94eb09362e81513306c974a41ca7895b9c8957c5d
+checksum=7fac6226c5626f290b4bdeebd85b1e2c822a250ede53998b4970ddb92585dacd
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so"
-build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="gir"
-fi
-
evolution-devel_package() {
depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel
${sourcepkg}>=${version}_${revision}"
From 0c28b19d65d4abdafcccfc7426e4db8341cf8a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 21:27:40 +0700
Subject: [PATCH 622/634] folks: enable gir on cross
---
srcpkgs/folks/template | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index b076b94bea2..0a120ec6d11 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
# Template file for 'folks'
pkgname=folks
version=0.14.0
-revision=1
+revision=2
build_style=meson
build_helper="gir qemu"
configure_args="-Db_lto=false"
@@ -19,9 +19,7 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=d6e778da637d3b33fd9a6b45115e8157d8868211dc08b943d1075b5eb7282bb9
build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="gir"
-fi
+build_options_default="gir"
folks-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From b3b5d83b3e08e35640906615a4a3fca918dea536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 2 Feb 2021 21:34:13 +0700
Subject: [PATCH 623/634] gnome-online-miners: don't have gir
---
srcpkgs/gnome-online-miners/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index 43b21bf5b9c..644ac3558c9 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,12 +1,10 @@
# Template file for 'gnome-online-miners'
pkgname=gnome-online-miners
version=3.34.0
-revision=1
-lib32disabled=yes
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel
- $(vopt_if gir gobject-introspection)"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
makedepends="libzapojit-devel libgdata-devel grilo-devel
tracker-devel gfbgraph-devel gnome-online-accounts-devel"
depends="libzapojit>=0.0.3_3"
@@ -16,8 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
-
-build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="gir"
-fi
+lib32disabled=yes
From 1db8a48c069768dcc1014e1ace44bb943df315be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 3 Feb 2021 22:41:02 -0500
Subject: [PATCH 624/634] build-helper/rust: define HOST_CC and HOST_CFLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The cc-rs crate will try to guess the host compiler and use default
flags these are not specifically set. The default behavior is wrong in
Void cross-compilation environments. Explicitly define HOST_CC=gcc and
use innocuous HOST_CFLAGS=-O2 just to thwart the bad defaults.
Co-authored-by: Érico Rolim <erico.erc@gmail.com>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>
Closes: #28416.
---
common/build-helper/rust.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 6fcd3bd7d9e..431cb5f0fd4 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -17,6 +17,12 @@ if [ "$CROSS_BUILD" ]; then
# [build]
# target = ${RUST_TARGET}
export CARGO_BUILD_TARGET="$RUST_TARGET"
+
+ # If cc-rs needs to build host binaries, it guesses the compiler and
+ # uses default (wrong) flags unless they are specified explicitly;
+ # innocuous flags are used here just to disable its defaults
+ export HOST_CC="gcc"
+ export HOST_CFLAGS="-O2"
else
unset CARGO_BUILD_TARGET
fi
From b636250e1bb64915ce98df1a390f163d35f08cb9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Feb 2021 11:13:44 +0300
Subject: [PATCH 625/634] New package: maturin-0.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Érico Rolim <erico.erc@gmail.com>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>
---
srcpkgs/maturin/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/maturin/template
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
new file mode 100644
index 00000000000..cce53cf58cc
--- /dev/null
+++ b/srcpkgs/maturin/template
@@ -0,0 +1,36 @@
+# Template file for 'maturin'
+pkgname=maturin
+version=0.9.0
+revision=1
+build_style=cargo
+# Disable the 'rustls' feature, which leads to bad platform compatibility
+# The list of enabled features should be reconciled with each new release
+configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
+hostmakedepends="python3-setuptools python3-toml"
+makedepends="libressl-devel"
+depends="python3-toml"
+short_desc="Build and publish crates as python packages"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/PyO3/maturin"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=22e8082a743e1dc11f5909b596f9053deb7dc1a56336003677381ba02cf67da8
+
+post_patch() {
+ # setup.py is broken, just use it for the pure python part
+ vsed -e 's/cmdclass.*/packages=["maturin"],/' -i setup.py
+}
+
+post_build() {
+ # python package is pure; the cross environment is not relevant
+ python3 setup.py build
+}
+
+do_check() {
+ echo "Tests use unstable features and fail to build; skipping"
+}
+
+post_install() {
+ vlicense license-mit LICENSE-MIT
+ python3 setup.py install --prefix=/usr --root=${DESTDIR}
+}
From c7377acf31352e6a2360d7417f00f4ac73409e48 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Feb 2021 13:50:32 +0300
Subject: [PATCH 626/634] New package: python3-adblock-0.4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Érico Rolim <erico.erc@gmail.com>
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>
Closes: #28396.
Closes: #28380.
Closes: #27490.
---
srcpkgs/python3-adblock/template | 46 ++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 srcpkgs/python3-adblock/template
diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
new file mode 100644
index 00000000000..c1200f89027
--- /dev/null
+++ b/srcpkgs/python3-adblock/template
@@ -0,0 +1,46 @@
+# Template file for 'python3-adblock'
+pkgname=python3-adblock
+version=0.4.2
+revision=1
+wrksrc="${pkgname/python3/python}-${version}"
+build_style=python3-pep517
+build_helper="rust"
+hostmakedepends="maturin pkg-config cargo libressl-devel"
+makedepends="libressl-devel python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Brave's adblock library in Python"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/ArniDagur/python-adblock"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=06de6074e6cfe889fc0383cc929a5a2306570251c14e51abbfcedd328b83e0e9
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*) broken="compiler throws SIGABRT on the psl crate" ;;
+esac
+
+if [ "$CROSS_BUILD" ]; then
+ makedepends+=" rust-std"
+ export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+ export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_build() {
+ maturin build -o . --release --target "${RUST_TARGET}" --manylinux off
+
+ # Drop platform specifiers from the wheel; pip will refuse to install,
+ # e.g., an armv7l wheel on an aarch64 system even if the masterdir is
+ # armv7l. The wheel is correct; no need for name compatibility checks.
+ mv adblock-${version}-*.whl adblock-${version}-py3-none-any.whl
+}
+
+pre_check() {
+ # Tests require the compiled extension
+ cp target/${RUST_TARGET}/release/libadblock.so adblock/adblock.so
+}
+
+post_install() {
+ vlicense LICENSE-MIT
+ chmod 755 ${DESTDIR}/${py3_sitelib}/adblock/*.so
+}
From ab3fc74517d781b18d29b1b547bafadc8279e016 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 30 Jan 2021 03:14:46 +0300
Subject: [PATCH 627/634] starship: update to 0.50.0
Make libressl-devel dependency explicit - the final binary is linked
against it; libgit2 isn't being used for the final binary because
libgit2-sys now requires libgit2>=1.1.0, but we leave it in for when
it's updated and starship gets rebuilt.
libgit2-devel is also required on host now - it isn't picked up either.
Building the vendored libgit2 requires zlib-devel, which libgit2-devel
depends on, so the dependency is fullfilled indirectly. When the
libgit2 package is updated, the build should pick it up.
Closes: #28310 [via git-merge-pr]
---
srcpkgs/starship/template | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 0eae193aece..08d0c71e41d 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,18 +1,18 @@
# Template file for 'starship'
pkgname=starship
-version=0.48.0
+version=0.50.0
revision=1
build_style=cargo
build_helper=qemu
-hostmakedepends="pkg-config"
-makedepends="libgit2-devel"
+hostmakedepends="pkg-config libgit2-devel"
+makedepends="libressl-devel libgit2-devel"
checkdepends="git fish-shell"
short_desc="Minimal, fast and customizable cross-shell prompt"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="ISC"
homepage="https://starship.rs"
distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz"
-checksum=23e729ace48ec0bf6d8eff5f99003351463841f3b28fe453faceb62e6f99bae6
+checksum=d8f4dc9bd266f2a5c34926d361c62fdddb61cd7da4acadba5f9c175eb07602e5
post_build() {
STARSHIP="target/${RUST_TARGET}/release/starship"
@@ -23,10 +23,7 @@ post_build() {
do_check() {
mkdir -p fake-home
- local OLDHOME=$HOME
- export HOME=$(pwd)/fake-home
- cargo test -q --release --target ${RUST_TARGET}
- export HOME=$OLDHOME
+ HOME="${wrksrc}/fake-home" cargo test --release --target ${RUST_TARGET}
}
post_install() {
From 4884546fe68b4b2c5283d2d13e96c8288f1a282e Mon Sep 17 00:00:00 2001
From: Ameise <ameise@bitparlament.de>
Date: Tue, 29 Dec 2020 22:04:53 +0100
Subject: [PATCH 628/634] hledger: update to 1.20.4
Closes: #27534 [via git-merge-pr]
---
srcpkgs/hledger/files/stack.yaml | 6 ------
srcpkgs/hledger/template | 4 ++--
2 files changed, 2 insertions(+), 8 deletions(-)
delete mode 100644 srcpkgs/hledger/files/stack.yaml
diff --git a/srcpkgs/hledger/files/stack.yaml b/srcpkgs/hledger/files/stack.yaml
deleted file mode 100644
index fdb69b61aee..00000000000
--- a/srcpkgs/hledger/files/stack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resolver: lts-16.13
-packages:
-- hledger-lib
-- hledger
-- hledger-ui
-- hledger-web
diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index cb7b195d085..aaad04b778c 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,6 +1,6 @@
# Template file for 'hledger'
pkgname=hledger
-version=1.19.1
+version=1.20.4
revision=1
build_style=haskell-stack
makedepends="zlib-devel ncurses-devel"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="http://hledger.org/"
changelog="https://hackage.haskell.org/package/hledger-${version}/changelog"
distfiles="https://github.com/simonmichael/${pkgname}/archive/${version}.tar.gz"
-checksum=9324592f7c9caf8aee856aed3ea4407f1ba8a2119a39143ef6b83c11c5d3029c
+checksum=1213854ee7cf94913652706139b4c7f619af4394f5e70856b859f3c0ed07b2a4
nopie_files="/usr/bin/hledger"
nocross=yes # Can't yet cross compile Haskell
From 209335689260380a1ee3f43db97fc33184f6e61c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Feb 2021 14:58:18 +0100
Subject: [PATCH 629/634] ncmpc: update to 0.44.
---
srcpkgs/ncmpc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 191fdd33f14..72207b65161 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,6 +1,6 @@
# Template file for 'ncmpc'
pkgname=ncmpc
-version=0.43
+version=0.44
revision=1
build_style=meson
configure_args="-Dlirc=disabled"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/clients/ncmpc/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/master/NEWS"
distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=7abf3c83d3a77c18681a8ce90126c8cb1e1884ebde5be2a735293a4f535ed382
+checksum=e9cf0ef9e052d55ec3e863f04724fd0cfe1a1e15e1c0017eed820906690eb58c
post_install() {
vmkdir usr/share/examples/ncmpc
From 27016990fbf4b2752884de2f95f14661bfcb1f2c Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 30 Jan 2021 22:27:18 +0300
Subject: [PATCH 630/634] emptty: update to 0.5.0.
---
srcpkgs/emptty/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 43b69aff7c8..402733e1b2a 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
# Template file for 'emptty'
pkgname=emptty
-version=0.4.2
+version=0.5.0
revision=1
build_style=go
go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
license="MIT"
homepage="https://github.com/tvrzna/emptty"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=55d192baacccdd858b3aa07d306a6feb965ec98370bc97522eb8542c2b4db109
+checksum=30fd606e9f2c00c923d6fc5d28774d2454e70f999aee57ff29de73eed824f384
conf_files="/etc/emptty/conf /etc/pam.d/emptty"
post_install() {
From 19ee5f2d61de8e993d53913817c0c5cfffbb2db9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:29:19 +0100
Subject: [PATCH 631/634] elvish: update to 0.15.0.
---
srcpkgs/elvish/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 5d358752e44..504a023e9a6 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,6 +1,6 @@
# Template file for 'elvish'
pkgname=elvish
-version=0.14.0
+version=0.15.0
revision=1
build_style=go
go_import_path="github.com/elves/elvish"
@@ -8,8 +8,9 @@ short_desc="Novel Unix shell"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="BSD-2-Clause"
homepage="https://elv.sh/"
+changelog="https://elv.sh/blog/${version}-release-notes.html"
distfiles="https://github.com/elves/elvish/archive/v${version}.tar.gz"
-checksum=36ed5e0318d75f7e7d616398e42477cfbd6fd2a1d1f108dee7941621cfb7378a
+checksum=761739307c68fcbc51fd46c052c0a20ae848a30dba1ce3fbb6d27f99672f58e0
register_shell="/bin/elvish"
post_install() {
From 25d7757d168b5568f9fef6d460c5e70960654abb Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 28 Jan 2021 20:43:25 +0100
Subject: [PATCH 632/634] oil: update to 0.8.7, don't pretend we are using
system python.
Closes: #28293 [via git-merge-pr]
---
srcpkgs/oil/template | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index df432c0f285..69ea84476e6 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,20 +1,19 @@
# Template file for 'oil'
pkgname=oil
-version=0.8.6
+version=0.8.7
revision=1
build_style=configure
configure_args="--prefix=/usr $(vopt_with readline)"
-hostmakedepends="$(vopt_if readline readline-devel) python"
+hostmakedepends="$(vopt_if readline readline-devel)"
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=7d7d66888f325f39ff4fd71b6d9ffb13afed2ecdd15ec5f73e07c2eec0712235
-python_version=2
+checksum=29c5eed6efccbef6c22dbe5aec3d3d36f7c93da7a8d1cf19fc2cee93b5d1db73
register_shell="/usr/bin/osh"
-nocross="Binaries doesn't build if cross built"
+nocross="Build systems gets confused with host and cross toolchains/headers"
nostrip=yes
build_options="readline"
@@ -23,8 +22,6 @@ 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 9e9685feac054215552d8b5e081045d33b9925e0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 26 Jan 2021 16:53:04 +0100
Subject: [PATCH 633/634] gotop: update to 4.1.0.
By ericonr:
Actually move to v4 release branch.
Closes: #28242 [via git-merge-pr]
---
srcpkgs/gotop/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6cfa17573a3..3566a8d9a78 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,16 +1,18 @@
# Template file for 'gotop'
pkgname=gotop
-version=4.0.1
+version=4.1.0
revision=1
build_style=go
-go_import_path=github.com/xxxserxxx/gotop/cmd/gotop
+go_ldflags="-X main.Version=v${version}"
+go_import_path="github.com/xxxserxxx/gotop/v4"
+go_package="$go_import_path/cmd/gotop"
hostmakedepends="git"
short_desc="Terminal based graphical activity monitor"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
-license="BSD-3-Clause"
+license="MIT"
homepage="https://github.com/xxxserxxx/gotop"
distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=38a34543ed828ed8cedd93049d9634c2e578390543d4068c19f0d0c20aaf7ba0
+checksum=e61375feb183cc2c73764aaac92e164ea77f073206f7dbbfd4997c0efd38bfc0
post_install() {
vlicense LICENSE
From 9da9423a11fe6b7c21d19f4adb1ad92770c97222 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 09:02:59 +0000
Subject: [PATCH 634/634] libinput-gestures: update to 2.57.
---
srcpkgs/libinput-gestures/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libinput-gestures/template b/srcpkgs/libinput-gestures/template
index 58518ac80d8..9b3a1dd6b69 100644
--- a/srcpkgs/libinput-gestures/template
+++ b/srcpkgs/libinput-gestures/template
@@ -1,6 +1,6 @@
# Template file for 'libinput-gestures'
pkgname=libinput-gestures
-version=2.56
+version=2.57
revision=1
depends="python3 libinput xdotool wmctrl hicolor-icon-theme"
short_desc="Action gestures on your touchpad using libinput"
@@ -8,7 +8,7 @@ maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/bulletmark/libinput-gestures"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=66bd5283f8208164b1206d81db772aeccae7f58640d5473212b9d8ca164b9a2c
+checksum=4259ae64276636c0a2497a462582ef43e044c580fc27c24d647ecd0ba7f7a8a7
conf_files="/etc/libinput-gestures.conf"
do_install() {
^ permalink raw reply [flat|nested] 11+ messages in thread