Merge branch 'master' into x265

2018-05-28 10:58:55 +02:00 · 2018-05-28 10:58:55 +02:00 · 368c46591f
parent d52ad47a4d 03c37a5b5d
commit 368c46591f
289 changed files with 1593 additions and 1434 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -15,9 +15,9 @@ env:
        - ARCH=x86_64 BOOTSTRAP=x86_64
        - ARCH=i686 BOOTSTRAP=i686
        - ARCH=aarch64 BOOTSTRAP=x86_64
-        - ARCH=armv7hf BOOTSTRAP=x86_64
+        - ARCH=armv7l BOOTSTRAP=x86_64
        - ARCH=x86_64-musl BOOTSTRAP=x86_64-musl
-        - ARCH=armv6hf-musl BOOTSTRAP=x86_64-musl
+        - ARCH=armv6l-musl BOOTSTRAP=x86_64-musl
        - ARCH=aarch64-musl BOOTSTRAP=x86_64-musl

 before_script:
--- a/common/shlibs
+++ b/common/shlibs
@ -550,15 +550,15 @@ libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1
 libjavascriptcoregtk-1.0.so.0 webkitgtk2-2.4.8_2
 libjavascriptcoregtk-3.0.so.0 webkitgtk-2.0.0_1
 libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1
-libgimp-2.0.so.0 libgimp-2.8.10_3
-libgimpwidgets-2.0.so.0 libgimp-2.8.10_3
-libgimpui-2.0.so.0 libgimp-2.8.10_3
-libgimpbase-2.0.so.0 libgimp-2.8.10_3
-libgimpthumb-2.0.so.0 libgimp-2.8.10_3
-libgimpconfig-2.0.so.0 libgimp-2.8.10_3
-libgimpmath-2.0.so.0 libgimp-2.8.10_3
-libgimpcolor-2.0.so.0 libgimp-2.8.10_3
-libgimpmodule-2.0.so.0 libgimp-2.8.10_3
+libgimp-2.0.so.0 libgimp-2.10.0_1
+libgimpwidgets-2.0.so.0 libgimp-2.10.0_1
+libgimpui-2.0.so.0 libgimp-2.10.0_1
+libgimpbase-2.0.so.0 libgimp-2.10.0_1
+libgimpthumb-2.0.so.0 libgimp-2.10.0_1
+libgimpconfig-2.0.so.0 libgimp-2.10.0_1
+libgimpmath-2.0.so.0 libgimp-2.10.0_1
+libgimpcolor-2.0.so.0 libgimp-2.10.0_1
+libgimpmodule-2.0.so.0 libgimp-2.10.0_1
 libgmic.so.2 gmic-2.1.8_1
 libcgmic.so.2 gmic-2.1.8_1
 libexiv2.so.26 exiv2-0.26_1
@ -2154,11 +2154,14 @@ libopenrawgnome.so.7 libopenraw-0.1.0_1
 libgeda.so.42 geda-1.8.2_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
-libgegl-0.2.so.0 gegl-0.2.0_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.7 procps-ng-3.3.15_1
+libgegl-0.4.so.0 gegl-0.4.0_1
+libgegl-npd-0.4.so gegl-0.4.0_1
+libgegl-sc-0.4.so gegl-0.4.0_1
+libprocps.so.6 procps-ng-3.3.12_1
 libskarnet.so.2.6 skalibs-2.6.0.0_1
 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
 libtidy.so.5 libtidy5-5.1.25_1
@ -2362,10 +2365,12 @@ libpjsip-ua.so.2 pjproject-2.4.5_1
 libpjsip.so.2 pjproject-2.4.5_1
 libpjsua.so.2 pjproject-2.4.5_1
 libpjsua2.so.2 pjproject-2.4.5_1
-libhdf5_hl.so.100 hdf5-1.10.1_1
-libhdf5.so.101 hdf5-1.10.1_1
-libhdf5_hl_cpp.so.100 hdf5-1.10.1_1
-libhdf5_cpp.so.101 hdf5-1.10.1_1
+libhdf5_hl.so.100 hdf5-1.10.1_2
+libhdf5.so.101 hdf5-1.10.1_2
+libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
+libhdf5_cpp.so.101 hdf5-1.10.1_2
+libhdf5hl_fortran.so.100 hdf5-1.10.1_2
+libhdf5_fortran.so.100 hdf5-1.10.1_2
 libhdf5.so.10 hdf5-18-1.8.20_1
 libhdf5_hl.so.10 hdf5-18-1.8.20_1
 libhdf5_hl_cpp.so.11 hdf5-18-1.8.20_1
@ -2919,7 +2924,7 @@ libgcab-1.0.so.0 gcab-0.7_1
 libappstream-glib.so.8 appstream-glib-0.6.13_1
 libappstream-builder.so.8 appstream-glib-0.6.13_1
 libflatpak.so.0 flatpak-0.9.3_2
-libnanomsg.so.5.1.0 nanomsg-1.1.0_2
+libnanomsg.so.5 nanomsg-1.1.3_1
 libindicator3.so.7 libindicator-12.10.1_1
 libappindicator3.so.1 libappindicator-12.10.0_1
 librados.so.2 ceph-11.2.0_1
@ -3056,10 +3061,10 @@ libtecla_r.so.1 libtecla-1.6.3_1
 libzim.so.3 libzim-3.0.0_1
 libkiwix.so.1 kiwix-lib-1.0.1_1
 libctpp2.so.2 ctpp2-2.8.3_1
-librpm.so.7 rpm-4.13.0.2_1
-librpmsign.so.7 rpm-4.13.0.2_1
-librpmbuild.so.7 rpm-4.13.0.2_1
-librpmio.so.7 rpm-4.13.0.2_1
+librpm.so.8 rpm-4.14.1_1
+librpmsign.so.8 rpm-4.14.1_1
+librpmbuild.so.8 rpm-4.14.1_1
+librpmio.so.8 rpm-4.14.1_1
 libsquirrel.so.0 squirrel-libs-3.1_1
 libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@ -11,7 +11,7 @@ fi
 PKGS=$(./xbps-src sort-dependencies $(cat /tmp/templates))

 for pkg in ${PKGS}; do
-	./xbps-src -H $HOME/hostdir $arch -C pkg "$pkg"
+	./xbps-src -H $HOME/hostdir $arch pkg "$pkg"
 	[ $? -eq 1 ] && exit 1
 done

--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@ -4,14 +4,12 @@

 [ "$XLINT" ] && exit 0 

-if [ "$1" != "$2" ]; then
-	arch="-a $2"
-fi
+export XBPS_TARGET_ARCH="$2"

 for pkg in $(cat /tmp/templates); do
 	for subpkg in $(xsubpkg $pkg); do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
-		./xbps-src -H $HOME/hostdir $arch show-files "$subpkg"
+		xbps-query --repository=$HOME/hostdir/binpkgs -f "$subpkg"
 	done
 done

--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@ -48,10 +48,10 @@ update_check() {
                githubname="$(printf %s "$url" | cut -d/ -f4,5)"
                url="https://github.com/$githubname/tags"
                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
-            *gitlab.com*)
-                gitlabname="$(printf %s "$url" | cut -d/ -f4,5)"
-                url="https://gitlab.com/$gitlabname/tags"
-                rx='href="/\Q'$gitlabname'\E/repository/[^\d\.]*\K[\d\.]+(?=/archive\.tar\.gz")';;
+            *gitlab.com*|*gitlab.gnome.org*)
+                gitlaburl="$(printf %s "$url" | cut -d/ -f1-5)"
+                url="$gitlaburl/tags"
+                rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")';;
            *bitbucket.org*)
                bbname="$(printf %s "$url" | cut -d/ -f4,5)"
                url="https://bitbucket.org/$bbname/downloads"
--- a/srcpkgs/Adapta/template
+++ b/srcpkgs/Adapta/template
@ -1,6 +1,6 @@
 # Template file for 'Adapta'
 pkgname=Adapta
-version=3.93.1.16
+version=3.93.1.18
 revision=1
 noarch=yes
 build_style=gnu-configure
@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage=https://github.com/adapta-project/adapta-gtk-theme
 distfiles="https://github.com/adapta-project/adapta-gtk-theme/archive/$version.tar.gz"
-checksum=b8608829471018584ed5b6a66c8abe4a4fa5994d87bff8769f94da539c94e705
+checksum=95fce2565c9d3a6b7ba753c78ab27b456d62702ad11be3d9ce6dbd14f68c6066

 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@ -1,6 +1,6 @@
-# Template build file for 'MoarVM'.
+# Template file for 'MoarVM'
 pkgname=MoarVM
-version=2018.04.1
+version=2018.05
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@ -12,7 +12,7 @@ maintainer="Ruslan <axetwe@gmail.com>"
 license="Artistic-2.0"
 homepage="http://moarvm.com"
 distfiles="http://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum=e3839d25567fd7bc275f51c95493cb24c456df6138636dead24b12898ed96fa3
+checksum=9b4afe7a9a7716285355d4de6ed3991df1d5564c395b749a44de0fbaa768a383
 nocross=yes
 shlib_provides="libmoar.so"

--- a/srcpkgs/MultiMarkdown/template
+++ b/srcpkgs/MultiMarkdown/template
@ -1,38 +1,16 @@
 # Template file for 'MultiMarkdown'
 pkgname=MultiMarkdown
-version=5.4.0
-revision=3
+version=6.3.2
+revision=1
 build_style=cmake
-_greg_git=265003c8cb3022183f48df3e2684336b788af39d
-_cheatsheet_git=199dae83cfd22254a7b329450e48aaedb8d4d2e9
+makedepends="libcurl-devel"
 short_desc="Superset of the Markdown syntax"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="MIT"
 homepage="http://fletcherpenney.net/multimarkdown/"
