* Re: [PR PATCH] [Updated] New package : powerline-go-1.17.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23361@inbox.vuxu.org>
@ 2020-07-03 10:14 ` pandom79
2020-07-03 10:22 ` pandom79
` (9 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: pandom79 @ 2020-07-03 10:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
There is an updated pull request by pandom79 against master on the void-packages repository
https://github.com/pandom79/void-packages powerline-go
https://github.com/void-linux/void-packages/pull/23361
New package : powerline-go-1.17.0
A patch file from https://github.com/void-linux/void-packages/pull/23361.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-powerline-go-23361.patch --]
[-- Type: text/x-diff, Size: 35479 bytes --]
From 29014a4322151c87736e75bc76372f4870e31ee2 Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Thu, 2 Jul 2020 17:55:08 +0200
Subject: [PATCH 1/3] New package : powerline-go-1.17.0
---
srcpkgs/powerline-go/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/powerline-go/template
diff --git a/srcpkgs/powerline-go/template b/srcpkgs/powerline-go/template
new file mode 100644
index 00000000000..a38e6f45d7e
--- /dev/null
+++ b/srcpkgs/powerline-go/template
@@ -0,0 +1,14 @@
+# Template file for 'powerline-go'
+pkgname=powerline-go
+version=1.17.0
+revision=2
+archs="x86_64 armv7l"
+build_style=go
+go_import_path="github.com/justjanne/powerline-go"
+make_build_args="-trimpath -ldflags -extldflags"
+short_desc="Beautiful, useful and fast prompt for your shell"
+maintainer="Domenico Panella <pandom79@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/justjanne/powerline-go"
+distfiles="https://github.com/justjanne/$pkgname/archive/v$version.tar.gz"
+checksum=d7825168044159dfdd3983519ea26cf8753f24c3d8c0600ce494c4a6db7a015f
From f88a9cac68b4e64ff92cff9f273f1148a0619b41 Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Thu, 2 Jul 2020 18:17:21 +0200
Subject: [PATCH 2/3] New package : powerline-go-1.17.0
---
srcpkgs/powerline-go/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/powerline-go/template b/srcpkgs/powerline-go/template
index a38e6f45d7e..2f5f343e05d 100644
--- a/srcpkgs/powerline-go/template
+++ b/srcpkgs/powerline-go/template
@@ -1,11 +1,10 @@
# Template file for 'powerline-go'
pkgname=powerline-go
version=1.17.0
-revision=2
-archs="x86_64 armv7l"
+revision=1
+archs="noarch"
build_style=go
go_import_path="github.com/justjanne/powerline-go"
-make_build_args="-trimpath -ldflags -extldflags"
short_desc="Beautiful, useful and fast prompt for your shell"
maintainer="Domenico Panella <pandom79@gmail.com>"
license="GPL-3.0-or-later"
From 89b24c71a71fa5c26c9a597d8eb086f2c5bc39fa Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Thu, 2 Jul 2020 18:26:15 +0200
Subject: [PATCH 3/3] New package : powerline-go-1.17.0
New package : powerline-go-1.17.0
python3-yara: update to 4.0.2.
FreeRADIUS: rebuild against libressl-3.1.3
Ice: rebuild against libressl-3.1.3
LGOGDownloader: rebuild against libressl-3.1.3
MEGAsdk: rebuild against libressl-3.1.3
OpenRCT2: rebuild against libressl-3.1.3
VirtualGL: rebuild against libressl-3.1.3
acme-client: rebuild against libressl-3.1.3
aircrack-ng: rebuild against libressl-3.1.3
alpine: rebuild against libressl-3.1.3
apache: rebuild against libressl-3.1.3
apk-tools: rebuild against libressl-3.1.3
apr-util: rebuild against libressl-3.1.3
argyllcms: rebuild against libressl-3.1.3
aria2: rebuild against libressl-3.1.3
attic: rebuild against libressl-3.1.3
axel: rebuild against libressl-3.1.3
bacula-common: rebuild against libressl-3.1.3
badvpn: rebuild against libressl-3.1.3
baresip: rebuild against libressl-3.1.3
barrier: rebuild against libressl-3.1.3
bind: rebuild against libressl-3.1.3
bitchx: rebuild against libressl-3.1.3
bitcoin: rebuild against libressl-3.1.3
boinc: rebuild against libressl-3.1.3
borg: rebuild against libressl-3.1.3
botan: rebuild against libressl-3.1.3
bro: rebuild against libressl-3.1.3
burp-server: rebuild against libressl-3.1.3
burp2-server: rebuild against libressl-3.1.3
calibre: rebuild against libressl-3.1.3
qt5: get rid of EVP_CipherFinal warning
If EVP_CipherFinal is used, libressl always prints a linker warning:
/bin/ld: /usr/lib/libQt5Network.so: warning: EVP_CipherFinal is often misused,
please use EVP_CipherFinal_ex and EVP_CIPHER_CTX_cleanup
Extend the qtnetwork-5.15.0-libressl.patch to replace EVP_CipherFinal()
with EVP_CipherFinal_ex().
[ci skip]
bacula-common: mark noross
libssh2: rebuild against libressl-3.1.3
rtmpdump: rebuild against libressl-3.1.3
gst-plugins-bad1: rebuild against libressl-3.1.3
angle-grinder: rebuild against libressl-3.1.3
cbang: rebuild against libressl-3.1.3
chatterino2: rebuild against libressl-3.1.3
volumeicon: add libnotify patch.
Changes to the configure.ac file required new build time dependencies as well.
Closes: #23367
icecat: update to 68.10.0
clamav: rebuild against libressl-3.1.3
cloudfuse: rebuild against libressl-3.1.3
cmusfm: rebuild against libressl-3.1.3
coWPAtty: rebuild against libressl-3.1.3
collectd: rebuild against libressl-3.1.3
coturn: rebuild against libressl-3.1.3
cyrus-sasl: rebuild against libressl-3.1.3
---
srcpkgs/FreeRADIUS/template | 2 +-
srcpkgs/Ice/template | 2 +-
srcpkgs/LGOGDownloader/template | 2 +-
srcpkgs/MEGAsdk/template | 2 +-
srcpkgs/OpenRCT2/template | 2 +-
srcpkgs/VirtualGL/template | 2 +-
srcpkgs/acme-client/template | 2 +-
srcpkgs/aircrack-ng/template | 2 +-
srcpkgs/alpine/template | 2 +-
srcpkgs/angle-grinder/template | 6 ++-
srcpkgs/apache/template | 2 +-
srcpkgs/apk-tools/template | 2 +-
srcpkgs/apr-util/template | 2 +-
srcpkgs/argyllcms/template | 2 +-
srcpkgs/aria2/template | 2 +-
srcpkgs/attic/template | 2 +-
srcpkgs/axel/template | 2 +-
srcpkgs/bacula-common/template | 4 +-
srcpkgs/badvpn/template | 2 +-
srcpkgs/baresip/template | 2 +-
srcpkgs/barrier/template | 2 +-
srcpkgs/bind/template | 2 +-
srcpkgs/bitchx/template | 2 +-
srcpkgs/bitcoin/patches/qt5.15.patch | 10 +++++
srcpkgs/bitcoin/template | 2 +-
srcpkgs/boinc/template | 2 +-
srcpkgs/borg/template | 2 +-
srcpkgs/botan/template | 2 +-
srcpkgs/bro/template | 2 +-
srcpkgs/burp-server/template | 2 +-
srcpkgs/burp2-server/template | 2 +-
srcpkgs/calibre/template | 2 +-
srcpkgs/cbang/template | 2 +-
srcpkgs/chatterino2/template | 2 +-
srcpkgs/clamav/template | 2 +-
srcpkgs/cloudfuse/template | 2 +-
srcpkgs/cmusfm/template | 2 +-
srcpkgs/coWPAtty/template | 2 +-
srcpkgs/collectd/template | 2 +-
srcpkgs/coturn/template | 2 +-
srcpkgs/cyrus-sasl/template | 2 +-
srcpkgs/gst-plugins-bad1/template | 2 +-
.../icecat/patches/musl-rust.configure.patch | 26 ++++++++++++
srcpkgs/icecat/template | 5 +--
srcpkgs/libssh2/template | 2 +-
srcpkgs/powerline-go/template | 1 -
srcpkgs/python3-yara/template | 4 +-
.../patches/qtnetwork-5.15.0-libressl.patch | 42 +++++++++++++++++++
srcpkgs/qt5/template | 2 +-
srcpkgs/rtmpdump/template | 2 +-
srcpkgs/volumeicon/patches/notify.patch | 22 ++++++++++
srcpkgs/volumeicon/template | 21 ++++++++--
52 files changed, 172 insertions(+), 53 deletions(-)
create mode 100644 srcpkgs/bitcoin/patches/qt5.15.patch
create mode 100644 srcpkgs/icecat/patches/musl-rust.configure.patch
create mode 100644 srcpkgs/volumeicon/patches/notify.patch
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index ea7c67d6ae5..ad05f62732d 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.20
-revision=1
+revision=2
wrksrc=freeradius-server-release_${version//./_}
build_style=gnu-configure
makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d9f68fde12b..d27bb350c74 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,7 +1,7 @@
# Template file for 'Ice'
pkgname=Ice
version=3.5.1
-revision=21
+revision=22
build_wrksrc=cpp
makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
short_desc="Internet Communications Engine (Ice)"
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 59aaf5505a7..1ad9e8165b7 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.7
-revision=1
+revision=2
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 52aa7573279..342e76fc676 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,7 +1,7 @@
# Template file for 'MEGAsdk'
pkgname=MEGAsdk
version=3.6.2a
-revision=2
+revision=3
wrksrc="sdk-${version}"
build_style=gnu-configure
configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 26659712ac8..5b0c68a5f80 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
_objects_version=1.0.15
_titles_version=0.1.2
version=0.2.6
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if multiplayer "" "-DDISABLE_HTTP_TWITCH=1 -DDISABLE_NETWORK=1")"
hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 343e9c78f4c..1a4c708af37 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,7 +1,7 @@
# Template file for 'VirtualGL'
pkgname=VirtualGL
version=2.6.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index 3bf86341ff0..e778658b3fd 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -1,7 +1,7 @@
# Template file for 'acme-client'
pkgname=acme-client
version=0.1.16
-revision=4
+revision=5
_distver=VERSION_${version//./_}
wrksrc=acme-client-portable-${_distver}
build_style=gnu-makefile
diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index a544f6f7c26..1225e4b10a9 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,7 +1,7 @@
# Template file for 'aircrack-ng'
pkgname=aircrack-ng
version=1.6
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 88141ce2c21..5933bdd7d24 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
# Template file for 'alpine'
pkgname=alpine
version=2.23.2
-revision=1
+revision=2
_githash=7b8875f8bb237a156a1250629e8c684706bd202f
_gitshort="${_githash:0:7}"
wrksrc="${pkgname}-${_gitshort}"
diff --git a/srcpkgs/angle-grinder/template b/srcpkgs/angle-grinder/template
index 741794e78f9..d7921dea2da 100644
--- a/srcpkgs/angle-grinder/template
+++ b/srcpkgs/angle-grinder/template
@@ -1,7 +1,7 @@
# Template file for 'angle-grinder'
pkgname=angle-grinder
version=0.13.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libressl-devel"
@@ -13,6 +13,10 @@ distfiles="https://github.com/rcoh/angle-grinder/archive/v${version}.tar.gz"
checksum=b257b9869f5350bc75754ecdd883341a7ede74bde05dd1e934dfd3b40d962d7c
nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/26343/steps/shell_3/logs/stdio"
+pre_build() {
+ cargo update --package openssl-sys --precise 0.9.58
+}
+
post_install() {
vlicense LICENSE
}
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 56b4539ea83..edfedc59964 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.43
-revision=2
+revision=3
wrksrc="httpd-${version}"
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 6b13fb0476b..87ecbd8a144 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,7 +1,7 @@
# Template file for 'apk-tools'
pkgname=apk-tools
version=2.10.5
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="LUAAPK="
hostmakedepends="pkg-config"
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 13436a674d4..e78d1ee2714 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
version=1.6.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index 2229da45e32..230f2ce28e8 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,7 +1,7 @@
# Template file for 'argyllcms'
pkgname=argyllcms
version=2.1.2
-revision=1
+revision=2
wrksrc="Argyll_V${version}"
hostmakedepends="ftjam zip unzip"
makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index 4e0fdf6fa1c..f88cb53e958 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,7 +1,7 @@
# Template file for 'aria2'
pkgname=aria2
version=1.35.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-openssl --with-libexpat --without-gnutls
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index ff061533165..6256cc00951 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,7 +1,7 @@
# Template file for 'attic'
pkgname=attic
version=0.16
-revision=17
+revision=18
wrksrc="Attic-$version"
build_style=python3-module
pycompile_module="attic"
diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index 78a5b27158a..3ddba3d3b4e 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,7 +1,7 @@
# Template file for 'axel'
pkgname=axel
version=2.17.9
-revision=1
+revision=2
build_style=gnu-configure
conf_files="/etc/axelrc"
hostmakedepends="gettext-devel pkg-config"
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index ef76bc1935c..504583f406c 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
# Template file for 'bacula-common'
pkgname=bacula-common
version=9.4.2
-revision=2
+revision=3
wrksrc="${pkgname%-*}-${version}"
build_style=gnu-configure
configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
@@ -22,6 +22,8 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
+nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/26660/steps/shell_3/logs/stdio"
+
post_install() {
rm "${DESTDIR}/usr/bin/bacula"
rm -rf "${DESTDIR}/usr/share/doc"
diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index b62d13f208f..360dc5a9140 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,7 +1,7 @@
# Template file for 'badvpn'
pkgname=badvpn
version=1.999.130
-revision=11
+revision=12
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libressl-devel nspr-devel nss-devel"
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index b0706cfbe73..666fc279cc7 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
# Template file for 'baresip'
pkgname=baresip
version=0.6.5
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk
SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 6d2072c98a7..81a304f6088 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
# Template file for 'barrier'
pkgname=barrier
version=2.3.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 40310807795..138460d5ad5 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
# Template file for 'bind'
pkgname=bind
version=9.16.4
-revision=1
+revision=2
_fullver="${version}${_patchver:+-${_patchver}}"
wrksrc="${pkgname}-${_fullver}"
build_style=gnu-configure
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 90c2b4c757f..53278edc409 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,7 +1,7 @@
# Template file for 'bitchx'
pkgname=bitchx
version=1.2.1
-revision=14
+revision=15
build_style=gnu-configure
configure_args="--with-ssl --with-ipv6 --with-plugins"
makedepends="libressl-devel ncurses-devel"
diff --git a/srcpkgs/bitcoin/patches/qt5.15.patch b/srcpkgs/bitcoin/patches/qt5.15.patch
new file mode 100644
index 00000000000..adfe3604717
--- /dev/null
+++ b/srcpkgs/bitcoin/patches/qt5.15.patch
@@ -0,0 +1,10 @@
+--- src/qt/trafficgraphwidget.cpp 2020-03-04 13:13:02.000000000 +0100
++++ - 2020-07-02 17:58:16.576242713 +0200
+@@ -6,6 +6,7 @@
+ #include <qt/trafficgraphwidget.h>
+ #include <qt/clientmodel.h>
+
++#include <QPainterPath>
+ #include <QPainter>
+ #include <QColor>
+ #include <QTimer>
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4b74e47916c..df1ab218e16 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=0.19.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index a359a2210c6..ffba563355e 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
# Template file for 'boinc'
pkgname=boinc
version=7.16.7
-revision=1
+revision=2
_majorver=${version%.*}
wrksrc=boinc-client_release-${_majorver}-${version}
build_style=gnu-configure
diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index 9ab9266a0fc..0ede63598e1 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,7 +1,7 @@
# Template file for 'borg'
pkgname=borg
version=1.1.13
-revision=1
+revision=2
wrksrc="borgbackup-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-devel libressl-devel"
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 88bd64fc544..49d382d1bcc 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.14.0
-revision=1
+revision=2
wrksrc="${pkgname^}-${version}"
build_style=gnu-makefile
pycompile_module="botan.py"
diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template
index 8ef7be068cc..12c14e82226 100644
--- a/srcpkgs/bro/template
+++ b/srcpkgs/bro/template
@@ -1,7 +1,7 @@
# Template file for 'bro'
pkgname=bro
version=2.6.4
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="flex pkg-config python3"
diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template
index dbd40dbd540..85cff6602c6 100644
--- a/srcpkgs/burp-server/template
+++ b/srcpkgs/burp-server/template
@@ -3,7 +3,7 @@ _desc="A network-based backup and restore program"
pkgname=burp-server
version=1.4.40
-revision=11
+revision=12
short_desc="${_desc} - Server"
maintainer="Pierre Bourgin <pierre.bourgin@free.fr>"
license="AGPL-3.0-only, BSD-3-Clause, GPL-2.0-or-later"
diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index 729f07dccdb..9845f6afe9e 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,7 +3,7 @@ _desc="Network-based backup and restore program"
pkgname=burp2-server
version=2.2.18
-revision=2
+revision=3
wrksrc="burp-${version}"
build_style=gnu-configure
make_install_target=install-all
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 49b6a7286ef..1283d9cd819 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
# Template file for 'calibre'
pkgname=calibre
version=4.19.0
-revision=1
+revision=2
build_style=python2-module
pycompile_dirs="/usr/lib/calibre/"
hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index a90fcf23fcf..eaf26bf648a 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,7 +1,7 @@
# Template file for 'cbang'
pkgname=cbang
version=1.5.1
-revision=1
+revision=2
build_style=scons
make_build_args="sharedlib=1 staticlib=1"
make_install_args="${make_build_args}"
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index ca263b79909..53e41580dbc 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
# Template file for 'chatterino2'
pkgname=chatterino2
version=2.1.7
-revision=3
+revision=4
_signals_commit=1c38746b05d9311e73c8c8acdfdc4d36c9c551be
_settings_commit=4fe0ff9b0cb7b04f8017a63b38c40104430a4b66
_humanize_commit=13867379249c64cd44b9cd4c03f18c1a52d56587
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 192a6142d0c..d6b6c3826cb 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
# Template file for 'clamav'
pkgname=clamav
version=0.102.3
-revision=4
+revision=5
build_style=gnu-configure
# XXX: system llvm is too new (< 3.7 required)
# Shipped llvm does not build with gcc6
diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index 5240fd0c6b7..bcba5bba859 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
# Template file for 'cloudfuse'
pkgname=cloudfuse
version=1.0
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libxml2-devel libcurl-devel fuse-devel"
diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 950a7575c26..6b5ac2bbee1 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
# Template file for 'cmusfm'
pkgname=cmusfm
version=0.3.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-libnotify"
hostmakedepends="automake pkg-config"
diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 317ad862a8d..97f085ee607 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,7 +2,7 @@
pkgname=coWPAtty
_pkgname=cowpatty
version=4.8
-revision=2
+revision=3
wrksrc="${_pkgname}-${version}"
build_style=gnu-makefile
make_use_env=1
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 73c29bc2667..a88454aa4e8 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
# Template file for 'collectd'
pkgname=collectd
version=5.11.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 540193574ae..5a11c168339 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
# Template file for 'coturn'
pkgname=coturn
version=4.5.1.1
-revision=3
+revision=4
build_style=gnu-configure
conf_files="/etc/turnserver.conf"
makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 59e3030025b..6a8ca2516e3 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
# Template file for 'cyrus-sasl'
pkgname=cyrus-sasl
version=2.1.27
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index ef777ee712e..df1d5053c5f 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=8
+revision=9
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
diff --git a/srcpkgs/icecat/patches/musl-rust.configure.patch b/srcpkgs/icecat/patches/musl-rust.configure.patch
new file mode 100644
index 00000000000..d8f387136e0
--- /dev/null
+++ b/srcpkgs/icecat/patches/musl-rust.configure.patch
@@ -0,0 +1,26 @@
+--- 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/template b/srcpkgs/icecat/template
index 9bb3e5cfa0d..bc4e855005d 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -1,6 +1,6 @@
# Template file for 'icecat'
pkgname=icecat
-version=68.9.0
+version=68.10.0
revision=1
build_helper="rust"
hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
@@ -18,7 +18,7 @@ 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=87d69b6726c4b0e3a816e8c583fcbe468192ee29321fd4bfa58fd46e9ae186e5
+checksum=b4dfc9644d64c1effa8f7721956274d071b897d1893b57f8b7bd7b749955f834
lib32disabled=yes
build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver"
@@ -26,7 +26,6 @@ build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscr
case $XBPS_TARGET_MACHINE in
armv[56]*) broken="required NEON extensions are not supported on armv[56]" ;;
- armv7*) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/26095/steps/shell_3/logs/stdio" ;;
ppc64*) ;;
ppc*) broken="xptcall bitrot" ;;
esac
diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index d17d10180ad..e82591556f9 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,7 +1,7 @@
# Template file for 'libssh2'
pkgname=libssh2
version=1.9.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
makedepends="zlib-devel libressl-devel"
diff --git a/srcpkgs/powerline-go/template b/srcpkgs/powerline-go/template
index 2f5f343e05d..9bc73dae78a 100644
--- a/srcpkgs/powerline-go/template
+++ b/srcpkgs/powerline-go/template
@@ -2,7 +2,6 @@
pkgname=powerline-go
version=1.17.0
revision=1
-archs="noarch"
build_style=go
go_import_path="github.com/justjanne/powerline-go"
short_desc="Beautiful, useful and fast prompt for your shell"
diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index 6fff7b3c921..4441fa7a0c4 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,6 +1,6 @@
# Template file for 'python3-yara'
pkgname=python3-yara
-version=4.0.1
+version=4.0.2
revision=1
wrksrc="yara-python-${version}"
build_style=python3-module
@@ -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=1b893f14c0db164ed0bd3e2bf3b2b019ca87d77a1dab268f89d19dbf23c4c6c6
+checksum=6e747caefa8d208bf40b078ef0a71f3866fa9075091239cc362bd23bf436d816
diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
index 6e19657e207..d7414f68dc5 100644
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
@@ -338,3 +338,45 @@ index f35e0ba2..30097317 100644
--
2.25.0
+--- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-05-11 10:15:08.000000000 +0200
++++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-07-01 17:06:34.471202351 +0200
+@@ -264,7 +264,7 @@
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -962,7 +962,7 @@
+ RESOLVEFUNC(EVP_CipherInit)
+ RESOLVEFUNC(EVP_CipherInit_ex)
+ RESOLVEFUNC(EVP_CipherUpdate)
+- RESOLVEFUNC(EVP_CipherFinal)
++ RESOLVEFUNC(EVP_CipherFinal_ex)
+ RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+ RESOLVEFUNC(EVP_des_cbc)
+--- qtbase/src/network/ssl/qsslkey_openssl.cpp 2020-05-11 10:15:08.000000000 +0200
++++ qtbase/src/network/ssl/qsslkey_openssl.cpp 2020-07-01 17:58:44.674363835 +0200
+@@ -360,7 +360,7 @@
+ q_EVP_CipherUpdate(ctx,
+ reinterpret_cast<unsigned char *>(output.data()), &len,
+ reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+- q_EVP_CipherFinal(ctx,
++ q_EVP_CipherFinal_ex(ctx,
+ reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+ len += i;
+
+--- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2020-07-01 18:00:20.748368792 +0200
++++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2020-07-01 18:04:38.177382072 +0200
+@@ -429,7 +429,7 @@
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+
+ #ifndef OPENSSL_NO_DES
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 4af424a3dd2..bbcac4460a3 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
# Template file for 'qt5'
pkgname=qt5
version=5.15.0
-revision=1
+revision=2
wrksrc="qt-everywhere-src-${version}"
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index 39171da0b77..eeeff44012e 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,7 +1,7 @@
# Template file for 'rtmpdump'
pkgname=rtmpdump
version=2.4.20161210
-revision=7
+revision=8
_patchlevel=${version##*.}
create_wrksrc=yes
makedepends="zlib-devel libressl-devel"
diff --git a/srcpkgs/volumeicon/patches/notify.patch b/srcpkgs/volumeicon/patches/notify.patch
new file mode 100644
index 00000000000..dbcf7f4d700
--- /dev/null
+++ b/srcpkgs/volumeicon/patches/notify.patch
@@ -0,0 +1,22 @@
+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])
+-NOTIFY_CFLAGS+="-DCOMPILEWITH_NOTIFY"
++NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY"
+ AC_SUBST(NOTIFY_CFLAGS)
+ AC_SUBST(NOTIFY_LIBS)
+ fi
diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index 95a0e78794d..bd79cabe1f3 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,14 +1,29 @@
# Template file for 'volumeicon'
pkgname=volumeicon
version=0.5.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-notify"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
short_desc="Lightweight volume control that sits in your systray"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only, ISC, MIT"
homepage="http://softwarebakery.com/maato/volumeicon.html"
distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
+
+post_patch() {
+ sed -ne '/Copyright/,/IN THE SOFTWARE/s/ [*] *//p' src/bind.c >LICENSE.MIT
+ sed -ne '/Copyright/,/OF THIS SOFTWARE/s/ [*] *//p' \
+ src/alsa_volume_mapping.c >LICENSE.ISC
+}
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_install() {
+ vlicense LICENSE.MIT
+ vlicense LICENSE.ISC
+}
^ permalink raw reply [flat|nested] 11+ messages in thread