-distfiles="https://github.com/fletcher/MultiMarkdown-5/archive/$version.tar.gz
- https://github.com/ooc-lang/greg/archive/$_greg_git.tar.gz
- https://github.com/fletcher/human-markdown-reference/archive/$_cheatsheet_git.tar.gz
-"
-checksum="1cc0385ffd6c821c265e970f81cc4ec009c7ecbbfb12e0e115c7bb5b33d09a83
- ada9df7bbd158472c33e6d84b62d0fb39bedd094201f44af1581f0cb468cdc73
- f0176ec41692f275ef4f94c5b8a59e991576abf28ba374d96c34599282509364"
-wrksrc=$pkgname-5-$version
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" $pkgname"
-	configure_args+=" -DIS_CROSSCOMPILING=On"
-fi
-
-pre_configure() {
-	rm -r submodules/*
-	ln -srf ../greg-$_greg_git submodules/greg
-	ln -srf ../human-markdown-reference-$_cheatsheet_git submodules/cheat-sheet
-	make -C submodules/greg CC=cc CFLAGS= LDFLAGS=
-	cp -a . /tmp/$pkgname.$$
-	mv /tmp/$pkgname.$$ submodules/documentation
-	mkdir -p build
-	touch build/README.html
-}
+distfiles="https://github.com/fletcher/MultiMarkdown-6/archive/$version.tar.gz"
+checksum=2b02c2b42a216128ee1596c93840c6e097155aa1c854578535dcf4a0c09b2ff9
+wrksrc="$pkgname-6-$version"

 post_install() {
 	# TODO: markdown alternatives
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@ -1,23 +1,24 @@
 # Template file for 'Quaternion'
 pkgname=Quaternion
-version=0.0.4
+version=0.0.9
 revision=1
+_libqmatrix_version=0.2.1
+create_wrksrc=yes
+build_wrksrc="Quaternion-${version}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols"
 depends="qt5-quickcontrols"
 short_desc="Qt5-based IM client for the Matrix protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/QMatrixClient/Quaternion"
 distfiles="
 https://github.com/QMatrixClient/Quaternion/archive/v${version}.tar.gz
- https://github.com/QMatrixClient/libqmatrixclient/archive/v0.1.tar.gz"
-checksum="
- 8647bd74f24d3225333932a92a461da4fdee10a1a8dd639c38506a20ddb82063
- 922c6bc420671a16ecadeb7fb5f4fb3a42308d30e8741d2997bfc11e1053edcf"
+ https://github.com/QMatrixClient/libqmatrixclient/archive/v${_libqmatrix_version}.tar.gz"
+checksum="0f471051abf31acdd70a80de3b731775d4d8ad4fbe45f4d72371fc7229321b16
+ 615f52f29b0958a633587846bd9f8ff711cc58f7e0fbb98ea485e0746d7f01a3"

-do_extract() {
-	tar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${version}.tar.gz -C ${wrksrc} --strip-components=1
-	tar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v0.1.tar.gz -C ${wrksrc}/lib --strip-components=1
+post_extract() {
+	mv libqmatrixclient-${_libqmatrix_version}/* ${build_wrksrc}/lib
 }
--- a/srcpkgs/SoapyHackRF/template
+++ b/srcpkgs/SoapyHackRF/template
@ -1,6 +1,6 @@
 # Template file for 'SoapyHackRF'
 pkgname=SoapyHackRF
-version=0.3.2
+version=0.3.3
 revision=1
 wrksrc="${pkgname}-soapy-hackrf-${version}"
 build_style=cmake
@ -11,7 +11,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="MIT"
 homepage="https://github.com/pothosware/SoapyHackRF"
 distfiles="${homepage}/archive/soapy-hackrf-${version}.tar.gz"
-checksum=1f96103e9390f059e469b537c9f697fe998df10c78504f531408626023dc81fd
+checksum=7b24a47cee42156093bf82982b4fc6184a7c86101c3b8ee450274e57ee1c4b90

 post_install() {
 	vlicense LICENSE
--- a/srcpkgs/SoapyRTLSDR/template
+++ b/srcpkgs/SoapyRTLSDR/template
@ -1,6 +1,6 @@
 # Template file for 'SoapyRTLSDR'
 pkgname=SoapyRTLSDR
-version=0.2.4
+version=0.2.5
 revision=1
 wrksrc="${pkgname}-soapy-rtlsdr-${version}"
 build_style=cmake
@ -11,7 +11,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="MIT"
 homepage="https://github.com/pothosware/SoapyRTLSDR"
 distfiles="${homepage}/archive/soapy-rtlsdr-${version}.tar.gz"
-checksum=b034025d5c9ced8a371511cb8b14dc841996477f86387a4ebd58d0e71747db59
+checksum=381a2b5f02444fb1e688b49d742fb54bd5f624b96e710b470203fc4643148c15

 post_install() {
 	vlicense LICENSE.txt LICENSE
--- a/srcpkgs/abcm2ps/template
+++ b/srcpkgs/abcm2ps/template
@ -1,6 +1,6 @@
 # Template file for 'abcm2ps'
 pkgname=abcm2ps
-version=8.13.21
+version=8.13.22
 revision=1
 build_style=configure
 hostmakedepends="pkg-config"
@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://moinejf.free.fr/"
 distfiles="https://github.com/leesavide/abcm2ps/archive/v${version}.tar.gz"
-checksum=2c3f9bdac281feddc384e5719e3cd29f85c88cb326077516760425ebd0be6cd1
+checksum=9a1379fd93fcf2d87d580c85b43ca1930a4bc412c291be551af1035d08f26c36

 pre_configure() {
 	echo CC=${CC} >> custom
--- a/srcpkgs/acr/template
+++ b/srcpkgs/acr/template
@ -1,12 +1,12 @@
 # Template file for 'acr'
 pkgname=acr
-version=1.0
+version=1.6.2
 revision=1
 noarch=yes
 build_style=gnu-configure
 short_desc="AutoConf Replacement"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-3"
-homepage="http://radare.org"
-distfiles="${homepage}/get/acr-${version}.tar.gz"
-checksum=b44c083ce988c62f9ac929784e1de69db01ec56b9e71ea9fcc5bed93f88052c6
+maintainer="criw <contact@thecriw.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/radare/acr"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=12b2f5ceb4da4507fba5242fe5596b8e25916478709f1d6189cbc016b01e6661
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@ -1,8 +1,8 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.1.0.20170911
+version=0.1.0.20180508
 revision=1
-_commit=eb231b3e70b87875df4bdd1974d5e94704024d70
+_commit=24e8a19e7d981fbc8853891ad4a17a9de2ac36bd
 wrksrc="${pkgname}-${_commit}"
 hostmakedepends="rust cargo cmake pkg-config"
 makedepends="freetype-devel fontconfig-devel"
@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://github.com/jwilm/alacritty"
 distfiles="${homepage}/archive/${_commit}.tar.gz"
-checksum=1d697f08bb4a63142d6ca36b2eaef0ce92cbd13eb029b1a393fcca691237bd1c
+checksum=91d9f6b01770fa3e9ac4da306bbe95eae56819f13cc77668d7dd1ed2874b60b5

 nocross=yes

--- a/srcpkgs/annie/template
+++ b/srcpkgs/annie/template
@ -1,7 +1,7 @@
 # Template file for 'annie'
 pkgname=annie
-version=0.6.9
-revision=2
+version=0.7.2
+revision=1
 build_style=go
 go_import_path="github.com/iawia002/annie"
 depends="ffmpeg"
@ -10,7 +10,7 @@ maintainer="cr6git <quark6@protonmail.com>"
 license="MIT"
 homepage="https://github.com/iawia002/annie"
 distfiles="https://github.com/iawia002/annie/archive/${version}.tar.gz"
-checksum=46f6933b044052986b133cbc98789cf3fddcc87c8334cc9aff53e662189f9f2e
+checksum=a13993132f37a8b42a6bd3d4c0f33eaf708bb409db612f35886d2cc7ee451216

 post_install() {
 	vlicense LICENSE
--- a/srcpkgs/awesome/template
+++ b/srcpkgs/awesome/template
@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DSYSCONFDIR=/etc
 -DLUA_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/lua5.2
 -DLUA_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/liblua5.2.so.5.2"
-hostmakedepends="which xmlto asciidoc pkg-config"
+hostmakedepends="xmlto asciidoc pkg-config"
 makedepends="
 libxcb-devel pango-devel xcb-util-devel xcb-util-image-devel
 xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@ -1,15 +1,15 @@
 # Template build file for 'babl'.
 pkgname=babl
-version=0.1.46
+version=0.1.50
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config vala-devel"
 short_desc="Dynamic pixel format translation library"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
+maintainer="Enno Boland <gottox@voidlinux.eu>"
 homepage="http://gegl.org/babl/"
 license="LGPL-3.0-only"
 distfiles="https://ftp.gimp.org/pub/babl/${version%.*}/babl-$version.tar.bz2"
-checksum=bbc2403b1badf8014ec42200e65d7b1f46e68e627c33c6242fa31ac5dc869e5b
+checksum=b52c1dc081ff9ae8bc4cb7cdb959c762ea692b9f4431bacf8d17a14dbcc85b2d

 babl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
--- a/srcpkgs/barrier-gui
+++ b/srcpkgs/barrier-gui
@ -0,0 +1 @@
+barrier
--- a/srcpkgs/barrier/files/barrierc/run
+++ b/srcpkgs/barrier/files/barrierc/run
@ -0,0 +1,5 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+[ -z $SERVER_ADDR ] && exit 0
+[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
+exec barrierc --no-daemon ${OPTS:=--restart} $SERVER_ADDR
--- a/srcpkgs/barrier/files/barriers/run
+++ b/srcpkgs/barrier/files/barriers/run
@ -0,0 +1,4 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
+exec barriers --no-daemon ${OPTS:=--restart}
--- a/srcpkgs/barrier/patches/avahi.patch
+++ b/srcpkgs/barrier/patches/avahi.patch
@ -0,0 +1,22 @@
+--- masterdir/builddir/barrier-2.1.1/CMakeLists.txt	2018-05-16 04:48:18.000000000 +0200
+++ CMakeLists.txt	2018-05-25 18:57:40.584542261 +0200
+@@ -63,6 +63,7 @@
+     include (CheckIncludeFileCXX)
+     include (CheckSymbolExists)
+     include (CheckCSourceCompiles)
+    include (FindPkgConfig)
+ 
+     check_include_file_cxx (istream HAVE_ISTREAM)
+     check_include_file_cxx (ostream HAVE_OSTREAM)
+@@ -162,6 +163,11 @@
+             include_directories("/usr/local/include" "/usr/local/include/avahi-compat-libdns_sd")
+             link_directories("/usr/local/lib")
+         endif()
+	if (${PKG_CONFIG_FOUND})
+		pkg_check_modules (LIBDNS_SD REQUIRED avahi-compat-libdns_sd)
+		include_directories (BEFORE SYSTEM ${LIBDNS_SD_INCLUDE_DIRS})
+		set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${LIBDNS_SD_INCLUDE_DIRS}")
+	endif ()
+ 
+         set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
+         set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@ -0,0 +1,43 @@
+# Template file for 'barrier'
+pkgname=barrier
+version=2.1.1
+revision=1
+build_style=cmake
+configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
+makedepends="avahi-compat-libs-devel libcurl-devel qt5-devel
+ libSM-devel libXext-devel libXrandr-devel libXtst-devel libXinerama-devel"
+short_desc="Open-source KVM software based on Synergy"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-only"
+homepage="https://github.com/debauchee/barrier"
+distfiles="https://github.com/debauchee/barrier/archive/v${version}.tar.gz"
+checksum=775d504db6091c4dc479657fc4fc566ceb9893426664ae60c9a2bb198b562774
+
+pre_build() {
+	sed -i -e 's/__DATE__/"May 25 2018"/g' src/gui/src/AboutDialog.cpp
+}
+
+do_install() {
+	vbin build/bin/barrier
+	vbin build/bin/barrierc
+	vbin build/bin/barriers
+
+	vmkdir usr/share/examples/${pkgname}
+	install -m644 doc/barrier.conf.example* \
+		${DESTDIR}/usr/share/examples/${pkgname}
+
+	vinstall res/barrier.desktop 644 usr/share/applications
+	vinstall res/barrier.png 644 usr/share/pixmaps
+
+	vsv barrierc
+	vsv barriers
+
+}
+barrier-gui_package() {
+	pkg_install() {
+		vmove usr/share/pixmaps
+		vmove usr/share/applications
+		vmove usr/bin/barrier
+	}
+}
--- a/srcpkgs/bcal/template
+++ b/srcpkgs/bcal/template
@ -1,17 +1,16 @@
 # Template file for 'bcal'
 pkgname=bcal
-version=1.8
+version=1.9
 revision=1
 build_style=gnu-makefile
-makedepends="libquadmath-devel"
+makedepends="libquadmath-devel readline-devel"
 short_desc="Byte CALculator for storage conversions and calculations"
 maintainer="maxice8 <thinkabit.ukim@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/bcal"
 distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz"
-checksum=2bdf9057456e30e97ace3becbdbf7642bbc1689668e8aaad2ef6bfe9c4de9603
+checksum=5d075deaef087680ea4c153ed5f0696f8be149a59ce0e5aaeb3f5b1180b2ec81
 nocross=yes
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="https://build.voidlinux.eu/builders/i686_builder/builds/6760/steps/shell_3/logs/stdio";;
 esac
-
--- a/srcpkgs/buku/template
+++ b/srcpkgs/buku/template
@ -1,24 +1,21 @@
 # Template file for 'buku'
 pkgname=buku
-version=3.7
+version=3.8
 revision=1
-wrksrc=Buku-${version}
-python_version="3"
-checkdepends="python3-pytest python3-BeautifulSoup4 python3-requests python3-cryptography
- python3-hypothesis"
-depends="python3 python3-requests"
-short_desc="A cmdline bookmark management utility"
+noarch=yes
+wrksrc="Buku-${version}"
+checkdepends="python3-BeautifulSoup4 python3-atomicwrites python3-cryptography
+ python3-hypothesis python3-pytest python3-urllib3 python3-yaml"
+depends="${checkdepends}"
+short_desc="Cmdline bookmark management utility"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/Buku"
 distfiles="https://github.com/jarun/Buku/archive/v${version}.tar.gz"
-checksum=0d39a86c6c319378af20c568a282a13c963655f60fc68f512eb83fce6a1435df
-noarch=yes
+checksum=bca35fe1b7dbf88ed3af07e0daa4bc0a736d2f85b3103efcb18d542eebb2eebe

 do_check() {
-	# bukuDb requires unpackaged python-pytest-capturelog
-	# https://pypi.org/project/pytest-capturelog/ for the interested
-	pytest3 --ignore=tests/test_bukuDb.py
+	pytest3
 }

 do_install() {
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@ -1,6 +1,6 @@
-# Build template for 'busybox'.
+# Template file for 'busybox'
 pkgname=busybox
-version=1.28.3
+version=1.28.4
 revision=1
 hostmakedepends="perl"
 checkdepends="zip"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2.0-only"
 homepage="http://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
-checksum=ad0d22033f23e696f9a71a4c2f9210194dda39b024a79151f4ac278995332a6e
+checksum=e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a

 alternatives="
 awk:awk:/usr/bin/busybox
@ -48,10 +48,12 @@ do_configure() {
 		sed -i "s/\(#define AUTOCONF_TIMESTAMP\).*/\1 \"$d\"/" */include/autoconf.h
 	fi
 }
+
 do_build() {
 	make -C busybox SKIP_STRIP=y ${makejobs}
 	make -C busybox-static SKIP_STRIP=y ${makejobs}
 }
+
 do_check() {
 	# Copy the testsuite into the busybox and it's static counterpart
 	# directory
@ -74,6 +76,7 @@ do_check() {
 	SKIP_KNOWN_BUGS=yes ./runtest -v
 	)
 }
+
 do_install() {
 	vbin busybox/busybox_unstripped busybox
 	vman busybox/docs/busybox.1
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20180510
+version=20180525
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=d0940dbffbc7e9c9dd4985c25349c390beede84ae1d9fe86b71c0aa659a6d693
+checksum=129b8d8be35c2cecb89e4ef434dc512402c0243f485334c5733ddf1e267c2de6

 alternatives="
 yacc:yacc:/usr/bin/byacc
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@ -1,6 +1,6 @@
 # Template file for 'cJSON'
 pkgname=cJSON
-version=1.7.6
+version=1.7.7
 revision=1
 build_style=cmake
 short_desc="Ultralightweight JSON parser in ANSI C"
@ -8,7 +8,11 @@ maintainer="maxice8 <thinkabit.ukim@gmail.com>"
 license="MIT"
 homepage="https://github.com/DaveGamble/cJSON"
 distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=d1ca2665b34fea164a877637b4ad1624aa23390fe75de91b88e18c5d6ec91978
+checksum=6eb9d852a97ffbe149e747f54d63e39a674fa248bb24902a14c079803067949a
+
+post_install() {
+	vlicense LICENSE
+}

 cJSON-devel_package() {
 	depends="cJSON-${version}_${revision}"
@ -19,4 +23,4 @@ cJSON-devel_package() {
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
-}
+}
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@ -1,6 +1,6 @@
 # Template file for 'caffeine-ng'
 pkgname=caffeine-ng
-version=3.4.1
+version=3.4.2
 revision=1
 noarch=yes
 build_style=python3-module
@ -12,9 +12,9 @@ depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify
 short_desc="Temporarily inhibits the screensaver and sleep mode"
 maintainer="cr6git <quark6@protonmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://gitlab.com/DJCrashdummy/caffeine-ng"
+homepage="https://github.com/caffeine-ng/caffeine-ng"
 distfiles="${PYPI_SITE}/c/caffeine-ng/caffeine-ng-${version}.tar.gz"
-checksum=8128c126c621f37c763148ccc2cabe5d1dd59d3ec9f52ed4c2a269a7e6c4a0cb
+checksum=9cf843f9359b4b8cdb2ad4a14bb433641a100e25206274eb638c494765d56816

 pre_build() {
 	sed -i setup.py \
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@ -1,13 +1,13 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config"
 # XXX libetpan, libdbusmenu, etc
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
 libical-devel libxklavier-devel zeitgeist-devel libsensors-devel
- cairo-dock-devel gnome-menus-devel webkitgtk-devel
+ cairo-dock-devel gnome-menus-devel
 vte290-devel vala-devel python-devel python3-devel upower-devel"
 depends="cairo-dock>=${version} ConsoleKit2 upower"
 short_desc="Plugins for cairo-dock"
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=3.23.0
+version=3.24.2
 revision=1
 hostmakedepends="qt5-qmake python-devel pkg-config
 python-dateutil python-lxml python-Pillow
@ -21,7 +21,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 homepage="https://calibre-ebook.com"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=c98564e6b5599a4838c68b8266559a487d15abfc04331ad850fcbe09db884337
+checksum=e6bdb8475705ca507871214b935627dd8e5341a5c885ef080b171f3dfecb40c8

 nocross=yes
 pycompile_dirs="/usr/lib/calibre/"
--- a/srcpkgs/checkbashisms/template
+++ b/srcpkgs/checkbashisms/template
@ -1,6 +1,6 @@
 # Template file for 'checkbashisms'
 pkgname=checkbashisms
-version=2.18.2
+version=2.18.3
 revision=1
 noarch=yes
 wrksrc="devscripts-${version}"
@ -8,17 +8,19 @@ checkdepends="shunit2 perl"
 depends="perl"
 short_desc="Debian script that checks for bash-isms"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://tracker.debian.org/pkg/devscripts"
 license="GPL-2.0-or-later"
+homepage="https://tracker.debian.org/pkg/devscripts"
 distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz"
-checksum=645b5814be7a9d1f4f3df1931f6d9c645e1fd75071ddafabd798f9459277d435
+checksum=b6d683d3630b63c45186ece5ccd7729a7055ddcc0fbe91e09ec196e8bf82b0c4

 pre_install() {
 	sed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl
 }
+
 do_check() {
 	./test/test_checkbashisms
 }
+
 do_install() {
 	vbin scripts/checkbashisms.pl checkbashisms
 	vman scripts/checkbashisms.1
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 go_import_path="github.com/alecthomas/${pkgname}"
@ -10,7 +10,7 @@ short_desc="A general purpose syntax highlighter"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-homepage="https://${go_import_path}"
+homepage="https://github.com/alecthomas/chroma"
 checksum=c48ce658a25f3422b4c493d769b823b2eb5ce9c19748ccff304bad4099ee54f3

 post_install() {
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@ -1,6 +1,6 @@
 # Template build file for "chroot-git".
 pkgname=chroot-git
-version=2.16.2
+version=2.17.0
 revision=1
 bootstrap=yes
 wrksrc="git-$version"
@ -14,10 +14,10 @@ make_build_args="CC_LD_DYNPATH=-L"
 make_install_args="NO_INSTALL_HARDLINKS=1"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://git-scm.com/"
-license="GPL-2"
+license="GPL-2.0-or-later"
+homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=5560578bd21468d98637f41515c165d32f69caff0838b8989dee5ce10022c717
+checksum=e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7

 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl"
@ -28,6 +28,6 @@ fi
 do_install() {
 	# remove unneeded stuff.
 	make DESTDIR=${wrksrc}/build-tmp install
-	vmkdir usr/bin
+
 	vbin ${wrksrc}/build-tmp/usr/bin/git chroot-git
 }
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@ -1,6 +1,6 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.11.1
+version=3.11.2
 revision=1
 build_style=configure
 makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/$pkgname-$version.tar.gz"
-checksum=57bebc6ca4d1d42c6385249d148d9216087e0fda57a47dc5c858790a70217d0c
+checksum=5ebc22bbcf2b4c7a20c4190d42c084cf38680a85b1a7980a2f1d5b4a52bf5248
 make_check_target="test"

 if [ "$CROSS_BUILD" ]; then
--- a/srcpkgs/cproto/template
+++ b/srcpkgs/cproto/template
@ -1,6 +1,6 @@
 # Template file for 'cproto'
 pkgname=cproto
-version=4.7m
+version=4.7o
 revision=1
 build_style=gnu-configure
 hostmakedepends="flex"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Public domain"
 homepage="http://invisible-island.net/cproto/cproto.html"
 distfiles="ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
-checksum=4b482e80f1b492e94f8dcda74d25a7bd0381c870eb500c18e7970ceacdc07c89
+checksum=c76b0b72064e59709459bb7d75d6ec929f77ce5ae7f2610d169ba0fa20ccb44f

 do_install() {
 	make bindir=${DESTDIR}/usr/bin mandir=${DESTDIR}/usr/share/man install
--- a/srcpkgs/criu/template
+++ b/srcpkgs/criu/template
@ -1,6 +1,6 @@
 # Template file for 'criu'
 pkgname=criu
-version=3.8.1
+version=3.9
 revision=1
 make_use_env=compliant
 build_style=gnu-makefile
@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-only"
 homepage="http://criu.org/"
 distfiles="https://download.openvz.org/criu/criu-$version.tar.bz2"
-checksum=a134ccedd84fc9377c758f204d4e997fd8fe514fd05cbdbd64939b5698865e33
+checksum=dd95d35ae6a4eb160926d1b86405e90ba98dfcb9f39e21976057904c67a5e150
 nocross="fails to run protobuf internals"

 case "$XBPS_TARGET_MACHINE" in
@ -31,7 +31,7 @@ criu-devel_package() {
 	depends="criu-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 	}
 }
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@ -1,26 +1,24 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
-version=1.20.1
-revision=3
+version=1.20.3
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
 --with-browseremoteprotocols=DNSSD,CUPS"
-hostmakedepends="pkg-config ghostscript poppler-utils mupdf-tools glib-devel"
-makedepends="lcms2-devel libpng-devel libqpdf-devel
- poppler-cpp-devel fontconfig-devel avahi-glib-libs-devel
- ghostscript-devel cups-devel"
-depends="libcups-filters-${version}_${revision} ghostscript poppler-utils bc"
+hostmakedepends="ghostscript glib-devel mupdf-tools poppler-utils pkg-config"
+makedepends="avahi-glib-libs-devel cups-devel fontconfig-devel
+ ghostscript-devel lcms2-devel libqpdf-devel poppler-cpp-devel"
+depends="bc ghostscript libcups-filters-${version}_${revision} poppler-utils"
 checkdepends="dejavu-fonts-ttf"
 conf_files="/etc/cups/cups-browsed.conf"
 short_desc="The OpenPrinting CUPS Filters"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2, LGPL-2.1, MIT"
-homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
-distfiles="http://www.openprinting.org/download/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=b36b58f8d4d776d337f22b7b89794afbce6fd10e8e9066a89591d8f2210f3d62
+license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz"
+checksum=3b9a171c8270fcffc168845325c5358bdc38f716fad115278bbdfd44f7c428bc

 lib32disabled=yes
-disable_parallel_build=yes

 pre_check() {
 	ln -s /usr/share/fonts/TTF /usr/share/fonts/dejavu
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@ -1,6 +1,6 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.99
+version=1.0.100
 revision=1
 build_style=fetch
 depends="binutils gnupg gzip tar wget xz"
@ -10,7 +10,7 @@ license="MIT"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
 ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2014.3_all.deb"
-checksum="51f86f71d28876cd0cf920fac095ac75a7ecfb37a602cbeeb35cb29ffa4d9f36
+checksum="d988404ebd562a30d6b11303bca8921eb2f9a407a6425a65200f9afe852fbe1c
 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0"

 do_install() {
--- a/srcpkgs/desktop-file-utils/template
+++ b/srcpkgs/desktop-file-utils/template
@ -1,7 +1,7 @@
 # Template build file for 'desktop-file-utils'.
 pkgname=desktop-file-utils
 version=0.23
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
--- a/srcpkgs/disorderfs/template
+++ b/srcpkgs/disorderfs/template
@ -10,9 +10,9 @@ short_desc="FUSE filesystem that introduces non-determinism filesystem metadata"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-3.0-or-later"
 homepage="https://reproducible-builds.org/tools/"
-#changelog="https://raw.githubusercontent.com/ReproducibleBuilds/disorderfs/master/NEWS"
-distfiles="https://github.com/ReproducibleBuilds/disorderfs/archive/${version}.tar.gz"
-checksum=cac1384475dca7e96d00ebe011036181e83a06c68648de0d84b6e80ec8198caa
+#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=686136642094adc2b5fe6749dfad02f54ff03d5b53d91c42050b97e7b3e222a1
 make_check_target="test"

 do_check() {
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@ -1,6 +1,6 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
-version=2.0.13
+version=2.0.14
 revision=1
 build_style=go
 short_desc="DNS proxy that encrypts queries"
@ -11,7 +11,7 @@ license="ISC"
 homepage="https://github.com/jedisct1/dnscrypt-proxy"
 #changelog="https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/ChangeLog"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c045fd625c0462508dd48527a33ea72a497aef08f90da7aa458cc621f3a71f30
+checksum=291541c0a5c24189c4d76349ac2685823aaed808d02afd608cfc69c80f452d9d
 conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"

--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.21.1
+version=1.21.2
 revision=1
 noarch=yes
 wrksrc="compose-${version}"
@ -12,10 +12,10 @@ depends="python3-setuptools python3-jsonschema python3-docker python3-dockerpty
 python3-six python3-texttable python3-cached-property"
 short_desc="Tool to define and run multi-container Docker applications"
 maintainer="pancake <pancake@nopcode.org>"
-homepage="https://docs.docker.com/compose/"
 license="Apache-2.0"
+homepage="https://docs.docker.com/compose/"
 distfiles="https://github.com/docker/compose/archive/${version}.tar.gz"
-checksum=aa9016685a8ee5cf27677cc985c9b9e984a454556e0407d3ab3d4ad9cefddd69
+checksum=3fdaa361dceb919b6008a925b8b672d7402cc3dd8277b8f26b028dd546d39926

 pre_build() {
 	# remove all upper bounds
--- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch
+++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
@ -0,0 +1,11 @@
+--- modules.d/95udev-rules/module-setup.sh	2018-02-19 06:00:33.000000000 -0300
+++ modules.d/95udev-rules/module-setup.sh	2018-05-02 00:27:53.710253893 -0300
+@@ -39,6 +39,8 @@
+         60-persistent-storage.rules \
+         61-persistent-storage-edd.rules \
+         70-uaccess.rules \
+        71-plymouth-seat.rules \
+        71-udev-seat.rules \
+         71-seat.rules \
+         73-seat-late.rules \
+         75-net-description.rules \
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=047
-revision=4
+revision=5
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="asciidoc pkg-config"
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.7.0
+version=4.7.3a
 revision=1
 wrksrc="eclipse"
-depends="virtual?java-environment unzip gtk+ webkitgtk2 libXtst hicolor-icon-theme desktop-file-utils"
+depends="virtual?java-environment unzip gtk+3 webkit2gtk libXtst hicolor-icon-theme desktop-file-utils"
 short_desc="An IDE for Java and other languages"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="EPL"
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@ -1,11 +1,11 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.28.1.1
+version=3.28.2.1
 revision=1
 build_style=meson
 configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=false"
 hostmakedepends="glib-devel gnome-doc-utils gobject-introspection intltool
- itstool pkg-config which"
+ itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
 gnome-desktop-devel json-glib-devel libnotify-devel libsecret-devel
 libsoup-gnome-devel libwnck-devel libxslt-devel nettle-devel nss-devel
@ -16,4 +16,4 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnome.org/projects/epiphany/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
-checksum=99426aa0e386742e924d84b59ec16bf394195fb9fce85d07f72d2cde486ea495
+checksum=baa4e9f0ac0b1e95fa2027af796859114f448f0f274976c30c9b8db734c6402d
--- a/srcpkgs/etcetera/template
+++ b/srcpkgs/etcetera/template
@ -1,22 +1,24 @@
 # Template file for 'etcetera'
 pkgname=etcetera
-version=0.4
+version=0.5
 revision=1
-depends="python3"
-pycompile_dirs="/usr/lib/etcetera"
 noarch=yes
-conf_files="/etc/etcetera.conf"
+pycompile_dirs="/usr/lib/etcetera"
+depends="python3"
 short_desc="Config file management with a touch of wisdom"
 maintainer="cr6git <quark6@protonmail.com>"
+license="GPL-3.0-or-later"
 homepage="https://github.com/jeancf/etcetera"
-license="GPL-3"
 distfiles="https://github.com/jeancf/etcetera/archive/v${version}.tar.gz"
-checksum=226991b37badf2950654fda3eaf54e884661225c459a5c32023450c3b2d1f3a7
+checksum=1cf1df80dabddc9207fa1c44d6d2ac26fe935e084cd6d83ea8d8a7fb4c8b972d
+conf_files="/etc/etcetera.conf"

 do_install() {
 	vbin etcetera
 	vinstall commands.py 644 usr/lib/etcetera
 	vinstall toolbox.py 644 usr/lib/etcetera
+	vinstall term_colors.py 644 usr/lib/etcetera
+	vinstall parser.py 755 usr/lib/etcetera
 	vinstall README.md 644 usr/share/etcetera
 	vinstall etcetera-logo.png 644 usr/share/etcetera
 	vinstall etcetera.conf 644 etc
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=10.97
+version=10.98
 revision=1
 noarch=yes
 wrksrc="Image-ExifTool-${version}"
@ -14,4 +14,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/"
 #changelog="https://sno.phy.queensu.ca/~phil/exiftool/history.html"
 distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz"
-checksum=b27a3e8b0f894c8d35276925030fe8274e6b69e1339554c19ac392872b8e67d4
+checksum=127ab7f3e5cbbdb8cfa4955f8a44a2bac6a9ea67fac32cfa2dc9e65a89ca0b49
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@ -1,8 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.0.1
-revision=2
-replaces="qupzilla>=0"
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools python3"
 makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
--- a/srcpkgs/filelight/patches/musl.patch
+++ b/srcpkgs/filelight/patches/musl.patch
@ -0,0 +1,54 @@
+--- src/radialMap/sincos.h	2018-05-06 06:10:38.000000000 +0200
+++ -	2018-05-25 01:24:06.234265312 +0200
+@@ -21,10 +21,10 @@
+ 
+ #ifndef SINCOS_H
+ #define SINCOS_H
+-
+#define _GNU_SOURCE
+ #include <math.h>
+ 
+-#if !defined(__GLIBC__) || (__GLIBC__ < 2) ||  (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
+#if (__GLIBC__ < 2) ||  (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
+ 
+ #include <qmath.h>
+ 
+--- src/localLister.cpp	2018-05-06 06:10:38.000000000 +0200
+++ -	2018-05-25 01:33:28.202631988 +0200
+@@ -35,8 +35,10 @@
+ #ifdef Q_OS_SOLARIS
+ #include <sys/vfstab.h>
+ #elif !defined(Q_OS_WIN)
+#ifdef __GLIBC__
+ #include <fstab.h>
+ #endif
+#endif
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+--- src/radialMap/sincos.h	2018-05-25 01:30:46.775385798 +0200
+++ -	2018-05-25 01:34:59.788609200 +0200
+@@ -23,23 +23,4 @@
+ #define SINCOS_H
+ #define _GNU_SOURCE
+ #include <math.h>
+-
+-#if (__GLIBC__ < 2) ||  (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
+-
+-#include <qmath.h>
+-
+-void
+-sincos(double angleRadians, double *Sin, double *Cos);
+-
+-#ifdef SINCOS_H_IMPLEMENTATION
+-void
+-sincos(double angleRadians, double *Sin, double *Cos)
+-{
+-    *Sin = qSin(angleRadians);
+-    *Cos = qCos(angleRadians);
+-}
+-#endif
+-
+-#endif
+-
+ #endif
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@ -15,9 +15,3 @@ checksum=5a197d16b36b04eafd53385e7f50ac31930953ac8ad8ae021c02953a064926f0
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake"
 fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		# missing fstab.h
-		broken="https://travis-ci.org/voidlinux/void-packages/jobs/339621627" ;;
-esac
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@ -60,7 +60,7 @@ do_build() {
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig
 		echo "ac_add_options --enable-gold=no" >>.mozconfig
 		;;
-	arm*)
+	arm*|aarch64*)
 		echo "ac_add_options --enable-gold=no" >>.mozconfig
 		;;
 	esac
--- a/srcpkgs/fmit/template
+++ b/srcpkgs/fmit/template
@ -1,6 +1,6 @@
 # Template file for 'fmit'
 pkgname=fmit
-version=1.1.18
+version=1.2.4
 revision=1
 build_style=qmake
 configure_args="CONFIG+=acs_qt CONFIG+=acs_alsa CONFIG+=acs_jack CONFIG+=acs_portaudio"
@ -8,12 +8,12 @@ hostmakedepends="pkg-config qt5-tools"
 makedepends="alsa-lib-devel fftw-devel jack-devel portaudio-devel
 pulseaudio-devel qt5-multimedia-devel qt5-svg-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-maintainer="cr6git <quark6@protonmail.com>"
 short_desc="Graphical utility for tuning your musical instruments"
+maintainer="cr6git <quark6@protonmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://gillesdegottex.github.io/fmit/"
 distfiles="https://github.com/gillesdegottex/fmit/archive/v${version}.tar.gz"
-checksum=aa2ef9857bf2e71a7174fc45b9a05c7745ecee8332d9818640588aae93f59ae4
+checksum=b78a9ba07d13e38facf8a9e41445a91001110867ccf395aaa6c81cafcccf5726

 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-multimedia-devel qt5-svg-devel"
--- a/srcpkgs/font-hanazono/template
+++ b/srcpkgs/font-hanazono/template
@ -1,7 +1,7 @@
 # Template build file for 'font-hanazono'.
 pkgname=font-hanazono
-version=20160201
-_revision=64385
+version=20170904
+_revision=68253
 revision=1
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 short_desc="Hanazono is a free kanji font"
@ -14,7 +14,7 @@ font_dirs="/usr/share/fonts/TTF"
 create_wrksrc=yes

 distfiles="http://jaist.dl.sourceforge.jp/hanazono-font/${_revision}/hanazono-${version}.zip"
-checksum=2b89af892d969edbb47b5adf75663a76c2bec5961467e65557b623f6b2add139
+checksum=571cd4a09ae7da0c642d640fc2442c050aa450ebb0587a95cdd097d41a9c9572

 do_install() {
 	vmkdir usr/share/fonts/TTF
--- a/srcpkgs/font-hanazono/update
+++ b/srcpkgs/font-hanazono/update
@ -0,0 +1,2 @@
+pkgname=hanazono
+site="https://ja.osdn.net/projects/hanazono-font/releases/rss"
--- a/srcpkgs/freeipmi/template
+++ b/srcpkgs/freeipmi/template
@ -1,6 +1,6 @@
 # Template file for 'freeipmi'
 pkgname=freeipmi
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=gnu-configure
 configure_args="--without-systemdsystemunitdir ac_cv_header_sys_stropts_h=no"
@ -8,15 +8,15 @@ conf_files="/etc/freeipmi/*.conf"
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel"
 short_desc="In-band and out-of-band IPMI software"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
+maintainer="Toyam Cox <Vaelatern@voidlinux.eu>"
 license="GPL-3"
 # Changelog: http://www.gnu.org/software/freeipmi/NEWS
 homepage="http://www.gnu.org/software/freeipmi/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a2550e08e1f2d681efe770162125ac899022a6acf96256e5b7404eabb90db549
+checksum=31513324591bf8d79d7cdeb39ecfac45e0ea7f6a5905a625a4a906fb8270124a

 case "$XBPS_TARGET_MACHINE" in
-aarch64) configure_args+=" ac_cv_header_sys_io_h=no";;
+	aarch64) configure_args+=" ac_cv_header_sys_io_h=no";;
 esac

 post_install() {
@ -31,8 +31,8 @@ freeipmi-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/*.a
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 		vmove usr/share/man/man3
 		vmove usr/lib/pkgconfig
 	}
--- a/srcpkgs/garden/template
+++ b/srcpkgs/garden/template
@ -1,14 +1,14 @@
 # Template file for 'garden'
 pkgname=garden
 version=1.0.9
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="allegro4-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-maintainer="cr6git <quark6@protonmail.com>"
 short_desc="Old school 2D vertical shoot-em-up with some innovative elements"
+maintainer="cr6git <quark6@protonmail.com>"
+license="GPL-3.0-or-later"
 homepage="http://garden.sourceforge.net/drupal/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/garden/garden/${version}/garden-${version}.tar.gz"
 checksum=daf8732c229a4cc04f460514bff1ba05171faada9e19575c72a50a914f2352e3

@ -18,10 +18,6 @@ pre_configure() {
 	sed -i "s|^inline int ypart (int|int ypart (int|" src/stuff.c
 }

-do_configure() {
-	LIBS="$LIBS -lm" ./configure --prefix=/usr
-}
-
 post_install() {
 	vinstall resources/garden.desktop 644 usr/share/applications
 	vinstall resources/garden.svg 644 usr/share/icons/hicolor/scalable/apps
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@ -5,9 +5,9 @@ revision=2
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
-hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
+hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
- hicolor-icon-theme desktop-file-utils GConf-devel"
+ hicolor-icon-theme desktop-file-utils gnome-doc-utils GConf-devel"
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@ -1,6 +1,6 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.28.1
+version=3.28.2
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection)
@ -15,12 +15,13 @@ makedepends="accountsservice-devel dconf elogind-devel gettext-devel glib-devel
 iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel"
 depends="gnome-settings-daemon gnome-shell xorg-server xorg-server-xwayland
 xrdb"
+checkdepends="check-devel"
 short_desc="GNOME Display Manager"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=77068fa775bc2c002e85883c250103f6a77361d32ba0cb8a60997b70b397b2fb
+checksum=6041a07fbbd28f6e55a15abea6fb650c8ab6988df557da320bd6983e4009b571
 conf_files="
 	/etc/gdm/custom.conf
 	/etc/pam.d/gdm-autologin
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@ -1,22 +1,20 @@
 # Template build file for 'gegl'.
 pkgname=gegl
-reverts="0.4.0_1"
-version=0.2.0
-revision=10
+version=0.4.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-docs --without-sdl --without-libopenraw
 --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"
+ libjpeg-turbo-devel librsvg-devel gtk+-devel exiv2-devel json-glib-devel"
 short_desc="Graph based image processing framework"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
+maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-3.0, LGPL-3.0"
 homepage="https://www.gimp.org"
 distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.bz2"
-checksum=df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426
-CFLAGS="-lm"
+checksum=6a358bc19d20b8ac1daf645cc8b53cdc2ea6f9c98a6036179a57045a26a07f8d

 gegl-devel_package() {
 	depends="libglib-devel gegl>=${version}_${revision}"
@ -24,6 +22,6 @@ gegl-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/libgegl-0.4.so"
 	}
 }
--- a/srcpkgs/gimp/patches/fix-cross.patch
+++ b/srcpkgs/gimp/patches/fix-cross.patch
@ -0,0 +1,18 @@
+--- plug-ins/script-fu/Makefile.am.orig	2018-05-18 00:03:53.095184079 +0200
+++ plug-ins/script-fu/Makefile.am	2018-05-18 00:04:50.184762769 +0200
+@@ -14,6 +14,7 @@ else
+ libm = -lm
+ endif
+ 
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+ libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
+ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+ libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+@@ -85,6 +86,7 @@ script_fu_SOURCES = \
+ 	scheme-wrapper.h
+ 
+ LDADD = \
+	$(libgimpmodule) \
+ 	$(libgimpui)		\
+ 	$(libgimpwidgets)	\
+ 	$(libgimpconfig)	\
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@ -1,40 +1,38 @@
-# Template build file for 'gimp'.
+# Template build file for 'gimp'
 pkgname=gimp
-version=2.8.22
-revision=2
+version=2.10.2
+revision=1
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--without-aa --without-gvfs --enable-gimp-console
- --enable-python --with-gif-compression=lzw --with-libcurl --enable-mp"
-hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool"
-makedepends="libpng-devel gtk+-devel lcms2-devel
- alsa-lib-devel dbus-glib-devel libXmu-devel libXcursor-devel
- libexif-devel libsoup-devel libwmf-devel librsvg-devel
- libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel
- libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel iso-codes"
+hostmakedepends="automake gegl gettext-devel glib-devel gtk+3-devel intltool libtool
+ pkg-config pygtk-devel"
+makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
+ ghostscript-devel jasper-devel lcms-devel libXcursor-devel libXpm-devel
+ libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
+ libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes
+ poppler-glib-devel pygtk-devel webkitgtk2-devel"
+depends="desktop-file-utils gegl hicolor-icon-theme iso-codes
+ mypaint-brushes"
 short_desc="The GNU image manipulation program"
 conf_files="/etc/gimp/2.0/*"
-depends="desktop-file-utils hicolor-icon-theme iso-codes"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
+maintainer="Kartik S <kartik.ynwa@gmail.com>"
+license="GPL-3.0-only"
 homepage="https://www.gimp.org"
-license="GPL-3"
 distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus-glib-devel gdk-pixbuf-devel pygtk-devel"
-	configure_args+=" am_cv_python_pythondir=${XBPS_CROSS_BASE}/usr/lib/python2.7/site-packages"
-	CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
-	case "$XBPS_TARGET_MACHINE" in
-	arm*|musl*)
-		configure_args+=" --disable-python"
-		subpackages="libgimp gimp-devel"
-		;;
-	esac
-fi
+checksum=1cb0baaecdefe44d371a15f2739a1bcbce4682336b4ccf8eb7b587ce52c333eb

 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
+	if [ "$CROSS_BUILD" ]; then
+		sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make -C tools invert-svg \
+			CFLAGS_FOR_BUILD="$BUILD_CFLAGS -fPIE -I/usr/lib/glib-2.0/include -I/usr/lib/glib-2.0"
+	fi
 }

 libgimp_package() {
@ -43,6 +41,7 @@ libgimp_package() {
 		vmove usr/lib/*.so.*
 	}
 }
+
 gimp-devel_package() {
 	depends="libgimp>=${version}_${revision}"
 	short_desc+=" - development files"
@ -54,10 +53,11 @@ gimp-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
 gimp-python_package() {
 	lib32disabled=yes
 	depends="pygtk"
-	pycompile_dirs="usr/lib/gimp/2.0"
+	pycompile_dirs="usr/lib/gimp/2.0/python"
 	short_desc+=" - python bindings"
 	pkg_install() {
 		vmove usr/lib/gimp/2.0/python
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@ -1,7 +1,7 @@
 # Template file for 'girara'
 pkgname=girara
-version=0.2.9
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 # COLOR=0 to avoid "tput not found" spam in the build output
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@ -11,7 +11,7 @@ license="zlib"
 homepage="http://pwmt.org/projects/girara/"
 short_desc="A library implementing a user interface that focuses on minimalism"
 distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=a81f3e94c71a2ff92bf52295b402ede8175f82fbad1a27f29c1c05a4accb7d52
+checksum=b752fa5ff0a98cfa773bbcf66bb8a5e337a61cbb085d6577b3979178d17e41a2

 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@ -5,7 +5,7 @@ revision=1
 wrksrc="glade-${version}"
 build_style=gnu-configure
 configure_args="--disable-static $(vopt_enable gir introspection)"
-hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config which"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config"
 makedepends="gtk+3-devel python-gobject-devel
 $(vopt_if gir 'gobject-introspection')"
 depends="desktop-file-utils hicolor-icon-theme"
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@ -1,26 +1,21 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.56.0
+version=2.56.1
 revision=1
-lib32disabled=yes
 configure_args="-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt -Dinstalled_tests=false"
 build_style=meson
-hostmakedepends="pkg-config intltool"
-makedepends="libglib-devel libproxy-devel libgpg-error-devel
- libgcrypt-devel p11-kit-devel gnutls-devel
- gsettings-desktop-schemas-devel ca-certificates"
+hostmakedepends="intltool pkg-config"
+makedepends="ca-certificates gnutls-devel gsettings-desktop-schemas-devel
+ libglib-devel libproxy-devel"
 depends="ca-certificates gsettings-desktop-schemas"
 short_desc="Network-related giomodules for glib"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
-homepage="http://www.gnome.org/"
 license="LGPL-2.1-or-later"
+homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=47fd10bcae2e5039dc5f685e3ea384f48e64a6bee26d755718f534a978477c93
+checksum=df47b0e0a037d2dcf6b1846cbdf68dd4b3cc055e026bb40c4a55f19f29f635c8
+lib32disabled=yes

 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd
-
-	# BUG: upstream has a bugged meson.build file, it installs even if -Dinstalled_tests
-	# is false.
-	rm -rf ${DESTDIR}/usr/share/installed-tests
 }
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@ -107,6 +107,7 @@ do_configure() {
 		--without-selinux --without-cvs --without-gd \
 		--disable-lock-elision --enable-obsolete-nsl \
 		--enable-stack-protector=strong \
+		--disable-werror \
 		libc_cv_rootsbindir=/usr/bin \
 		libc_cv_rtlddir=${_libdir} libc_cv_slibdir=${_libdir}
 }
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@ -1,17 +1,17 @@
 # Template file for 'glm'
 pkgname=glm
-version=0.9.8.5
-revision=2
+version=0.9.9.0
+revision=1
+wrksrc=glm
 noarch=yes
 build_style=cmake
 hostmakedepends="dos2unix unzip"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="MIT"
 short_desc="A C++ mathematics library for graphics programming"
+license="MIT"
 homepage="http://glm.g-truc.net"
 distfiles="https://github.com/g-truc/glm/releases/download/${version}/glm-${version}.zip"
-checksum=9f9f520ec7fb8c20c69d6b398ed928a2448c6a3245cbedb8631a56a987c38660
-wrksrc=${pkgname}
+checksum=e1c707407c43589e8eeb8b69b902f1a34aaaa59bda1ca144181c2d2d6e531246

 post_extract() {
 	# Fix compiler version detection: GCC >= 7.2
@ -23,5 +23,6 @@ post_install() {
 	for f in $(find ${DESTDIR}/usr/include -type f); do
 		dos2unix "$f"
 	done
-	vlicense copying.txt
+	sed -n '88,110p' manual.md > LICENSE
+	vlicense LICENSE
 }
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.28.1
-revision=2
+version=3.28.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-gnome-distributor=VoidLinux"
 hostmakedepends="gnome-doc-utils intltool itstool pkg-config
@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=78a397a2be47586e6dc075d6a7fc5659aae3d10713d76994ce1b46086e7ecb9a
+checksum=605087bff17c61bc167ccb5a61ed4d06eab922fcce384576ed2a3577214c8330

 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@ -3,7 +3,7 @@ pkgname=gnome-dictionary
 version=3.26.1
 revision=1
 build_style=meson
-hostmakedepends="which pkg-config intltool itstool gnome-doc-utils glib-devel"
+hostmakedepends="pkg-config intltool itstool gnome-doc-utils glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 replaces="gnome-utils>=3.0"
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@ -3,7 +3,7 @@ pkgname=gnome-font-viewer
 version=3.28.0
 revision=2
 build_style=meson
-hostmakedepends="which pkg-config intltool itstool gnome-doc-utils glib-devel"
+hostmakedepends="pkg-config intltool itstool gnome-doc-utils glib-devel"
 makedepends="gtk+3-devel gnome-desktop-devel"
 depends="desktop-file-utils"
 short_desc="A font viewer for GNOME"
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@ -3,7 +3,7 @@ pkgname=gnome-nettool
 version=3.8.1
 revision=5
 build_style=gnu-configure
-hostmakedepends="glib-devel intltool itstool pkg-config which"
+hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
 gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@ -4,7 +4,7 @@ version=3.9.90
 revision=2
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
-hostmakedepends="which pkg-config intltool itstool gnome-doc-utils glib-devel"
+hostmakedepends="pkg-config intltool itstool gnome-doc-utils glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="A system log viewer for GNOME"
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@ -4,7 +4,7 @@ version=3.26.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-systemd"
-hostmakedepends="which pkg-config intltool itstool glib-devel gnome-doc-utils"
+hostmakedepends="pkg-config intltool itstool glib-devel gnome-doc-utils"
 makedepends="gtkmm-devel librsvg-devel libgtop-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
--- a/srcpkgs/googler/template
+++ b/srcpkgs/googler/template
@ -1,15 +1,15 @@
 # Template file for 'googler'
 pkgname=googler
-version=3.5
+version=3.6
 revision=1
 build_style=gnu-makefile
 depends="python3 xsel"
 short_desc="Google Search, Site Search and News from the terminal"
 maintainer="maxice8 <thinkabit.ukim@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/googler"
 distfiles="https://github.com/jarun/googler/archive/v${version}.tar.gz"
-checksum=55ff07648257f5d2d642d1f5d6bd682e6aa32605755d4040dac4ef787257cbea
+checksum=514218f5155a2c1bd653462a503507beafca9d7ddff7203aeabb3ab4812e4b44
 make_build_target="disable-self-upgrade"

 post_install() {
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
-version=1.6.11
-revision=3
+version=1.7.1
+revision=1
 build_style=go
 go_import_path="github.com/justwatchcom/gopass"
 depends="gnupg2 git"
@ -10,8 +10,9 @@ short_desc="The slightly more awesome standard unix password manager for teams"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="MIT"
 homepage="https://www.justwatch.com/gopass/"
+#changelog="https://raw.githubusercontent.com/justwatchcom/gopass/master/CHANGELOG.md"
 distfiles="https://github.com/justwatchcom/gopass/archive/v${version}.tar.gz"
-checksum=2199532b6a5f51960e6b3412ea196efb5e2d187b7cb436ecbbcff1a0ec4f9fc1
+checksum=a4e9799dffe3026998c54205314e2b9b745ac3112c026fb910521286188d0cbc
 nocross=yes

 post_build() {
--- a/srcpkgs/graphviz/update
+++ b/srcpkgs/graphviz/update
@ -1,2 +1,2 @@
 site="https://gitlab.com/graphviz/graphviz/tags"
-pattern='href="/\Qgraphviz/graphviz\E/repository/stable_release_*\K[\d\.]*(?=/archive\.tar\.gz")'
+pattern='stable_release_*\K[\d.]*(?=\.tar\.gz)'
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'
 pkgname=gscan2pdf
-version=2.1.1
+version=2.1.2
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="http://gscan2pdf.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d14c6bf1375f40b34815b56840e0190123019038e352ec0ae4727a8aefaaac2c
+checksum=f434cecb9094a4bed76f3e1df15306d6a26ab316ba23e06f204dcd0a0b14e124
 nocross=yes

 do_check() {
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@ -1,6 +1,6 @@
 # Template file for 'gst-libav'
 pkgname=gst-libav
-version=1.14.0
+version=1.14.1
 revision=1
 lib32disabled=yes
 wrksrc="${pkgname}-${version}"
@ -11,10 +11,10 @@ makedepends="orc-devel gst-plugins-base1-devel ffmpeg-devel"
 depends="orc>=0.4.18 gst-plugins-base1>=${version}"
 short_desc="GStreamer libav plugin (1.x)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2"
+license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89
+checksum=eff80a02d2f2fb9f34b67e9a26e9954d3218c7aa18e863f2a47805fa7066029d

 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@ -1,16 +1,16 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
-version=1.14.0
+version=1.14.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python glib-devel"
 makedepends="gst-plugins-base1-devel"
 short_desc="GStreamer OpenMAX IL wrapper plugin (1.x)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2"
+license="LGPL-2.1-only"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4d43c354087cb77924982943e34e0d47294b5570304db11fd8b268b53bcff693
+checksum=7cb6c39301dfa3960abce195305c7cf431736bf6b47bde1fd4412c81c3e75cd8

 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|aarch64*)
--- 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.14.0
-revision=4
+version=1.14.1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 lib32disabled=yes
 build_style=gnu-configure
@ -19,10 +19,10 @@ makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
 depends="gst-plugins-base1>=${version}"
 short_desc="GStreamer plugins from the bad set (v1.x)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2, LGPL-2.1"
+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=ed5e2badb6f2858f60017b93334d91fe58a0e3f85ed2f37f2e931416fafb4f9f
+checksum=2a77c6908032aafdf2cd2e5823fec948f16a25c2d1497a953828d762dc20d61a

 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-base1'.
 pkgname=gst-plugins-base1
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=gnu-configure
@ -13,14 +13,14 @@ makedepends="
 cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
 libvisual-devel libgudev-devel libtheora-devel libvorbis-devel
 libSM-devel orc-devel $(vopt_if cdparanoia libcdparanoia-devel)
- opus-devel"
+ opus-devel MesaLib-devel"
 depends="orc>=0.4.18 gstreamer1>=${version}"
 short_desc="GStreamer Base Plug-ins (v1.x)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
+license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
-license="GPL-2, LGPL-2.1"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940
+checksum=1026c7c3082d825d9b5d034c1a6dd8a4ebab60eb3738b0a0afde4ad2dc0b0db5

 case "$XBPS_TARGET_MACHINE" in
 	i686*) CFLAGS="-O2 -msse2";;
--- 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.14.0
-revision=2
+version=1.14.1
+revision=1
 wrksrc="${pkgname/1/}-${version}"
 lib32disabled=yes
 build_style=gnu-configure
@ -20,7 +20,7 @@ makedepends="
 depends="gst-plugins-base1>=${version}"
 short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
+license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
-license="LGPL-2.1"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=6afa35747d528d3ab4ed8f5eac13f7235d7d28100d6a24dd78f81ec7c0d04688
+checksum=34ec062ddb766a32377532e039781f4a16fbc3e8b449e642605bacab26a99172
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-ugly1'.
 pkgname=gst-plugins-ugly1
-version=1.14.0
+version=1.14.1
 revision=1
 lib32disabled=yes
 wrksrc="${pkgname/1/}-${version}"
@ -14,7 +14,7 @@ makedepends="glib-devel libxml2-devel gst-plugins-base1-devel
 depends="orc>=0.4.18 gst-plugins-base1>=${version}"
 short_desc="GStreamer plugins from the ugly set (1.x)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1
+checksum=cff2430bb13f54ef81409a0b3d65ce409a376d4a7bab57a14a97d602539fe1d3
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@ -1,6 +1,6 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="${pkgname/gst1/gstreamer}-${version}"
 build_style=gnu-configure
@ -8,10 +8,10 @@ hostmakedepends="python flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel"
 short_desc="GStreamer 1.x Editing Services"
 maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="LGPL-2"
+license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz"
-checksum=8d5f90eb532f4cf4aa1466807ef92b05bd1705970d7aabe10066929bbc698d91
+checksum=7e7c0962f39388cdf81b5e0d9f768eb15e30f58b346fd79f1ea778979eae113e

 gst1-editing-services-devel_package() {
 	short_desc+=" - development files"
--- a/srcpkgs/gst1-python/template
+++ b/srcpkgs/gst1-python/template
@ -1,6 +1,6 @@
 # Template file for 'gst1-python'.
 pkgname=gst1-python
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="gst-python-${version}"
 build_style=gnu-configure
@ -11,10 +11,10 @@ makedepends="libglib-devel python-gobject-devel gst-plugins-base1-devel"
 depends="python-gobject"
 short_desc="Python bindings for GStreamer 1.x"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=e0b98111150aa3fcdeb6e228cd770995fbdaa8586fc02ec9b3273d4ae83399e6
+checksum=1bc6704955e343f78d2d935487f26d2db4c131c9a6dad38eb331c7e3639147d3

 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@ -1,6 +1,6 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="gst-python-${version}"
 build_style=gnu-configure
@ -11,10 +11,10 @@ makedepends="libglib-devel python-gobject-devel gst-plugins-base1-devel"
 depends="python3-gobject"
 short_desc="Python3 bindings for GStreamer 1.x"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=e0b98111150aa3fcdeb6e228cd770995fbdaa8586fc02ec9b3273d4ae83399e6
+checksum=1bc6704955e343f78d2d935487f26d2db4c131c9a6dad38eb331c7e3639147d3

 pre_configure() {
 	export PYTHON=/usr/bin/python3
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@ -1,6 +1,6 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=1.14.0
+version=1.14.1
 revision=1
 build_style=gnu-configure
 lib32disabled=yes
@ -9,7 +9,7 @@ hostmakedepends="pkg-config python"
 makedepends="libXrandr-devel libva-devel MesaLib-devel gst-plugins-bad1-devel"
 short_desc="VA-API plugins for GStreamer 1.x"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=e4e31f085ef289bf1049398f641345979d20a1b11a80285744bba98504991df2
+checksum=585c3ddb0c39220de0a33e5d0ed6196a108b8407ec3538d7c64617713b4434e8
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@ -1,6 +1,6 @@
 # Template file for 'gstreamer1'.
 pkgname=gstreamer1
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="gstreamer-${version}"
 build_style=gnu-configure
@ -12,9 +12,9 @@ makedepends="libxml2-devel libglib-devel"
 short_desc="Core GStreamer libraries and elements (1.x)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="https://gstreamer.freedesktop.org"
-license="LGPL-2.1"
+license="LGPL-2.0-or-later"
 distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e
+checksum=28d82b0d261544a9bf85b429399929e4986eb00efcf1ce16cc71d269a4c3186c

 # Package build options
 build_options="gir"
--- a/srcpkgs/hardinfo/template
+++ b/srcpkgs/hardinfo/template
@ -4,7 +4,7 @@ version=0.5.1
 revision=4
 lib32disabled=yes
 build_style=gnu-configure
-hostmakedepends="pkg-config which"
+hostmakedepends="pkg-config"
 makedepends="gtk+-devel libsoup-devel desktop-file-utils"
 depends="desktop-file-utils"
 short_desc="A system information and benchmark tool"
--- a/srcpkgs/hdf5/template
+++ b/srcpkgs/hdf5/template
@ -1,21 +1,22 @@
 # Template file for 'hdf5'
 pkgname=hdf5
 version=1.10.1
-revision=1
+revision=2
 build_style=gnu-configure
-nocross=yes
+configure_args="--enable-cxx --enable-fortran"
+hostmakedepends="gcc-fortran"
 makedepends="zlib-devel"
 short_desc="A data model, library, and file format for storing and managing data"
 maintainer="pulux <pulux@pf4sh.de>"
-license="BSD"
-homepage="http://hdfgroup.org"
-distfiles="http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"
+license="custom"
+homepage="https://hdfgroup.org"
+distfiles="https://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"
 checksum=048a9d149fb99aaa1680a712963f5a78e9c43b588d0e79d55e06760ec377c172
-
-configure_args="--enable-cxx"
+nocross="https://portal.hdfgroup.org/pages/viewpage.action?pageId=48808266"

 post_install() {
 	vlicense COPYING
+	rm -rf ${DESTDIR}/usr/lib/libdynlib*.so
 }

 hdf5-devel_package() {
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@ -1,26 +1,26 @@
 # Template file for 'hedgewars'
 pkgname=hedgewars
-version=0.9.23
+version=0.9.24.1
 revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
 configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
 -DPHYSFS_SYSTEM=1 -DCMAKE_VERBOSE_MAKEFILE=1 -DMINIMAL_FLAGS=1"
-hostmakedepends="lua51 pkg-config fpc qt-qmake qt-host-tools"
-makedepends="qt-devel SDL2_net-devel SDL2_mixer-devel SDL2_image-devel SDL2_ttf-devel
- lua51-devel physfs-devel libpng-devel ffmpeg-devel libfreeglut-devel"
+hostmakedepends="lua51 pkg-config fpc"
+makedepends="ffmpeg-devel lua51-devel physfs-devel qt5-tools-devel SDL2_image-devel
+ SDL2_mixer-devel SDL2_net-devel SDL2_ttf-devel"
 depends="hedgewars-data>=${version}_${revision} libfreeglut"
 short_desc="Funny turn-based artillery game, featuring fighting Hedgehogs!"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2"
-homepage="http://www.hedgewars.org/"
+license="GPL-2.0-only"
+homepage="https://www.hedgewars.org/"
 distfiles="https://hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"
-checksum=da2e4908042be56d1c0f3cb80a355bde7f0a49f675b050a03228cc3fb22aae89
+checksum=81360a41aa911a667163c25bed9a823e32b17ff130b328399ddcba049b5d5bb8
 nopie_files="/usr/bin/hwengine"
 nocross="Needs investigation: fails to link hwengine"

 if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt-devel"
+	hostmakedepends+=" qt5-devel"
 fi

 post_install() {
--- a/srcpkgs/hedgewars/update
+++ b/srcpkgs/hedgewars/update
@ -0,0 +1 @@
+site='http://www.hedgewars.org/download.html'
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.3.22
+version=4.3.24
 revision=1
 _build=1
 create_wrksrc=yes
@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=8acc9bdbbacad3a8da7a36d32a56611b5ae430fcfc4e18b39a98d4df3ba3099c
+checksum=7fec505b744d06adc19d55a6e03a00bd661f55324d65ee33d32c8a1425920332

 only_for_archs="x86_64"
 restricted=yes
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.40.3
+version=0.41
 revision=1
 build_style=go
 hostmakedepends="git"
@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://gohugo.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=e0301fefec3d67169920f979d777018045447c9efef71d57c9e0361b657a2ed7
+checksum=a5a435d352ad8df3f0dd77968e6ac21925ee006e5538a37f775d9f53b30799fc

 build_options="pygments"
 desc_option_pygments="Alternative syntax highlighter"
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20180509
+version=20180525
 revision=1
 create_wrksrc=yes
 noarch=yes
@ -10,7 +10,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-or-later, LGPL-3.0-or-later, CC-BY-SA-1.0, MPL-1.1, Apache-2.0, CC-BY-4.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=a3e1c55ba92dd895da7b04c25cd4ba0288160b0b365da0072fb1f33780bd69c5
+checksum=8ab633466d52cc67023f94af439730971134daefdb1af24edf4c4e19488a3064

 post_extract() {
 	unzip pl_PL.zip
--- a/srcpkgs/ifupdown/template
+++ b/srcpkgs/ifupdown/template
@ -1,17 +1,17 @@
 # Template file for 'ifupdown'
 pkgname=ifupdown
-version=0.8.32
+version=0.8.34
 revision=1
-wrksrc="$pkgname"
+wrksrc=ifupdown
 build_style=gnu-makefile
-make_use_env=1
+make_use_env=yes
 hostmakedepends="dpkg perl"
 short_desc="High level tools to configure network interfaces"
 maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
 license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/ifupdown"
 distfiles="http://http.debian.net/debian/pool/main/i/ifupdown/ifupdown_${version}.tar.xz"
-checksum=fe562c9934cd4d95d5d3374bb49097824b53e7d48c38ab1a4411cb19d407cfcf
+checksum=8319961313d78320c8d0841ea9ca1490359a924d019df8e6d7cded86a1963cbd

 make_dirs="/etc/network/interfaces.d 0755 root root
 /etc/network/if-pre-up.d 0755 root root
--- a/srcpkgs/imagewriter/patches/musl.patch
+++ b/srcpkgs/imagewriter/patches/musl.patch
@ -0,0 +1,11 @@
+--- MainWindow.cpp.orig	2018-05-24 00:26:18.366922607 +0200
+++ MainWindow.cpp	2018-05-24 00:27:09.802922613 +0200
+@@ -37,7 +37,7 @@
+ 
+ #include <unistd.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+#include <linux/sysctl.h>
+ 
+ #ifdef USEUDISKS2
+ #include "udisks2_interface.h"
--- a/srcpkgs/imagewriter/template
+++ b/srcpkgs/imagewriter/template
@ -0,0 +1,21 @@
+# Template file for 'imagewriter'
+pkgname=imagewriter
+version=1.10.20150521
+revision=1
+_commit=1d253d960a28f9de4468b0b091c231083f03c1c8
+wrksrc="${pkgname}-${_commit}"
+build_style=qmake
+configure_args="DEFINES=USEUDISKS"
+makedepends="qt5-devel"
+depends="desktop-file-utils hicolor-icon-theme udisks"
+short_desc="Graphical utility for writing raw disk images & hybrid isos to USB keys"
+maintainer="cr6git <quark6@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/openSUSE/imagewriter"
+distfiles="https://github.com/openSUSE/imagewriter/archive/${_commit}.tar.gz"
+checksum=7761ee45b16b5841c6b62b091c7f9d0b8c64b14b79d77e9909ca813e1dc9885d
+
+if [ -n "$CROSS_BUILD" ]; then
+	hostmakedepends="qt5-devel"
+fi
+
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@ -1,14 +1,14 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2018.1.1
+version=2018.1.4
 revision=1
 depends="virtual?java-environment giflib libXtst"
-short_desc="Java integrated development environment"
+short_desc="Java integrated development environment by JetBrains"
 maintainer="Adrian Siekierka <kontakt@asie.pl>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jdk.tar.gz"
-checksum=c882dee60b7927ca9b2ccb13a46cff4c3ecc688d7e7eec9c53878a801ab1d5b6
+checksum=a31f0e08d718df6794e178e299cc41b16b62127d431a32b9a17568e7fb4b6c33
 repository=nonfree
 nopie=yes
 only_for_archs="i686 x86_64"
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@ -1,6 +1,6 @@
 # Template file for 'iperf'
 pkgname=iperf
-version=2.0.10
+version=2.0.11
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="NCSA"
 homepage="https://iperf.fr/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2
+checksum=b7d650d07c6bb0e357b5938a20e4ac33876012fddb952299c5d321e6958da5d2

 post_install() {
 	vlicense COPYING LICENSE
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`site='http://www.hedgewars.org/download.html'`