Merge branch 'master' into hdf5

common/shlibs

@@ -476,6 +476,56 @@ libfsimage.so.1.0 xen-libs-4.2.2_2
 libfam.so.0 gamin-0.1.10_1
 libgamin-1.so.0 gamin-0.1.10_1
 libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
+libKF5Libkleo.so.5 libkleo-17.12.3_1
+libKF5GrantleeTheme.so.5 grantleetheme-17.12.3_1
+libKF5IMAP.so.5 kimap-17.12.3_1
+libKF5Ldap.so.5 kldap-17.12.3_1
+libKF5CalendarCore.so.5 kcalcore-17.12.3_1
+libKF5AkonadiSearchDebug.so.5 akonadi-search-17.12.3_1
+libKF5AkonadiSearchCore.so.5 akonadi-search-17.12.3_1
+libKF5AkonadiSearchPIM.so.5 akonadi-search-17.12.3_1
+libKF5AkonadiSearchXapian.so.5 akonadi-search-17.12.3_1
+libKF5LibkdepimAkonadi.so.5 libkdepim-17.12.3_1
+libKF5Libkdepim.so.5 libkdepim-17.12.3_1
+libKF5PimCommon.so.5 pimcommon-17.12.3_1
+libKF5PimCommonAkonadi.so.5 pimcommon-17.12.3_1
+libKF5FollowupReminder.so.5 kdepim-apps-libs-17.12.3_1
+libKF5KaddressbookGrantlee.so.5 kdepim-apps-libs-17.12.3_1
+libKF5KdepimDBusInterfaces.so.5 kdepim-apps-libs-17.12.3_1
+libKF5SendLater.so.5 kdepim-apps-libs-17.12.3_1
+libKF5KaddressbookImportExport.so.5 kdepim-apps-libs-17.12.3_1
+libKF5Gravatar.so.5 libgravatar-17.12.3_1
+libKPimSMTP.so.5 ksmtp-17.12.3_1
+libKF5MailTransport.so.5 kmailtransport-17.12.3_1
+libKF5MailTransportAkonadi.so.5 kmailtransport-17.12.3_1
+libKF5Mbox.so.5 kmbox-17.12.3_1
+libKF5MessageComposer.so.5 messagelib-17.12.3_1
+libKF5MessageList.so.5 messagelib-17.12.3_1
+libKF5TemplateParser.so.5 messagelib-17.12.3_1
+libKF5WebEngineViewer.so.5 messagelib-17.12.3_1
+libKF5MessageCore.so.5 messagelib-17.12.3_1
+libKF5MimeTreeParser.so.5 messagelib-17.12.3_1
+libKF5MessageViewer.so.5 messagelib-17.12.3_1
+libKF5CalendarUtils.so.5 kcalutils-17.12.3_1
+libKF5KontactInterface.so.5 kontactinterface-17.12.3_1
+libKF5KSieveUi.so.5 libksieve-17.12.3_1
+libKF5KManageSieve.so.5 libksieve-17.12.3_1
+libKF5KSieve.so.5 libksieve-17.12.3_1
+libKF5MailImporterAkonadi.so.5 mailimporter-17.12.3_1
+libKF5MailImporter.so.5 mailimporter-17.12.3_1
+libKF5MailCommon.so.5 mailcommon-17.12.3_1
+libKF5Tnef.so.5 ktnef-17.12.3_1
+libKF5AkonadiCalendar.so.5 akonadi-calendar-17.12.3_1
+libKF5CalendarSupport.so.5 calendarsupport-17.12.3_1
+libKF5AkonadiNotes.so.5 akonadi-notes-17.12.3_1
+libKPimKDAV.so.5 kdav-17.12.3_1
+libKF5AlarmCalendar.so.5 kalarmcal-17.12.3_1
+libakonadi-singlefileresource.so.5 kdepim-runtime-17.12.3_1
+libkmindexreader.so.5 kdepim-runtime-17.12.3_1
+libkdexoauth2.so.3 kdepim-runtime-17.12.3_1
+libakonadi-filestore.so.5 kdepim-runtime-17.12.3_1
+libmaildir.so.5 kdepim-runtime-17.12.3_1
+libfolderarchivesettings.so.5 kdepim-runtime-17.12.3_1
 libbabl-0.1.so.0 babl-0.1.10_1
 libbamf3.so.2 bamf-0.5.1_1
 libgegl-0.2.so.0 gegl-0.2.0_1
@@ -980,6 +1030,8 @@ libcryptsetup.so.12 libcryptsetup-2.0.0_1
 libgusb.so.2 libgusb-0.1.3_1
 libmash-0.2.so.0 mash-0.2.0_4
 libbytesize.so.1 libbytesize-1.2_1
+libblockdev.so.2 libblockdev-2.16_1
+libbd_utils.so.2 libblockdev-2.16_1
 libudisks2.so.0 udisks2-1.93.0_1
 libgcr-base-3.so.1 gcr-3.3.92_1
 libgck-1.so.0 gcr-3.8.0_1
@@ -1286,42 +1338,10 @@ libkutils.so.4 kdelibs-4.13.3_2
 libkdeinit4_klauncher.so kdelibs-4.13.3_2
 libkimproxy.so.4 kdelibs-4.13.3_2
 libkrossui.so.4 kdelibs-4.13.3_2
-libkholidays.so.4 kdepimlibs-4.10.4_1
-libkcalcore.so.4 kdepimlibs-4.10.4_1
-libkcalutils.so.4 kdepimlibs-4.10.4_1
-libakonadi-kde.so.4 kdepimlibs-4.10.4_1
-libkmime.so.4 kdepimlibs-4.10.4_1
-libakonadi-kmime.so.4 kdepimlibs-4.10.4_1
-libkabc.so.4 kdepimlibs-4.10.4_1
-libmicroblog.so.4 kdepimlibs-4.10.4_1
-libsyndication.so.4 kdepimlibs-4.10.4_1
-libkldap.so.4 kdepimlibs-4.10.4_1
-libkpimutils.so.4 kdepimlibs-4.10.4_1
-libakonadi-kcal.so.4 kdepimlibs-4.10.4_1
-libkcal.so.4 kdepimlibs-4.10.4_1
-libkresources.so.4 kdepimlibs-4.10.4_1
-libmailtransport.so.4 kdepimlibs-4.10.4_1
-libkpimtextedit.so.4 kdepimlibs-4.10.4_1
-libkmbox.so.4 kdepimlibs-4.10.4_1
-libkpimidentities.so.4 kdepimlibs-4.10.4_1
-libkimap.so.4 kdepimlibs-4.10.4_1
-libakonadi-calendar.so.4 kdepimlibs-4.10.4_1
-libakonadi-contact.so.4 kdepimlibs-4.10.4_1
-libkalarmcal.so.2 kdepimlibs-4.10.4_1
-libakonadi-notes.so.4 kdepimlibs-4.10.4_1
-libakonadi-kabc.so.4 kdepimlibs-4.10.4_1
-libkontactinterface.so.4 kdepimlibs-4.10.4_1
-libktnef.so.4 kdepimlibs-4.10.4_1
-libgpgme++-pthread.so.2 kdepimlibs-4.10.4_1
-libkblog.so.4 kdepimlibs-4.10.4_1
-libqgpgme.so.1 kdepimlibs-4.10.4_1
-libgpgme++.so.2 kdepimlibs-4.10.4_1
 libssh.so.4 libssh-0.5.4_1
 libssh_threads.so.4 libssh-0.5.4_1
 libqjson.so.0 qjson-0.8.1_1
 libakonadiprotocolinternals.so.1 akonadi-1.9.2_1
-libkactivities.so.6 kactivities-4.10.4_1
-libkactivities-models.so.1 kactivities-4.10.4_1
 libqimageblitz.so.4 qimageblitz-0.0.6_1
 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1
 libkexiv2.so.11 libkexiv2-4.10.4_1
@@ -1331,6 +1351,14 @@ libplasmaclock.so.4 kde-workspace-4.10.4_1
 libtaskmanager.so.4 kde-workspace-4.10.4_1
 libkworkspace.so.4 kde-workspace-4.10.4_1
 libprocessui.so.4 kde-workspace-4.10.4_1
+libKPimGAPIContacts.so.5 libkgapi-17.12.3_1
+libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1
+libKPimGAPILatitude.so.5 libkgapi-17.12.3_1
+libKPimGAPICalendar.so.5 libkgapi-17.12.3_1
+libKPimGAPICore.so.5 libkgapi-17.12.3_1
+libKPimGAPITasks.so.5 libkgapi-17.12.3_1
+libKPimGAPIMaps.so.5 libkgapi-17.12.3_1
+libKPimGAPIDrive.so.5 libkgapi-17.12.3_1
 libkgapi2.so.2 libkgapi-2.0.1_1
 libqoauth.so.1 qoauth-1.0.1_1
 libqoauth.so.2 qoauth-qt5-2.0.0_1
@@ -1920,7 +1948,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.8.0_1
 libx265.so.151 x265-2.7_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
-libqwt.so.6 qwt-6.1.3_1:
+libqwt.so.6 qwt-6.1.3_1
 liblxqt-qt5.so.0 liblxqt-0.8.0_1
 liblxqt-globalkeys-qt5.so.0 lxqt-globalkeys-0.8.0_1
 liblxqt-globalkeys-ui-qt5.so.0 lxqt-globalkeys-0.8.0_1
@@ -2111,14 +2139,6 @@ libkomparediff2.so.5 libkomparediff2-17.08.2_1
 libkompareinterface.so.5 kompare-17.08.2_1
 libkomparedialogpages.so.5 kompare-17.08.2_1
 libfdt.so.1 dtc-1.4.1_1
-libokteta1core.so.1 okteta-4.14.2_1
-libkasten2gui.so.2 okteta-4.14.2_1
-libkasten2okteta1controllers.so.1 okteta-4.14.2_1
-libokteta1gui.so.1 okteta-4.14.2_1
-libkasten2core.so.2 okteta-4.14.2_1
-libkasten2controllers.so.2 okteta-4.14.2_1
-libkasten2okteta1gui.so.1 okteta-4.14.2_1
-libkasten2okteta1core.so.1 okteta-4.14.2_1
 libkasten3controllers.so.3 okteta5-17.08.3_1
 libkasten3core.so.3 okteta5-17.08.3_1
 libkasten3gui.so.3 okteta5-17.08.3_1
@@ -2374,7 +2394,7 @@ libges-1.0.so.0 gst1-editing-services-1.6.2_1
 libykneomgr.so.0 libykneomgr-0.1.8_1
 libopenshot-audio.so.6 libopenshot-audio-0.1.5_1
 libopenshot.so.14 libopenshot-0.1.9_1
-libpqxx-4.0.so libpqxx-4.0.1_1
+libpqxx-6.2.so libpqxx-6.2.2_1
 libndpi.so.1 ndpi-1.6_1
 liblog4cxx.so.10 log4cxx-0.10.0_1
 liblog.so android-studio-3.0.1_1
@@ -2736,7 +2756,6 @@ libz80ex.so.1 z80ex-1.1.21_1
 libz80ex_dasm.so.1 z80ex-1.1.21_1
 libqmmp.so.1 qmmp-1.1.4_1
 libqmmpui.so.1 qmmp-1.1.4_1
-libksignalplotter.so.4 kde-workspace-4.11.22_1
 libalkimia5.so.7 libalkimia-7.0_1
 libpayeeidentifier_iban_bic_widgets.so.5 kmymoney-5.0.0_1
 libkmm_plugin.so.5 kmymoney-5.0.0_1
@@ -2878,7 +2897,7 @@ libPocoUtil.so.50 poco-1.8.0.1_1
 libPocoRedis.so.50 poco-1.8.0.1_1
 libopenblas.so.0 openblas-0.2.19_1
 librtmidi.so.4 rtmidi-3.0.0_1
-libbiblesync.so.1.1.2 biblesync-1.1.2_1
+libbiblesync.so.1.2.0 biblesync-1.2.0_1
 libbac-9.0.4.so bacula-common-9.0.4_1
 libbaccfg-9.0.4.so bacula-common-9.0.4_1
 libbacfind-9.0.4.so bacula-common-9.0.4_1
@@ -3236,12 +3255,71 @@ libwayland-client++.so.0.2 libwaylandpp-2.2.0_1
 libwayland-cursor++.so.0.2 libwaylandpp-2.2.0_1
 libwayland-client-extra++.so.0.2 libwaylandpp-2.2.0_1
 libfwup.so.1 fwupdate-10_1
+libTKBin.so.7 occt-7.2.0p1_1
+libTKDraw.so.7 occt-7.2.0p1_1
+libTKSTEP209.so.7 occt-7.2.0p1_1
+libTKOpenGl.so.7 occt-7.2.0p1_1
+libTKBinTObj.so.7 occt-7.2.0p1_1
+libTKSTL.so.7 occt-7.2.0p1_1
+libTKViewerTest.so.7 occt-7.2.0p1_1
+libTKCAF.so.7 occt-7.2.0p1_1
+libTKService.so.7 occt-7.2.0p1_1
+libTKV3d.so.7 occt-7.2.0p1_1
+libTKXCAF.so.7 occt-7.2.0p1_1
+libTKMesh.so.7 occt-7.2.0p1_1
+libTKSTEP.so.7 occt-7.2.0p1_1
+libTKMath.so.7 occt-7.2.0p1_1
+libTKLCAF.so.7 occt-7.2.0p1_1
+libTKShHealing.so.7 occt-7.2.0p1_1
+libTKGeomAlgo.so.7 occt-7.2.0p1_1
+libTKTObjDRAW.so.7 occt-7.2.0p1_1
+libTKTObj.so.7 occt-7.2.0p1_1
+libTKStd.so.7 occt-7.2.0p1_1
+libTKSTEPBase.so.7 occt-7.2.0p1_1
+libTKIGES.so.7 occt-7.2.0p1_1
+libTKGeomBase.so.7 occt-7.2.0p1_1
+libTKFillet.so.7 occt-7.2.0p1_1
+libTKFeat.so.7 occt-7.2.0p1_1
+libTKG2d.so.7 occt-7.2.0p1_1
+libTKXSBase.so.7 occt-7.2.0p1_1
+libTKDCAF.so.7 occt-7.2.0p1_1
+libTKXml.so.7 occt-7.2.0p1_1
+libTKTopTest.so.7 occt-7.2.0p1_1
+libTKG3d.so.7 occt-7.2.0p1_1
+libTKBRep.so.7 occt-7.2.0p1_1
+libTKVRML.so.7 occt-7.2.0p1_1
+libTKCDF.so.7 occt-7.2.0p1_1
+libTKXSDRAW.so.7 occt-7.2.0p1_1
+libTKXMesh.so.7 occt-7.2.0p1_1
+libTKernel.so.7 occt-7.2.0p1_1
+libTKTopAlgo.so.7 occt-7.2.0p1_1
+libTKHLR.so.7 occt-7.2.0p1_1
+libTKBinXCAF.so.7 occt-7.2.0p1_1
+libTKVCAF.so.7 occt-7.2.0p1_1
+libTKBinL.so.7 occt-7.2.0p1_1
+libTKXmlXCAF.so.7 occt-7.2.0p1_1
+libTKXDEIGES.so.7 occt-7.2.0p1_1
+libTKBO.so.7 occt-7.2.0p1_1
+libTKStdL.so.7 occt-7.2.0p1_1
+libTKXDEDRAW.so.7 occt-7.2.0p1_1
+libTKXmlTObj.so.7 occt-7.2.0p1_1
+libTKPrim.so.7 occt-7.2.0p1_1
+libTKMeshVS.so.7 occt-7.2.0p1_1
+libTKSTEPAttr.so.7 occt-7.2.0p1_1
+libTKBool.so.7 occt-7.2.0p1_1
+libTKOffset.so.7 occt-7.2.0p1_1
+libTKXDESTEP.so.7 occt-7.2.0p1_1
+libTKQADraw.so.7 occt-7.2.0p1_1
+libTKXmlL.so.7 occt-7.2.0p1_1
 libargon2.so.1 libargon2-20171227_1
 libdazzle-1.0.so.0 libdazzle-3.28.0_1
 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1
 libtemplate_glib-1.0.so.0 template-glib-3.28.0_1
+libmedimport.so.0 libmed-3.3.1_1
+libmedC.so.1 libmed-3.3.1_1
+libmed.so.1 libmed-3.3.1_1
 libeog.so eog-3.28.0_4
-ibfreexl.so.1 freexl-1.0.5_1
+libfreexl.so.1 freexl-1.0.5_1
 libgeos-3.6.2.so geos-3.6.2_1
 libgeos_c.so.1 geos-3.6.2_1
 libspatialindex.so.4 libspatialindex-1.8.5_1
@@ -3256,3 +3334,4 @@ libfifechan_sdl.so.0.1.4 fifechan-0.1.4_1
 libfifechan_opengl.so.0.1.4 fifechan-0.1.4_1
 libpolyclipping.so.22 clipper-6.4.2_1
 libSoapySDR.so.0.6 SoapySDR-0.6.1_1
+libeditorconfig.so.0 editorconfig-0.12.2_1

common/xbps-src/shutils/update_check.sh

@@ -75,6 +75,7 @@ update_check() {
         curl -A "xbps-src-update-check/$XBPS_SRC_VERSION" --max-time 10 -Lsk "$url" |
             grep -Po -i "$rx"
     done |
+    tr _ . |
     sort -Vu |
     { 
         grep . || echo "NO VERSION found for $original_pkgname" 1>&2

srcpkgs/3proxy/template

@@ -1,13 +1,13 @@
 # Template file for '3proxy'
 pkgname=3proxy
-version=0.8.11
+version=0.8.12
 revision=1
-homepage="https://3proxy.ru"
 distfiles="https://github.com/z3APA3A/3proxy/archive/$version.tar.gz"
 short_desc="3proxy tiny proxy server"
 maintainer="iaroki <iaroki@protonmail.com>"
-license="BSD"
+license="BSD-3-Clause"
-checksum=fc4295e1a462baa61977fcc21747db7861c4e3d0dcca86cbaa3e06017e5c66c9
+homepage="https://3proxy.ru"
+checksum=c2ad3798b4f0df06cfcc7b49f658304e451d60e4834e2705ef83ddb85a03f849
 
 do_build() {
 	make -f Makefile.Linux CC=$CC LN=$CC

srcpkgs/6tunnel/template

@@ -0,0 +1,11 @@
+# Template file for '6tunnel'
+pkgname=6tunnel
+version=0.12
+revision=1
+build_style=gnu-configure
+short_desc="IPv6 hosts with IPv4-only applications and vice-versa"
+maintainer="Pulux <pulux@pf4sh.de>"
+license="GPL-2"
+homepage="https://github.com/wojtekka/$pkgname"
+distfiles="${homepage}/releases/download/$version/$pkgname-$version.tar.gz"
+checksum=80dbe91bb92282c3c5e98dec871dcd1738ae824e532f9fd6db0d6ebd469d79bf

srcpkgs/Adapta/template

@@ -1,6 +1,6 @@
 # Template file for 'Adapta'
 pkgname=Adapta
-version=3.93.0.258
+version=3.93.0.262
 revision=1
 build_style=gnu-configure
 wrksrc="adapta-gtk-theme-$version"
@@ -11,7 +11,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=4cee758174a9a23615e8ccb1a946d96b1817052f151617aa170b147a50d72955
+checksum=e7d4eff4550fa5c81b86098b8b78e14bec164f38f4200a9995b34b1768f68d81
 
 noarch=y
 

srcpkgs/FreeRADIUS/template

@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
-version=3.0.15
+version=3.0.17
-revision=2
+revision=1
 wrksrc=freeradius-server-${version}
 build_style=gnu-configure
 nocross=yes # Not supported by upstream
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
 license="GPL-2"
 homepage="http://freeradius.org"
 distfiles="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.bz2"
-checksum=23267d8505e7b2909f5bdbf3938ca077c1fe122290dc969304d4f3b594f7e3ba
+checksum=3f03404b6e4a4f410e1f15ea2ababfec7f8a7ae8a49836d8a0c137436d913b96
 
 pre_install() {
 	# FreeRADIUS uses 'R' instead of 'DESTDIR'

srcpkgs/JAI/update

@@ -1,3 +1,2 @@
-version=${version//./_}
 site="http://download.java.net/media/jai/builds/release/"
 pattern='href="\K[\d_]+(?=/")'

srcpkgs/MultiMC/template

@@ -1,7 +1,7 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
-version=0.6.0
+version=0.6.2
-revision=2
+revision=1
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
 _nbtversion="multimc-0.5.0"
 _quazipversion="multimc-2"
@@ -16,7 +16,7 @@ homepage="http://multimc.org"
 distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz
 	https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
 	https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="ac458be99250d2a369ee805bf9560e396d0e0f16a95cc84c36eb0ef1e94a6374
+checksum="d5e5fdc3234ac423e4abf8ea3b46d851c2df54713eae61f2171cb6f85de78fee
 	bcefbdd905f10a04605cf9e8f768d0f60c972e9e219c800512a5fd9c5f7a8498
 	25e1b74f0edef5e09647f7b5344c08fad4eaebbc386b1f288b59286ecdfe07fa"
 wrksrc=${pkgname}5-${version}

srcpkgs/abcde/template

@@ -1,10 +1,10 @@
 # Template file for 'abcde'
 pkgname=abcde
 version=2.9.1
-revision=1
+revision=2
 noarch=yes
 conf_files="/etc/${pkgname}.conf"
-depends="cd-discid vorbis-tools perl"
+depends="cd-discid vorbis-tools perl perl-MusicBrainz-DiscID perl-WebService-MusicBrainz"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 short_desc="A Better CD Encoder"
 license="GPL-2.0-or-later"

srcpkgs/acpid/patches/disable-logging-to-console.patch

@@ -1,11 +1,11 @@
---- acpid.c.orig	2015-02-06 20:32:04.341695981 +0100
+--- acpid.c
-+++ acpid.c	2015-02-06 20:32:13.540974475 +0100
++++ acpid.c
-@@ -390,7 +390,7 @@ open_log(void)
+@@ -389,7 +389,7 @@ open_log(void)
  	int log_opts;
  
  	/* open the syslog */
 -	log_opts = LOG_CONS|LOG_NDELAY;
 +	log_opts = LOG_NDELAY;
- 	if (acpid_debug) {
+ 	openlog(PACKAGE, log_opts, LOG_DAEMON);
- 		log_opts |= LOG_PERROR;
+ }
- 	}
+ 

srcpkgs/acpid/template

@@ -1,15 +1,15 @@
 # Template file for 'acpid'
 pkgname=acpid
-version=2.0.28
+version=2.0.29
 revision=1
 build_style=gnu-configure
-conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/acpid2/"
 distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-$version.tar.xz"
-checksum=980c3a54b0d3f2fd49fd845a0584c5c2abeaab9e9ac09fcbb68686bbb57a7110
+checksum=58503b27975c466e627eb741c5453dd662f97edef1a3d0aac822fd03a84203ff
+conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
 
 post_install() {
 	vinstall ${FILESDIR}/handler.sh 755 etc/acpi

srcpkgs/akonadi-calendar-devel

@@ -0,0 +1 @@
+akonadi-calendar

srcpkgs/akonadi-calendar/template

@@ -0,0 +1,24 @@
+# Template file for 'akonadi-calendar'
+pkgname=akonadi-calendar
+version=17.12.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools kconfig"
+makedepends="akonadi-contacts-devel kmailtransport-devel kcalutils-devel"
+short_desc="Akonadi calendar integration"
+maintainer="John <johnz@posteo.net>"
+license="LGPL-2.1-or-later"
+homepage="https://community.kde.org/KDE_PIM"
+distfiles="https://download.kde.org/stable/applications/${version}/src/akonadi-calendar-${version}.tar.xz"
+checksum=caece786ee166536397a18d5f5c1f5b7d0df609c4daaf831407d57e9f9b5d939
+
+akonadi-calendar-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/akonadi-notes-devel

@@ -0,0 +1 @@
+akonadi-notes

srcpkgs/akonadi-notes/template

@@ -0,0 +1,28 @@
+# Template file for 'akonadi-notes'
+pkgname=akonadi-notes
+version=17.12.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules python qt5-qmake qt5-host-tools"
+makedepends="kmime-devel akonadi5-devel"
+short_desc="Libraries and daemons to implement notes management in Akonadi"
+maintainer="John <johnz@posteo.net>"
+license="LGPL-2.1-or-later, GPL-2.0-or-later, BSD-2-Clause"
+homepage="Libraries and daemons to implement management of notes in Akonadi"
+distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=6f70d0b550b7a3e205bf525cacb32823c1dff21d1e4355651c4c172502f59653
+
+post_install() {
+	vlicense COPYING.BSD COPYING.BSD
+}
+
+akonadi-notes-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/akonadi-search-devel

@@ -0,0 +1 @@
+akonadi-search

srcpkgs/akonadi-search/template

@@ -0,0 +1,24 @@
+# Template file for 'akonadi-search'
+pkgname=akonadi-search
+version=17.12.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python"
+makedepends="akonadi-mime-devel xapian-core-devel krunner-devel kcmutils-devel
+ kcontacts-devel kcalcore-devel"
+short_desc="Libraries and daemons to implement searching in Akonadi"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://community.kde.org/KDE_PIM"
+distfiles="https://download.kde.org/stable/applications/${version}/src/akonadi-search-${version}.tar.xz"
+checksum=3d55f80c7071d16026181e267fa2e527da76adb762831732d19d1eadb25df65a
+
+akonadi-search-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/akonadi-search/update

@@ -0,0 +1,2 @@
+site="https://download.kde.org/stable/applications/"
+pattern='href="\K[\d\.]+(?=/")'

srcpkgs/albert/template

@@ -1,14 +1,13 @@
 # Template file for 'albert'
 pkgname=albert
-version=0.14.16
+version=0.14.18
 revision=1
-_plugins_hash=c92234731b5dae3baca6eb4e0561cd7ee90e7b56
+_plugins_hash=c59061f179032974c4a1b46dc045bdbb57614255
 _pybind_version=2.2.2
 build_style=cmake
 configure_args="-DBUILD_VIRTUALBOX=OFF"
-hostmakedepends="git qt5-host-tools qt5-qmake"
+makedepends="libqalculate-devel muparser-devel python-devel qt5-declarative-devel
-makedepends="muparser-devel python-devel qt5-svg-devel qt5-x11extras-devel
+ qt5-svg-devel qt5-x11extras-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
- qt5-declarative-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
  qt5-plugin-sqlite qt5-plugin-tds"
 depends="qt5-plugin-sqlite"
 short_desc="Lightweight desktop environment agnostic launcher"
@@ -18,10 +17,14 @@ homepage="https://github.com/albertlauncher/albert"
 distfiles="https://github.com/albertlauncher/albert/archive/v${version}.tar.gz
  https://github.com/albertlauncher/plugins/archive/${_plugins_hash}.tar.gz
  https://github.com/pybind/pybind11/archive/v${_pybind_version}.tar.gz"
-checksum="971ed5cd366488219d3d82c74852818362d940031a80bd1361646f8a56f9bbd8
+checksum="074b8dc50032edc8fbeb6efc9743b39cb8aa0619f9c8ae9441b9074eac14bd8c
- 7755a417ce06f031899e3315c9f631d08b3e4400ec237c93eca92a5446f94f39
+ 8cae60c57e694a47ee1060340ab19c2b29cccbaf1ec8309f1053ccf16161ae70
  b639a2b2cbf1c467849660801c4665ffc1a4d0a9e153ae1996ed6f21c492064e"
 
+if [ -n "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-host-tools qt5-qmake"
+fi
+
 post_extract() {
 	cp -rup ${wrksrc}/../plugins-*/* ${wrksrc}/plugins
 	cp -rup ${wrksrc}/../pybind11-*/* ${wrksrc}/plugins/python/pybind11

srcpkgs/annie/template

@@ -1,16 +1,16 @@
 # Template file for 'annie'
 pkgname=annie
-version=0.6.5
+version=0.6.6
 revision=1
 build_style=go
 go_import_path="github.com/iawia002/annie"
 depends="ffmpeg"
 short_desc="Fast, simple and clean video downloader built with Go"
 maintainer="cr6git <quark6@protonmail.com>"
-homepage="https://github.com/iawia002/annie"
 license="MIT"
+homepage="https://github.com/iawia002/annie"
 distfiles="https://github.com/iawia002/annie/archive/${version}.tar.gz"
-checksum=9f6029d9c372a174d372913ab3e856eb73075602baa956520e78639b0e151e5a
+checksum=e9b25727ad651951d04e5649271cf639c9745d0577143ba0ce15d205c4dced87
 
 post_install() {
 	vlicense LICENSE

srcpkgs/aspell-en/template

@@ -1,17 +1,17 @@
 # Template file for 'aspell-en'
 pkgname=aspell-en
-version=2017.08.24
+version=2018.04.16
 revision=1
-noarch=yes
 wrksrc="aspell6-en-${version}-0"
 build_style=configure
 hostmakedepends="aspell-devel"
 short_desc="English dictionary for aspell"
-homepage="http://aspell.net/"
-license="LGPL-2.1"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-or-later"
+homepage="http://aspell.net/"
 distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2"
-checksum=09b562b02195e7facd31d65241050be7ac6f78654128ab41650511bf42dd5b7c
+checksum=f11071e74b0c0753f4afabf024941a5c3a96bafe3879211ebd47bc34e76fbd2f
+noarch=yes
 
 words-en_package() {
 	short_desc="English dictionary word list"

srcpkgs/atom/template

@@ -1,6 +1,6 @@
 # Template file for 'atom'
 pkgname=atom
-version=1.25.0
+version=1.25.1
 revision=1
 nocross=yes
 nostrip=yes
@@ -11,7 +11,7 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="MIT"
 homepage="https://atom.io"
 distfiles="https://github.com/atom/atom/archive/v${version}.tar.gz"
-checksum=3608c1472879420d3e69f76402f74d9bef9270687bb679b4cde008d328768c5c
+checksum=607bfcfe283419d9a987649d02a3004a40272f17f2949049fccf419f8b72cfbb
 only_for_archs="i686 x86_64"
 
 do_install() {

srcpkgs/autokey-gtk

@@ -1 +0,0 @@
-autokey

srcpkgs/autokey-qt

@@ -1 +0,0 @@
-autokey

srcpkgs/autokey/template

@@ -1,41 +0,0 @@
-# Template file for 'autokey'
-pkgname=autokey
-version=0.90.4
-revision=4
-noarch=yes
-build_style=python2-module
-pycompile_module="autokey"
-hostmakedepends="python"
-makedepends="python"
-depends="python python-xlib python-inotify python-simplejson wmctrl"
-short_desc="desktop automation utility for Linux and X11"
-maintainer="Enno Boland <gottox@voidlinux.eu>"
-license="GPL-3"
-homepage="https://code.google.com/archive/p/autokey/downloads"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-${version}.tar.gz"
-checksum=7352c94ca984f1ba049f0b0d832abe47005cf65567904e5404c73e90358117e4
-
-autokey-qt_package() {
-	depends="${sourcepkg}>=${version}_${revision} kde-python python-notify python-PyQt4 python-PyQt4-dbus"
-	short_desc+=" - Qt frontend"
-	pkg_install() {
-		vmove usr/share/applications/autokey-qt.desktop
-		vmove usr/bin/autokey-qt
-		vmove usr/share/man/man1/autokey-qt.1
-		vmove usr/lib/python2.7/site-packages/autokey/qtui
-		vmove usr/lib/python2.7/site-packages/autokey/qtapp.py
-		vmove usr/share/kde4
-	}
-}
-
-autokey-gtk_package() {
-	depends="${sourcepkg}>=${version}_${revision} python-dbus python-gobject zenity"
-	short_desc+=" - GTK+ frontend"
-	pkg_install() {
-		vmove usr/share/applications/autokey-gtk.desktop
-		vmove usr/bin/autokey-gtk
-		vmove usr/share/man/man1/autokey-gtk.1
-		vmove usr/lib/python2.7/site-packages/autokey/gtkui
-		vmove usr/lib/python2.7/site-packages/autokey/gtkapp.py
-	}
-}

srcpkgs/bdf2psf/template

@@ -1,6 +1,6 @@
 # Template file for 'bdf2psf'
 pkgname=bdf2psf
-version=1.182
+version=1.184
 revision=1
 wrksrc="console-setup"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/bdf2psf"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=6575fe4fc79dab7d259e6a12e95c63c7e414831284c19454c0bd8a81b7f1faff
+checksum=7c010f152003331f5560246494f781eca237b87bed69cb8cde6fae54c604fcb3
 noarch=yes
 
 post_extract() {

srcpkgs/biblesync/template

@@ -1,16 +1,16 @@
 # Template file for 'biblesync'
 pkgname=biblesync
-version=1.1.2
+version=1.2.0
-revision=2
+revision=1
 build_style=cmake
-makedepends="libuuid-devel"
 configure_args="-DBUILD_SHARED_LIBS=TRUE"
+makedepends="libuuid-devel"
 short_desc="Multicast shared co-navigation library for Bible programs"
 maintainer="Dan Arnfield <dan@arnfield.com>"
 license="Public domain"
 homepage="https://github.com/karlkleinpaste/biblesync"
 distfiles="https://github.com/karlkleinpaste/biblesync/archive/${version}.tar.gz"
-checksum=aa581999d48fecf45bc059b80805aa0f06a5d5701c29cd6a625d433796d2a43b
+checksum=3c94f0de9e85a3564fbea7c36acfe175462d424eefbbad929cb3bc520e6a229f
 
 biblesync-devel_package() {
 	short_desc+=" - development files"

srcpkgs/brightnessctl/template

@@ -1,16 +1,16 @@
 # Template file for 'brightnessctl'
 pkgname=brightnessctl
-version=0.3.1
+version=0.3.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
 maintainer="cr6git <quark6@protonmail.com>"
 short_desc="Read and control device brightness"
-homepage="https://github.com/Hummer12007/brightnessctl"
 license="MIT"
+homepage="https://github.com/Hummer12007/brightnessctl"
 distfiles="https://github.com/Hummer12007/brightnessctl/archive/${version}.tar.gz"
-checksum=3e81dfa7c5faba29df88a7c4569c7ebaf511c3de4d489a8c8e305ab51b9e3059
+checksum=92687d8739b8395cf942287bdb8905a78b428102ab6029680829ab917363e0ab
 
 post_install() {
 	vlicense LICENSE

srcpkgs/browserpass/template

@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
-version=2.0.18
+version=2.0.20
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/dannyvankooten/browserpass"
 go_package="${go_import_path}/cmd/browserpass"
@@ -11,7 +11,7 @@ maintainer="John <johnz@posteo.net>"
 license="MIT"
 homepage="https://github.com/dannyvankooten/browserpass"
 distfiles="https://github.com/dannyvankooten/browserpass/archive/${version}.tar.gz"
-checksum=0cec5938d002192ec398e511b53463796be66c303ccdc5013d60a7470360e2be
+checksum=0ee1c7c27596adc64cc0d3a0954246e31eeab83e85c0674afb3d052be1c3a73e
 
 post_build() {
 	sed -i "s:%%replace%%:/usr/bin/browserpass:" chrome/host.json firefox/host.json

srcpkgs/caddy/template

@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=0.10.12
+version=0.10.13
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/mholt/caddy"
 go_package="${go_import_path}/caddy"
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/mholt/caddy/archive/v${version}.tar.gz"
-checksum=89efdbd719c0a079d1ee3126d1a94292361199b88171b66b765ca31c12bd0ac1
+checksum=34e25c1e91c5916803d3004407b27a30f0a32fb58511323c8dccd3cace8246f6
 
 system_accounts="caddy"
 make_dirs="/etc/caddy 0700 caddy caddy"

srcpkgs/calendarsupport-devel

@@ -0,0 +1 @@
+calendarsupport

srcpkgs/calendarsupport/template

@@ -0,0 +1,24 @@
+# Template file for 'calendarsupport'
+pkgname=calendarsupport
+version=17.12.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-tools python3"
+makedepends="kholidays-devel akonadi-calendar-devel kdepim-apps-libs-devel"
+short_desc="Calendar support library"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://community.kde.org/KDE_PIM"
+distfiles="https://download.kde.org/stable/applications/${version}/src/calendarsupport-${version}.tar.xz"
+checksum=04e90cd3945a7c007182c656ca436c1871ce31fcdeb9e2dc8af522b634501908
+
+calendarsupport-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/calendarsupport/update

@@ -0,0 +1,2 @@
+site="https://download.kde.org/stable/applications/"
+pattern='href="\K[\d\.]+(?=/")'

srcpkgs/camlp5/template

@@ -1,19 +1,19 @@
 # Template file for 'camlp5'
 pkgname=camlp5
-version=7.04
+version=7.05
 revision=1
 build_style=configure
 configure_args="-mandir /usr/share/man"
 hostmakedepends="ocaml"
 short_desc="OCaml preprocessor and pretty-printer"
 maintainer="Némo Fournier <nemo@epicea.xyz>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://camlp5.github.io/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version//./}.tar.gz"
 wrksrc="camlp5-rel${version//./}"
 nocross=yes
 nopie=yes
-checksum=4d28171121db1ea6f54d409cf959aa4d4359c13b957eb5a14e4fe37cc58243a8
+checksum=ccc7afd2936c75cbee4aad58cd2ef8e7bf0dded556b91d76e4e462a27550ff12
 
 post_install() {
 	vlicense LICENSE

srcpkgs/camlp5/update

@@ -0,0 +1,2 @@
+pattern='/archive/(v?|\Q'"$pkgname"'\E-|rel)?\K[\d\.]+(?=\.tar\.gz")'
+version="${version//./}"

srcpkgs/carton/template

@@ -1,6 +1,6 @@
 # Template file for 'carton'
 pkgname=carton
-version=1.0.22
+version=1.0.28
 revision=1
 wrksrc="Carton-v${version}"
 noarch=yes
@@ -12,6 +12,6 @@ depends="${makedepends}"
 short_desc="Perl module dependency manager"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 homepage="https://metacpan.org/pod/Carton"
-license="GPL-1, Artistic"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 distfiles="${CPAN_SITE}/XML/MIYAGAWA/Carton-v${version}.tar.gz"
-checksum=3a869b736962d0cba43b86a7a97d87565b57f87c5ae5721c5f5aa18cdae6e8ab
+checksum=bc59790b604c03a1cc592169a9268ed6ac5d2fe5a68fc41962427c2288e75a3e

srcpkgs/carton/update

@@ -0,0 +1 @@
+pattern="${pkgname}-v\K[\d.]+(?=\.tar\.gz)"

srcpkgs/cdm/template

@@ -1,17 +1,15 @@
 # Template file for 'cdm'
 pkgname=cdm
-version=0.0.20140805
+version=0.7
-revision=2
+revision=1
-_commit=7b6c395e91aa6c43b94a77994bffd4d9c9e2cffa
-wrksrc="${pkgname}-${_commit}"
-noarch=yes
 short_desc="Console Display Manager"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 depends="dialog xinit kbd xdpyinfo"
-license="GPL-2"
+license="GPL-2.0-or-later"
-homepage="https://github.com/ghost1227/cdm"
+homepage="https://github.com/evertiro/cdm"
-distfiles="$homepage/archive/$_commit.tar.gz"
+distfiles="https://github.com/evertiro/cdm/archive/${version}.tar.gz"
-checksum=6770e91a45059fce870ecce5c12fa61efa10c7a1f1d16afda283deba8659a925
+checksum=530042165ce65cdff3ec62ba9f077d0e8c6744c13f5d449d84fe2506a79d2e56
+noarch=yes
 
 do_install() {
 	sed -i 's| /| $PKGDESTDIR/|g' install.sh

srcpkgs/cfitsio/template

@@ -1,7 +1,7 @@
 # Template file for 'cfitsio'
 pkgname=cfitsio
-version=3.430
+version=3.440
-revision=2
+revision=1
 wrksrc=cfitsio
 build_style=gnu-configure
 short_desc="Library for reading and writing data files in FITS data format"
@@ -9,7 +9,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="NASA license"
 homepage="https://heasarc.gsfc.nasa.gov/fitsio/"
 distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}${version//./}.tar.gz"
-checksum=14905b6f91ef64a34c90ec771d21a8f6da81d8ce083680c7c41651576087cf1d
+checksum=dd1cad4208fb7a9462914177f26672ccfb21fc8a1f6366e41e7b69b13ad7fd24
 
 post_install() {
 	vlicense License.txt

srcpkgs/clac/template

@@ -1,19 +1,15 @@
 # Template file for 'clac'
 pkgname=clac
-version=0.3.1
+version=0.3.2
 revision=1
 build_style=gnu-makefile
 short_desc="Interactive command line, stack-based calculator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="2-clause-BSD"
+license="BSD-2-Clause"
 homepage="https://github.com/soveran/clac"
 distfiles="https://github.com/soveran/${pkgname}/archive/${version}.tar.gz"
-checksum=38cf86f99959d2223f052acfd9e0fecb402a137ebf859a9c64a541b15396e32b
+checksum=37a926982a3cc5016b42c554deaa5c64fa3932ebacd5bd15003508cf79a666dd
 
-do_build() {
-	${CC} ${CFLAGS} -o clac -I deps/sds -I deps/linenoise \
-		clac.c deps/sds/sds.c deps/linenoise/linenoise.c ${LDFLAGS} -lm
-}
 do_install() {
 	vbin clac
 	vman clac.1

srcpkgs/consul/template

@@ -1,12 +1,12 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.0.6
+version=1.0.7
-revision=2
+revision=1
 build_style=go
+go_import_path="github.com/hashicorp/${pkgname}"
 short_desc="Distributed solution to connect and configure applications"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
-go_import_path="github.com/hashicorp/$pkgname"
+distfiles="https://github.com/hashicorp/consul/archive/v${version}.tar.gz"
-distfiles="https://$go_import_path/archive/v$version.tar.gz"
+checksum=0e2edc88f34115a94b7fc3ea31b5936fb38ac730cb13b383e149ead5ec2a5bea
-checksum=c5c2109260b5eb7e807bf6fb5312ee379284d1b322a0b8b7539e67d25f2a80ff

srcpkgs/darch/template

@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
-version=0.18.3
+version=0.19.0
-revision=3
+revision=1
 build_style=go
 go_import_path=github.com/godarch/darch
 hostmakedepends="git go"

srcpkgs/darch/update

@@ -0,0 +1,2 @@
+site="https://${go_import_path}/tags"
+pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

srcpkgs/debootstrap/template

@@ -1,16 +1,16 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.96
+version=1.0.97
-revision=2
+revision=1
 build_style=fetch
-depends="binutils bzip2 gnupg gzip tar wget xz"
+depends="binutils gnupg gzip tar wget xz"
 short_desc="Bootstrap a basic Debian system"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 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="12ffc7d26021eefef8b9e667e78088c6a655439768e505e2c6d83999f3fed03c
+checksum="0177ffecea5cc1a42084ae02a44d8e902a086577cefc00194b983fd7f3d802a7
  017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0"
 
 do_install() {

srcpkgs/detox/patches/detox-1.2.0.fix-invalid-memory-access.patch

@@ -1,5 +1,5 @@
---- parse_options_getopt.c.dt
+--- src/parse_options.c.dt
-+++ parse_options_getopt.c
++++ src/parse_options.c
 @@ -178,15 +178,17 @@ struct detox_options *parse_options_geto
  	main_options->files = malloc(sizeof(char *) * 10);
  

srcpkgs/detox/template

@@ -1,20 +1,20 @@
 # Template file for 'detox'
-pkgname="detox"
+pkgname=detox
-version="1.2.0"
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/detox"
-hostmakedepends="flex"
+hostmakedepends="automake flex"
 makedepends="libfl-devel"
 short_desc="Utility designed to clean up filenames"
 maintainer="Martin Födinger <foedinger.martin@autistici.org>"
-license="BSD"
+license="BSD-3-Clause"
-homepage="http://detox.sourceforge.net/"
+homepage="https://github.com/dharple/detox"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+distfiles="https://github.com/dharple/detox/archive/v${version}.tar.gz"
-checksum="abfad90ee7d3e0fc53ce3b9da3253f9a800cdd92e3f8cc12a19394a7b1dcdbf8"
+checksum=00daf6b019b51c7bbc3ac96deeeec18fd886c144eeee97c3372dd297bb134c84
 
-post_extract() {
+pre_configure() {
-	sed -i 's/@LIBS@/& @LDFLAGS@/' Makefile.in
+	autoreconf --install
 }
 post_install() {
 	vlicense LICENSE

srcpkgs/dfu-programmer/template

@@ -1,6 +1,6 @@
 # Template file for 'dfu-programmer'
 pkgname=dfu-programmer
-version=0.7.1
+version=0.7.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -9,8 +9,8 @@ short_desc="Device Firmware Upgrade class USB driver and flasher"
 maintainer="Matt Carroll <oholiab@gmail.com>"
 license="GPL-2"
 homepage="http://dfu-programmer.github.io"
-distfiles="http://github.com/dfu-programmer/dfu-programmer/archive/v$version.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/dfu-programmer/dfu-programmer/${version}/dfu-programmer-${version}.tar.gz"
-checksum=20ef186b489031c13a9c4e95a2f747e37be2d2fefba8e79d596772d8bd22353b
+checksum=1db4d36b1aedab2adc976e8faa5495df3cf82dc4bf883633dc6ba71f7c4af995
 configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include"
 
 pre_configure() {

srcpkgs/dispcalGUI/template

@@ -1,21 +1,23 @@
 # Template file for 'dispcalGUI'
 pkgname=dispcalGUI
-version=3.0.6.3
+version=3.5.2.0
-revision=3
+revision=1
+_name="DisplayCAL"
+wrksrc="${_name}-${version}"
 build_style=python2-module
-pycompile_module="dispcalGUI"
+pycompile_module="${_name}"
 hostmakedepends="python"
 makedepends="python-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
 depends="python-numpy wxPython argyllcms"
 short_desc="Display Calibration and Characterization"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
-homepage="http://dispcalgui.hoech.net"
+homepage="https://displaycal.net/"
-distfiles="$SOURCEFORGE_SITE/dispcalgui/${pkgname}-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz"
-checksum=ca4384b5bf467153e6466492a9e257bff5eefbc80f96531847f2a504bf9b76a2
+checksum=5dec64ccaacecb58b20db4a00b6b176f15b311f86afec79e7bb8dc0ba1859ebb
 
 pre_configure() {
-	sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/dispcalGUI-VRML-to-X3D-converter.desktop
+	sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop
 }
 
 post_install() {

srcpkgs/dispcalGUI/update

@@ -0,0 +1 @@
+pkgname="${_name}"

srcpkgs/dmraid/patches/007-fix-loff_t-musl.patch

@@ -0,0 +1,14 @@
+Source: maxice8
+Upstream: no, it seems to be inactive.
+Reason: fixes usage of dmraid.h under musl libc.
+
+--- 1.0.0.rc16-3/dmraid/include/dmraid/misc.h
++++ 1.0.0.rc16-3/dmraid/include/dmraid/misc.h
+@@ -10,6 +10,7 @@
+ 
+ #ifndef _MISC_H_
+ #define _MISC_H_
++#define _GNU_SOURCE
+ #include <fcntl.h>
+ 
+ #define DM_ASSERT(__cond) do { if (!(__cond)) { printf("ASSERT file:%s line:%d fuction:%s cond: %s\n", __FILE__, __LINE__, __FUNCTION__, #__cond); } } while(0);

srcpkgs/dmraid/patches/15_isw_incorrect_status_fix.patch

@@ -1,322 +0,0 @@
-Patch include:
- fix for "Incorrect status displayed when disk is missing" issue.
- fix for "Missing supported RAID configuration in "-l" option" - Bugzilla bug
-479395
- fix for "Wrong disk layout in raid01" - no Bugzilla bug.  
---- 1.0.0.rc16-3/dmraid/lib/format/ataraid/isw.c
-+++ 1.0.0.rc16-3/dmraid/lib/format/ataraid/isw.c
-@@ -4,8 +4,11 @@
-  * Copyright (C) 2004-2008  Heinz Mauelshagen, Red Hat GmbH.
-  *                          All rights reserved.
-  *
-- * Copyright (C) 2007,2008  Intel Corporation. All rights reserved.
-+ * Copyright (C) 2007,2009  Intel Corporation. All rights reserved.
-  * November, 2007 - additions for Create, Delete, Rebuild & Raid 10.
-+ * March, 2008 - additions for hot-spare check
-+ * August, 2008 - support for Activation, Rebuild checks
-+ * January, 2009 - additions for Activation, Rebuild check
-  *
-  * See file LICENSE at the top of this source tree for license information.
-  */
-@@ -162,7 +165,7 @@ name(struct lib_context *lc, struct raid
- 
- 			while (i--) {
- 				if (disk == isw->disk + i) {
--					id = i / 2;
-+					id = i % 2;
- 					goto ok;
- 				}
- 			}
-@@ -479,7 +482,7 @@ isw_read_extended(struct lib_context *lc
- 		/* Read extended metadata to offset ISW_DISK_BLOCK_SIZE */
- 		if (blocks > 1 &&
- 		    !read_file(lc, handler, di->path,
--			       (void *) isw_tmp + ISW_DISK_BLOCK_SIZE,
-+			       (void *) (((uint8_t*)isw_tmp) + ISW_DISK_BLOCK_SIZE),
- 			       *size - ISW_DISK_BLOCK_SIZE, *isw_sboffset)) {
- 			dbg_free(isw_tmp);
- 			isw_tmp = NULL;
-@@ -708,6 +711,7 @@ super_created(struct raid_set *super, vo
- 	super->stride = ((struct isw_dev *) private)->vol.map.blocks_per_strip;
- }
- 
-+
- /*
-  * rs_group contains the top-level group RAID set (type: t_group) on entry
-  * and shall be returned on success (or NULL on error).
-@@ -1112,6 +1116,15 @@ isw_metadata_handler(struct lib_context 
- 
- 		break;		/* case GET_REBUILD_DRIVE_NO */
- 
-+	case ALLOW_ACTIVATE: /* same as ALLOW_REBUILD */
-+	case ALLOW_REBUILD:
-+		/* Do not allow activate or rebuild, if the log is non-empty */
-+		isw = META (rd, isw);
-+		ret = !isw->bbm_log_size; /* Is log empty */
-+		if (!ret)
-+			   log_err(lc, "BBM entries detected!");
-+		break; /* case ALLOW_REBUILD */
-+
- 	default:
- 		LOG_ERR(lc, 0, "%u not yet supported", command);
- 
-@@ -1144,16 +1157,25 @@ check_rd(struct lib_context *lc, struct 
- 	 struct raid_dev *rd, void *context)
- {
- 	struct isw_dev *dev = rd->private.ptr;
--
--	/* FIXME: more status checks ? */
--	if (dev->status) {
-+    if (dev == NULL)
-+        if (rd->type == t_spare) return 1;
-+        else {
-+            LOG_ERR(lc, 0, "No information about %s device on %s "
-+                    "in RAID set \"%s\"",
-+                    handler, rd->di->path, rs->name);
-+            return 0;
-+        }
-+    /* if disk is ready to read and write return 1 */
-+    if ((dev->status & ISW_DEV_READ_COALESCING)
-+           && (dev->status & ISW_DEV_WRITE_COALESCING)) {
-+            return 1;
-+    }
-+    else {
- 		LOG_ERR(lc, 0, "%s device for volume \"%s\" broken on %s "
- 			"in RAID set \"%s\"",
- 			handler, dev->volume, rd->di->path, rs->name);
--
-+            return 0;
- 	}
--
--	return 1;
- }
- 
- static int
-@@ -1622,6 +1644,7 @@ _isw_create_first_volume(struct lib_cont
- 	isw->attributes = MPB_ATTRIB_CHECKSUM_VERIFY;
- 	isw->num_raid_devs = (rs->type == ISW_T_SPARE) ? 0 : 1;
- 	isw->family_num = isw->orig_family_num = _checksum(isw) + time(NULL);
-+	isw->bbm_log_size = 0;
- 	isw->check_sum = 0;
- 	isw->check_sum = _checksum(isw);
- 	return isw;
-@@ -1719,6 +1742,7 @@ _isw_create_second_volume(struct lib_con
- 	isw->generation_num++;
- 	isw->attributes = MPB_ATTRIB_CHECKSUM_VERIFY;
- 	isw->num_raid_devs++;
-+	isw->bbm_log_size = 0;
- 	isw->check_sum = 0;
- 	isw->check_sum = _checksum(isw);
- 	return isw;
-@@ -1941,6 +1965,8 @@ _isw_log(struct lib_context *lc, struct 
- 	DP("error_log_pos: %u", isw, isw->error_log_pos);
- 	DP("cache_size: %u", isw, isw->cache_size);
- 	DP("orig_family_num: %u", isw, isw->orig_family_num);
-+	DP ("power_cycle_count: %u", isw, isw->power_cycle_count);
-+	DP ("bbm_log_size: %u", isw, isw->bbm_log_size);
- 
- 	for (i = 0; i < ISW_FILLERS; i++) {
- 		if (isw->filler[i])
-@@ -2296,7 +2322,7 @@ isw_delete(struct lib_context *lc, struc
- static struct dmraid_format isw_format = {
- 	.name = HANDLER,
- 	.descr = "Intel Software RAID",
--	.caps = "0,1,01",
-+	.caps = "0,1,5,01",
- 	.format = FMT_RAID,
- 	.read = isw_read,
- 	.write = isw_write,
---- 1.0.0.rc16-3/dmraid/lib/format/format.c
-+++ 1.0.0.rc16-3/dmraid/lib/format/format.c
-@@ -260,6 +260,7 @@ write_metadata(struct lib_context *lc, c
- 	return 1;
- }
- 
-+
- /*
-  * Check devices in a RAID set.
-  *
-@@ -277,7 +278,7 @@ _check_raid_set(struct lib_context *lc, 
- 				void *context),
- 		void *f_check_context, const char *handler)
- {
--	unsigned int devs;
-+	unsigned int dev_tot_qan;
- 	uint64_t sectors;
- 	struct raid_dev *rd;
- 
-@@ -285,36 +286,73 @@ _check_raid_set(struct lib_context *lc, 
- 		return;
- 
- 	sectors = total_sectors(lc, rs);
--	rs->total_devs = devs = count_devs(lc, rs, ct_dev);
-+	rs->total_devs = dev_tot_qan = count_devs(lc, rs, ct_dev);
- 	list_for_each_entry(rd, &rs->devs, devs) {
--		unsigned int devices = f_devices(rd, f_devices_context);
-+		unsigned int dev_found_qan = f_devices(rd, f_devices_context);
- 		/* FIXME: error if the metadatas aren't all the same? */
--		rs->found_devs = devices;
-+		rs->found_devs = dev_found_qan;
- 
- 		log_dbg(lc, "checking %s device \"%s\"", handler, rd->di->path);
--		if (T_SPARE(rd) && rs->type == t_raid1 &&	/* FIXME: rs->type check ? */
--		    rd->sectors != sectors) {
--			rd->status = s_inconsistent;
--			log_err(lc, "%s: size mismatch in set \"%s\", spare "
--				"\"%s\"", handler, rs->name, rd->di->path);
--			continue;
--		}
--
--		if (devs != devices &&
--		    f_check && !f_check(lc, rs, rd, f_check_context)) {
--			rd->status = s_broken;
--			log_err(lc, "%s: wrong # of devices in RAID "
--				"set \"%s\" [%u/%u] on %s",
--				handler, rs->name, devs, devices, rd->di->path);
--		} else
--			rd->status = s_ok;
-+        /* if disks number of found disks equals disk expected status status OK */
-+        if ((dev_tot_qan == dev_found_qan) && f_check
-+                && f_check(lc, rs, rd, f_check_context)) {
-+            rd->status = s_ok;
-+        }
-+        else {
-+            if(dev_tot_qan != dev_found_qan) {
-+                log_err(lc, "%s: wrong # of devices in RAID "
-+				    "set \"%s\" [%u/%u] on %s",
-+				    handler, rs->name, dev_tot_qan, dev_found_qan, rd->di->path);
-+            }
-+            /* if number of disks is incorrect, status depends on raid type: */
-+            switch(rs->type) {
-+                case t_linear:
-+                case t_raid0: /* raid 0 - always broken */
-+                    rd->status = s_broken;
-+                    break;
-+                case t_raid1: /* raid 1 - if at least 1 disk- inconsintent */
-+                    if(dev_tot_qan >= 1)
-+                        rd->status = s_inconsistent;
-+                    else if (T_SPARE(rd) && rd->sectors != sectors) {
-+			            rd->status = s_inconsistent;
-+			            log_err(lc, "%s: size mismatch in set \"%s\", spare "
-+				            "\"%s\"", handler, rs->name, rd->di->path);
-+                    }
-+                    else rd->status = s_broken;
-+                    break;
-+                case t_raid4:
-+                case t_raid5_ls:
-+                case t_raid5_rs:
-+                case t_raid5_la:
-+                case t_raid5_ra: /* raid 4/5 - if 1 disk missing- inconsistent */
-+                    if((dev_tot_qan == (dev_found_qan-1) && dev_tot_qan > 1
-+                             && f_check && f_check(lc, rs, rd, f_check_context))
-+                            || (dev_tot_qan > dev_found_qan))
-+                        rd->status = s_inconsistent;
-+                    else rd->status = s_broken;
-+                    break;
-+                case t_raid6: /* raid 6 - if up to 2 disks missing- inconsistent */
-+                    if((dev_tot_qan >= (dev_found_qan-2)
-+                             && f_check && f_check(lc, rs, rd, f_check_context))
-+                            || (dev_tot_qan > dev_found_qan))
-+                        rd->status = s_inconsistent;
-+                    else rd->status = s_broken;
-+                    break;
-+
-+                case t_spare: /* spare - always broken */
-+                    rd->status = s_broken;
-+                    break;
-+                default: /* other - undef */
-+                    rd->status = s_undef;
-+        }
-+    }
- 	}
- }
- 
- /*
-  * Update RAID set state based on operational subsets/devices.
-  *
-- * In case of a RAID set hierachy, check availability of subsets
-+ f a RAID set hierachy, check availability of subsets
-  * and set superset to broken in case *all* subsets are broken.
-  * If at least one is still available, set to inconsistent.
-  *
-@@ -323,12 +361,19 @@ _check_raid_set(struct lib_context *lc, 
-  */
- static void
- _set_rs_status(struct lib_context *lc, struct raid_set *rs,
--	       unsigned int i, unsigned int operational)
-+	       unsigned int i, unsigned int operational,
-+           unsigned int inconsist, unsigned int subsets_raid01)
- {
--	if (operational == i)
-+	if (subsets_raid01 == 1) {
-+        rs->status = s_broken;
-+        return;
-+    }
-+    if (operational == i)
- 		rs->status = s_ok;
- 	else if (operational)
- 		rs->status = s_inconsistent;
-+    else if (inconsist)
-+		rs->status = s_inconsistent;
- 	else
- 		rs->status = s_broken;
- 
-@@ -338,26 +383,30 @@ _set_rs_status(struct lib_context *lc, s
- static int
- set_rs_status(struct lib_context *lc, struct raid_set *rs)
- {
--	unsigned int i = 0, operational = 0;
-+	unsigned int i = 0, operational = 0, subsets_raid01 = 0, inconsist = 0;
- 	struct raid_set *r;
- 	struct raid_dev *rd;
- 
- 	/* Set status of subsets. */
- 	list_for_each_entry(r, &rs->sets, list) {
- 		/* Check subsets to set status of superset. */
--		i++;
-+        if((rs->type == t_raid0) && (r->type == t_raid1))
-+           subsets_raid01++; /* Count subsets for raid 01 */
-+		i++; /* Count subsets*/
- 		if (S_OK(r->status) || S_INCONSISTENT(r->status))
--			operational++;
-+			operational++; /* Count operational subsets*/
- 	}
- 
- 	/* Check status of devices... */
- 	list_for_each_entry(rd, &rs->devs, devs) {
--		i++;
-+		i++; /* Count disks*/
- 		if (S_OK(rd->status))
--			operational++;
-+			operational++; /* Count disks in "ok" raid*/
-+        if (S_INCONSISTENT(rd->status))
-+            inconsist++; /* Count disks in degraded raid*/
- 	}
- 
--	_set_rs_status(lc, rs, i, operational);
-+	_set_rs_status(lc, rs, i, operational, inconsist, subsets_raid01);
- 	return S_BROKEN(rs->status) ? 0 : 1;
- }
- 
---- 1.0.0.rc16-3/dmraid/include/dmraid/format.h
-+++ 1.0.0.rc16-3/dmraid/include/dmraid/format.h
-@@ -75,6 +75,8 @@ enum handler_commands {
- 	GET_REBUILD_DRIVE,
- 	GET_REBUILD_DRIVE_NO,
- 	CHECK_HOT_SPARE,
-+	ALLOW_ACTIVATE,
-+	ALLOW_REBUILD,
- 	/* ... */
- };
- 
---- 1.0.0.rc16-3/dmraid/lib/format/ataraid/isw.h
-+++ 1.0.0.rc16-3/dmraid/lib/format/ataraid/isw.h
-@@ -188,6 +188,8 @@ struct isw_dev {
- 
- struct isw {
- 	int8_t sig[MAX_SIGNATURE_LENGTH];	/* 0x0 - 0x1F */
-+	uint32_t bbm_log_size;
-+	uint32_t power_cycle_count;
- 	uint32_t check_sum;	/* 0x20 - 0x23  MPB Checksum */
- 	uint32_t mpb_size;	/* 0x24 - 0x27 Size of MPB */
- 	uint32_t family_num;	/* 0x28 - 0x2B Checksum from first time this config was written */

srcpkgs/dmraid/patches/series

@@ -1,6 +0,0 @@
-04_do_not_use_p_for_partition.patch
-12_support_virtio_devices.patch
-17_isw-probe-hpa.patch
-15_activate_multiple_raid_sets.patch
-20_fix_isw_sectors_calculation.patch
-25_musl-libc.patch

srcpkgs/dmraid/template

@@ -3,7 +3,7 @@ pkgname=dmraid
 _distver=1.0.0.rc16
 _patchver=3
 version="${_distver}.${_patchver}"
-revision=10
+revision=11
 wrksrc="${pkgname}"
 build_wrksrc="${_distver}-${_patchver}/${pkgname}"
 build_style=gnu-configure

srcpkgs/dnscrypt-proxy/template

@@ -1,6 +1,6 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
-version=2.0.8
+version=2.0.10
 revision=1
 build_style=go
 short_desc="DNS proxy that encrypts queries"
@@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="ISC"
 homepage="https://github.com/jedisct1/dnscrypt-proxy"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a99fc2b055618b0578ebe1477769bf9dddff7daa653649bd73f4bcf650bc8d40
+checksum=ec5f68349833b4a501fedc0af3cdbdfd6df2644b3e3e1c43aa86c823ca5a3007
 conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 

srcpkgs/docker-compose/template

@@ -1,6 +1,6 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.18.0
+version=1.21.0
 revision=1
 noarch=yes
 wrksrc="compose-${version}"
@@ -15,7 +15,7 @@ maintainer="pancake <pancake@nopcode.org>"
 homepage="https://docs.docker.com/compose/"
 license="Apache-2.0"
 distfiles="https://github.com/docker/compose/archive/${version}.tar.gz"
-checksum=4265c18d7223c149342a252ce6f060934b373a1498c667b4d57b923aaeea4090
+checksum=75c954d27f43e6e50f3710f4157abad264d6744f8b96c9edd25569d356b8f596
 
 pre_build() {
 	# remove all upper bounds

srcpkgs/edb-debugger/template

@@ -1,11 +1,11 @@
 # Template file for 'edb-debugger'
 pkgname=edb-debugger
 version=0.9.21
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_PREFIX=/usr/ -DDEFAULT_PLUGIN_PATH=/usr/lib/edb/"
 hostmakedepends='pkg-config'
-makedepends="capstone-devel graphviz-devel boost-devel qt-devel"
+makedepends="capstone-devel graphviz-devel boost-devel qt5-devel qt5-xmlpatterns-devel"
 short_desc="Cross platform x86/x86-64 debugger"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2"

srcpkgs/editorconfig-devel

@@ -0,0 +1 @@
+editorconfig

srcpkgs/editorconfig/template

@@ -0,0 +1,28 @@
+# Template file for 'editorconfig'
+pkgname=editorconfig
+version=0.12.2
+revision=1
+wrksrc=editorconfig-core-c-${version}
+build_style=cmake
+makedepends="pcre-devel"
+short_desc="EditorConfig core library written in C"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="BSD-2-Clause"
+homepage="http://editorconfig.org/"
+distfiles="https://github.com/editorconfig/editorconfig-core-c/archive/v${version}.tar.gz"
+checksum=8a63ae63d3a2f2a202acbd94a6cbe3fa4450c2658e33e922683af33c48a9115d
+
+post_install() {
+	vlicense LICENSE
+}
+
+editorconfig-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.so
+	}
+}

srcpkgs/edx-dl/template

@@ -1,6 +1,6 @@
 # Template file for 'edx-dl'
 pkgname=edx-dl
-version=0.1.8
+version=0.1.9
 revision=1
 build_style=python3-module
 pycompile_module="edx_dl"
@@ -12,5 +12,5 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/coursera-dl/edx-dl"
 distfiles="${PYPI_SITE}/e/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=6f91839278c8a8c2d364af1dd9ee93748f21e0cb9c865ed6478d6247422f123d
+checksum=ae07358f53c529fc7a94a6fcc883b81abf3d07a24f62fa6fcffdf92b39d38e42
 noarch=yes

srcpkgs/extra-cmake-modules/template

@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.43.0
+version=5.44.0
 revision=1
 noarch=yes
 build_style=cmake
@@ -9,10 +9,10 @@ hostmakedepends="python-Sphinx qt5-tools"
 depends="cmake"
 short_desc="Extra modules and scripts for CMake"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
 distfiles="http://download.kde.org/stable/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5757a5ddceede5321b58345a8dbf953c2282487bf9c24ae477efde800b94fffd
+checksum=3a72c3aba988c5e17eef1a805547f2567f5e31cf86676ed0d0761d478ae42f88
 
 post_install() {
 	vlicense COPYING-CMAKE-SCRIPTS

srcpkgs/focuswriter/template

@@ -1,16 +1,16 @@
 # Template file for 'focuswriter'
 pkgname=focuswriter
-version=1.6.9
+version=1.6.12
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-qmake qt5-tools-devel"
+hostmakedepends="pkg-config"
-makedepends="qt5-devel qt5-multimedia-devel hunspell-devel pulseaudio-devel"
+makedepends="hunspell-devel pulseaudio-devel qt5-multimedia-devel"
 short_desc="Simple, distraction-free word processor with a hide-away interface"
-maintainer="Piraty <piraty1@inbox.ru>"
+maintainer="cr6git <quark6@protonmail.com>"
 license="GPL-3"
 homepage="https://gottcode.org/focuswriter/"
-distfiles="https://github.com/gottcode/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz"
-checksum=46e69cc3a5d3b2a3a9c8b89464f463c2f62b7652f3e0b508a8ef99e576f67b3a
+checksum=c71f0a77ca031835ced8f6bd0b876d775f9fda30d60c7193b955499c53b16b55
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-multimedia-devel"

srcpkgs/font-awesome/template

@@ -1,6 +1,6 @@
 # Template file for 'font-awesome'
 pkgname=font-awesome
-version=5.0.9
+version=5.0.10
 revision=1
 noarch=yes
 wrksrc=Font-Awesome-${version}
@@ -11,7 +11,7 @@ maintainer="Yann Bordenave <meow@meo.wf>"
 homepage="https://fontawesome.com/"
 license="OFL-1.1"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=ddb8bea3368b6c252abb3a890eac2a220e787b57de4e1238f5bf01b36d3d8250
+checksum=a2588298f516d6f894b31d1990819d0af70f4beccc3e2c364d30d813f8af4193
 
 do_install() {
 	install -Dm644 use-on-desktop/*.otf -t ${DESTDIR}/usr/share/fonts/OTF

srcpkgs/freecad/patches/001-python3.patch

@@ -0,0 +1,11 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -445,7 +445,7 @@
+ 
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677598
+ # Acceptable versions of Python
+-set(Python_ADDITIONAL_VERSIONS "2.7")
++set(Python_ADDITIONAL_VERSIONS "2.7 3.6")
+ 
+ # For building on OS X
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

srcpkgs/freecad/patches/add-smds_memory_limit-utility.patch

@@ -1,55 +0,0 @@
-Build and install missing binary SMDS_MemoryLimit
-Patch with the help of http://forum.freecadweb.org/viewtopic.php?t=4316&start=10#p47658 , change #3
-
---- src/3rdParty/salomesmesh/CMakeLists.txt.ORI	2016-04-07 03:39:34.000000000 +0200
-+++ src/3rdParty/salomesmesh/CMakeLists.txt	2016-05-31 10:20:54.115079806 +0200
-@@ -158,6 +158,33 @@
- endif(WIN32)
- 
- 
-+############################
-+# SMDS_MemoryLimit Utility #
-+############################
-+
-+SET(SMDS_MemoryLimit_SRCS
-+        src/SMDS/SMDS_MemoryLimit.cpp
-+    )
-+add_executable(SMDS_MemoryLimit ${SMDS_MemoryLimit_SRCS})
-+
-+# Note this is IDE specific, not necessarily platform specific
-+if(MSVC)
-+    set_target_properties(SMDS_MemoryLimit PROPERTIES OUTPUT_NAME "SMDS_MemoryLimit")
-+    set_target_properties(SMDS_MemoryLimit PROPERTIES DEBUG_OUTPUT_NAME "SMDS_MemoryLimit")
-+    # dirty hack to avoid Debug/Release subdirectory
-+    set_target_properties(FreeCADMainCmd PROPERTIES PREFIX "../")
-+    set_target_properties(FreeCADMainCmd PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-+elseif(MINGW)
-+    set_target_properties(SMDS_MemoryLimit PROPERTIES OUTPUT_NAME "SMDS_MemoryLimit")
-+    set_target_properties(SMDS_MemoryLimit PROPERTIES DEBUG_OUTPUT_NAME "SMDS_MemoryLimit")
-+    set_target_properties(FreeCADMainCmd PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-+else(MSVC)
-+    set_target_properties(SMDS_MemoryLimit PROPERTIES OUTPUT_NAME "SMDS_MemoryLimit")
-+    set_target_properties(SMDS_MemoryLimit PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-+    #set_target_properties(SMDS_MemoryLimit PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-+endif(MSVC)
-+
-+
- ##########
- # Driver #
- ##########
-@@ -380,12 +407,13 @@
- 
- 
- if(WIN32)
--    INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers
-+    INSTALL(TARGETS SMDS SMDS_MemoryLimit Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers
-         RUNTIME DESTINATION bin
-         LIBRARY DESTINATION lib
-     )
- else(WIN32)
--    INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers
-+    INSTALL(TARGETS SMDS SMDS_MemoryLimit Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers
-+        RUNTIME DESTINATION bin
-         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     )
- endif(WIN32)

srcpkgs/freecad/template

@@ -1,26 +1,27 @@
 # Template file for 'freecad'
+#
+# TODO
+#  - qt5: needs python-pyside2 (https://wiki.qt.io/PySide2)
+#  - python3: freecad code not yet ready for it, probably at 0.18
 pkgname=freecad
-version=0.16.6712
+version=0.17
-revision=2
+revision=1
 wrksrc="FreeCAD-${version}"
 build_style=cmake
 
-_inst_prefix=usr/lib/${pkgname}
+_inst_prefix=/usr/lib/${pkgname}
 
-# set CMAKE_INSTALL_LIBDIR to {CMAKE_INSTALL_PREFIX}/lib" or patch LibDir in src/App/FreeCADInit.py
+# CMAKE_INSTALL_LIBDIR by default doesn't use PREFIX, so we set it manually
 configure_args="
- -DCMAKE_INSTALL_PREFIX=/${_inst_prefix}
+ -DBUILD_QT5=OFF
- -DCMAKE_INSTALL_DATADIR=/${_inst_prefix}/data
+ -DCMAKE_INSTALL_PREFIX=${_inst_prefix}
- -DCMAKE_INSTALL_DOCDIR=/${_inst_prefix}/doc
+ -DCMAKE_INSTALL_LIBDIR=${_inst_prefix}/lib"
- -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${pkgname}
+hostmakedepends="pkg-config swig doxygen graphviz"
- -DCMAKE_INSTALL_LIBDIR=/${_inst_prefix}/lib"
+makedepends="python-devel boost-devel boost-python libxerces-c-devel
-
+ zlib-devel occt-devel vtk-devel hdf5-devel openmpi-devel libmed-devel eigen
-hostmakedepends="python swig pkg-config doxygen graphviz"
+ coin3-devel libshiboken-python-devel libspnav-devel pyside-tools lz4-devel
-
+ libpyside-python-devel python-matplotlib netcdf-devel jsoncpp-devel
-makedepends="python-devel oce-devel qt-devel qt-webkit-devel coin3-devel eigen
+ qt-devel qt-webkit-devel coin3-doc"
- libxerces-c-devel libspnav-devel libshiboken-python-devel libpyside-python-devel
- pyside-tools python-matplotlib boost-python coin3-doc"
-
 # qt-devel-tools, qt-plugin-sqlite: Help uses qt/assistant, its data in SQLite format
 depends="python-matplotlib python-pyside qt-devel-tools qt-plugin-sqlite python-pivy"
 
@@ -29,27 +30,22 @@ pycompile_dirs="usr/lib/${pkgname}/Mod usr/lib/${pkgname}/data/Mod"
 short_desc="A general purpose 3D CAD modeler"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-2.1"
-homepage="http://freecadweb.org/"
+homepage="https://freecadweb.org/"
 distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"
-checksum=97aa130addeb0f3c0bf79e4828fbd242b76cc92603771d6b7aeb9dbd9f111a92
+checksum=ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb
-
-case "${XBPS_TARGET_MACHINE}" in
-	aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1402";;
-esac
 
 post_install() {
-
 	# AppHomePath is computed with binary's realpath:
 	# do not move binaries but symlink them instead.
 	vmkdir usr/bin
 	for f in FreeCAD FreeCADCmd; do
-		ln -s /${_inst_prefix}/bin/${f} ${DESTDIR}/usr/bin/${f}
+		ln -s ${_inst_prefix}/bin/${f} ${DESTDIR}/usr/bin/${f}
 	done
 
 	# desktop integration
 	vmkdir usr/share/applications
 	vcopy ${FILESDIR}/freecad.desktop usr/share/applications
-	sed -i -e "s,@_inst_prefix@,/${_inst_prefix}," ${DESTDIR}/usr/share/applications/freecad.desktop
+	sed -i -e "s,@_inst_prefix@,${_inst_prefix}," ${DESTDIR}/usr/share/applications/freecad.desktop
 	vmkdir usr/share/appdata
 	vcopy ${FILESDIR}/freecad.appdata.xml usr/share/appdata
 	vmkdir usr/share/mime/packages
@@ -57,9 +53,9 @@ post_install() {
 	for s in 16 32 48 64; do
 		_dest_icon=usr/share/icons/hicolor/${s}x${s}/apps
 		vmkdir ${_dest_icon}
-		ln -s /${_inst_prefix}/data/freecad-icon-${s}.png ${DESTDIR}/${_dest_icon}/freecad.png
+		ln -s ${_inst_prefix}/data/freecad-icon-${s}.png ${DESTDIR}/${_dest_icon}/freecad.png
-		ln -s /${_inst_prefix}/data/freecad.xpm ${DESTDIR}/${_dest_icon}/freecad.xpm
+		ln -s ${_inst_prefix}/data/freecad.xpm ${DESTDIR}/${_dest_icon}/freecad.xpm
 	done
 	vmkdir usr/share/icons/scalable/apps
-	ln -s /${_inst_prefix}/data/freecad.svg ${DESTDIR}/usr/share/icons/scalable/apps/freecad.svg
+	ln -s ${_inst_prefix}/data/freecad.svg ${DESTDIR}/usr/share/icons/scalable/apps/freecad.svg
 }

srcpkgs/gcompris-qt/template

@@ -1,19 +1,25 @@
 # Template file for 'gcompris-qt'
 pkgname=gcompris-qt
-version=0.81
+version=0.90
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DQML_BOX2D_LIBRARY=/usr/lib/qt5/qml/Box2D.2.0"
-hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake"
+hostmakedepends="extra-cmake-modules"
-makedepends="kdoctools-devel qt5-declarative-devel
+makedepends="kdoctools-devel qml-box2d qt5-declarative-devel
  qt5-multimedia-devel qt5-sensors-devel qt5-svg-devel
- qt5-tools-devel qt5-xmlpatterns-devel qml-box2d"
+ qt5-tools-devel qt5-xmlpatterns-devel"
 depends="desktop-file-utils hicolor-icon-theme
- qt5-graphicaleffects qt5-multimedia
+ qt5-graphicaleffects qt5-multimedia qt5-quickcontrols qt5-svg"
- qt5-quickcontrols qt5-svg"
-maintainer="cr6git <quark6@protonmail.com>"
 short_desc="High quality educational software suite for children aged 2 to 10"
-homepage="http://gcompris.net/index-en.html"
+maintainer="cr6git <quark6@protonmail.com>"
 license="GPL-3"
+homepage="http://gcompris.net"
 distfiles="http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"
-checksum=79d515eb66b2b8549dba7dc184943b38312332ad18c2e5fa3f50e681ab9c849b
+checksum=eaab8805ae8c1e4fa04ba6cdfe437fca6082f2d9848dc83b4e04bd086d6faac4
+
+if [ -n "$CROSS_BUILD" ]; then
+	hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake"
+	post_extract() {
+		sed -i -e "/set(CMAKE_PREFIX_PATH/d" CMakeLists.txt
+	}
+fi

srcpkgs/gnome-terminal/template

@@ -1,19 +1,18 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.28.0
+version=3.28.1
 revision=1
-lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension --disable-migration"
-hostmakedepends="pkg-config intltool itstool gnome-doc-utils appdata-tools
+hostmakedepends="appdata-tools glib-devel gnome-doc-utils intltool itstool
- glib-devel"
+ pkg-config"
-makedepends="gtk+3-devel vte3-devel dconf-devel libuuid-devel
+makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
- gsettings-desktop-schemas-devel nautilus-devel gnome-shell
+ nautilus-devel vte3-devel"
- desktop-file-utils"
 depends="desktop-file-utils"
 short_desc="The GNOME terminal emulator application"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 homepage="https://wiki.gnome.org/Apps/Terminal"
-license="GPL-2.0-or-later, GFDL-1.3"
+license="GPL-2.0-or-later, GFDL-1.3-only"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a551d5eee10f66560fc7c6bdff6f7358ce9c60b526d8ba68a82f2ab024a3bcc4
+checksum=f7a6a0189a0b0fbf7845d092e5444fc6303225c2d9ef87bfaae3f80845801cc3
+lib32disabled=yes

srcpkgs/go-for-it/template

@@ -1,14 +1,14 @@
 # Template file for 'go-for-it'
 pkgname=go-for-it
-version=1.6.5
+version=1.6.6
 revision=1
-build_style=cmake
 wrksrc="Go-For-It-${version}"
-hostmakedepends="vala pkg-config intltool"
+build_style=cmake
-makedepends="gtk+3-devel libnotify-devel"
+hostmakedepends="intltool pkg-config vala"
+makedepends="libnotify-devel"
 short_desc="ToDo-list and productivity app"
 maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-3-only"
+license="GPL-3.0-only"
 homepage="https://github.com/JMoerman/Go-For-It"
 distfiles="https://github.com/JMoerman/Go-For-It/archive/${version}.tar.gz"
-checksum=af3ba1529b45e697caf22e79821768c742903084c76eb2637a15ec51508b2e35
+checksum=1025bb6b76ba77e741f542840d77687143a63471a76b9296e4b6b949d2cf2b3f

srcpkgs/google-chrome/template

@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=65.0.3325.146
+_chromeVersion=66.0.3359.117
 _chromeRevision=1
 _channel=stable
 
@@ -7,7 +7,7 @@ pkgname=google-chrome
 version=${_chromeVersion}.${_chromeRevision}
 revision=1
 maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
-homepage="http://www.google.com/chrome/"
+homepage="https://www.google.com/chrome/"
 license="chrome"
 short_desc="An attempt at creating a safer, faster, and more stable browser"
 only_for_archs="x86_64"
@@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64.
 _chromeUrl="${_baseUrl}/${_filename}"
 
 distfiles="${_chromeUrl}"
-checksum=77180421be7f98328d24f3fd4c4fa42788b9296addeced2ab8243f68241b51bc
+checksum=affd1443f9756240a30fac61bc7a06666cd5d9532204e1b09f499d89afc18ef9
 
 do_extract() {
 	mkdir -p ${DESTDIR}

srcpkgs/gpgme/patches/cmake-crossbuild-support.patch

@@ -1,11 +1,8 @@
-Cross-building needs that include and library paths to be computed 
+diff --git lang/cpp/src/GpgmeppConfig.cmake.in.in lang/cpp/src/GpgmeppConfig.cmake.in.in
-at this package's build time and not at runtime usage of this cmake support.
+index 73f5eaad..019de555 100644
-
+--- lang/cpp/src/GpgmeppConfig.cmake.in.in
-Code inspired from cmake files of KDE Framework 5 various subparts.
-
---- lang/cpp/src/GpgmeppConfig.cmake.in.in.ORIG
 +++ lang/cpp/src/GpgmeppConfig.cmake.in.in
-@@ -58,19 +58,41 @@
+@@ -58,19 +58,41 @@ unset(_targetsDefined)
  unset(_targetsNotDefined)
  unset(_expectedTargets)
  
@@ -33,7 +30,7 @@ Code inspired from cmake files of KDE Framework 5 various subparts.
  
  set_target_properties(Gpgmepp PROPERTIES
 -  INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
--  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
 -  IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@"
 +  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/gpgme++"
 +  INTERFACE_LINK_LIBRARIES "pthread;${_IMPORT_PREFIX}/lib/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
@@ -50,9 +47,11 @@ Code inspired from cmake files of KDE Framework 5 various subparts.
  # Loop over all imported files and verify that they actually exist
  foreach(target ${_IMPORT_CHECK_TARGETS} )
    foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
---- lang/qt/src/QGpgmeConfig.cmake.in.in.ORIG
+diff --git lang/qt/src/QGpgmeConfig.cmake.in.in lang/qt/src/QGpgmeConfig.cmake.in.in
+index a17a19fd..29a6b87a 100644
+--- lang/qt/src/QGpgmeConfig.cmake.in.in
 +++ lang/qt/src/QGpgmeConfig.cmake.in.in
-@@ -58,19 +58,41 @@
+@@ -58,19 +58,41 @@ unset(_targetsDefined)
  unset(_targetsNotDefined)
  unset(_expectedTargets)
  
@@ -83,7 +82,7 @@ Code inspired from cmake files of KDE Framework 5 various subparts.
 +  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme"
    INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
 -  IMPORTED_LOCATION "@resolved_libdir@/libqgpgme@libsuffix@"
-+  IMPORTED_LOCATION "${_IMPORT_PREFIX}/libqgpgme@libsuffix@"
++  IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/libqgpgme@libsuffix@"
  )
  
  if(CMAKE_VERSION VERSION_LESS 2.8.12)

srcpkgs/gpgme/template

@@ -1,21 +1,21 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.9.0
+version=1.10.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing --disable-gpgconf-test
  --disable-gpg-test --disable-gpgsm-test
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
  --with-libassuan-prefix=$XBPS_CROSS_BASE/usr"
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools gnupg2"
 makedepends="libgpg-error-devel libassuan-devel qt5-tools-devel"
 depends="gnupg2"
 short_desc="GnuPG Made Easy"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.gnupg.org/related_software/gpgme/"
 distfiles="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$version.tar.bz2"
-checksum=1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
+checksum=1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" ac_cv_sys_file_offset_bits=no";;
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1"
 
+post_extract() {
+	sed -i 's|GPG = gpg|GPG = gpg2|g' tests/gpg/Makefile.* \
+		lang/qt/tests/Makefile.* lang/python/tests/Makefile.*
+}
+
 gpgme-devel_package() {
 	depends="${makedepends/qt5-tools-devel/} gpgme>=${version}_${revision}"
 	short_desc+=" - development files"

srcpkgs/gphoto2/template

@@ -1,15 +1,15 @@
 # Template file for 'gphoto2'
 pkgname=gphoto2
-version=2.5.15
+version=2.5.17
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev
  POPT_CFLAGS=-I${XBPS_CROSS_BASE}/usr/include POPT_LIBS=-lpopt"
-hostmakedepends="automake libtool pkg-config gettext-devel"
+hostmakedepends="automake gettext-devel libtool pkg-config"
-makedepends="libgphoto2-devel libjpeg-turbo-devel readline-devel popt-devel"
+makedepends="libgphoto2-devel libjpeg-turbo-devel popt-devel readline-devel"
 short_desc="Digital camera CLI iinterface to libgphoto"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.gphoto.org"
 distfiles="${SOURCEFORGE_SITE}/gphoto/$pkgname-$version.tar.bz2"
-checksum=ae571a227983dc9997876702a73af5431d41f287ea0f483cda897c57a6084a77
+checksum=aa571039240c68a053be710ca41645aed0239fa2f0b737b8ec767fef29e3544f

srcpkgs/gradle/template

@@ -1,9 +1,7 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=4.6
+version=4.7
 revision=1
-noarch=yes
-nocross=yes
 hostmakedepends="unzip"
 depends="virtual?java-environment"
 short_desc="Build system for Java/C/C++ software"
@@ -11,7 +9,9 @@ maintainer="Adrian Siekierka <kontakt@asie.pl>"
 license="Apache-2.0"
 homepage="http://gradle.org/"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915
+checksum=fca5087dc8b50c64655c000989635664a73b11b9bd3703c7d6cabd31b7dcdb04
+nocross=yes
+noarch=yes
 
 do_install() {
 	vmkdir "usr/lib/gradle"

srcpkgs/grafx2/template

@@ -1,17 +1,18 @@
 # Template file for 'grafx2'
 pkgname=grafx2
-version=2.4
+version=2.4.2035
 revision=1
 wrksrc=grafx2
 build_wrksrc="src"
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="SDL_ttf-devel SDL_image-devel freetype-devel lua-devel"
+makedepends="freetype-devel lua-devel SDL_image-devel SDL_ttf-devel"
+depends="desktop-file-utils"
 short_desc="Bitmap/pixel drawing program like Deluxe Paint"
 maintainer="allan <mail@may.mooo.com>"
-license="GPL-1"
+license="GPL-2"
 homepage="http://pulkomandy.tk/projects/GrafX2/"
-distfiles="http://pulkomandy.tk/projects/GrafX2/downloads/21>$pkgname-$version.tgz"
+distfiles="http://pulkomandy.tk/projects/GrafX2/downloads/grafx2-${version}-src.tgz"
 checksum=5818caea63cd3cf3318baf01dd20f81ec61e4514443000c80a41b68ab3f17a6b
 
 pre_build() {
@@ -26,6 +27,6 @@ do_install() {
 	vman ../misc/unix/grafx2.1
 	vinstall ../misc/unix/grafx2.desktop 644 usr/share/applications
 	vinstall ../misc/unix/grafx2.xpm 644 usr/share/pixmaps
-	vmkdir usr/share/
+	vinstall ../share/icons/grafx2.svg 644 usr/share/icons
-	mv ../share/* ${DESTDIR}/usr/share/
+	vcopy ../share/grafx2 usr/share
 }

srcpkgs/grantleetheme-devel

@@ -0,0 +1 @@
+grantleetheme

srcpkgs/grantleetheme/template

@@ -0,0 +1,25 @@
+# Template file for 'grantleetheme'
+pkgname=grantleetheme
+version=17.12.3
+revision=1
+build_style=cmake
+configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python"
+makedepends="grantlee5-devel ki18n-devel kiconthemes-devel knewstuff-devel"
+short_desc="Library for Grantlee theming support"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://community.kde.org/KDE_PIM"
+distfiles="https://download.kde.org/stable/applications/${version}/src/grantleetheme-${version}.tar.xz"
+checksum=5dc34b222ff3297cccd0a7679ff8856ec566954443a45702c0c12833042cda60
+
+grantleetheme-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/grantleetheme/update

@@ -0,0 +1,2 @@
+site="https://download.kde.org/stable/applications/"
+pattern='href="\K[\d\.]+(?=/")'

srcpkgs/greybird-themes/template

@@ -1,22 +1,19 @@
 # Template file for 'greybird-themes'
 pkgname=greybird-themes
-version=3.22.7
+version=3.22.8
 revision=1
-noarch=yes
 wrksrc="Greybird-${version}"
+noarch=yes
+depends="gtk-engine-murrine"
 short_desc="An elegant grey GTK+2/3 theme"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0"
-depends="gtk-engine-murrine"
 homepage="https://github.com/shimmerproject/Greybird"
 distfiles="https://github.com/shimmerproject/Greybird/archive/v${version}.tar.gz"
-checksum=0dd54e3f2479030c6a018e001f930998fc8c9517da12437d27335e486c47ebd1
+checksum=f8808d10b55d32ea69a9030d6ac6a707e7274ee2528f94fc7809bb2eeedfcdb9
 
 do_install() {
-	vmkdir usr/share/themes/Greybird
+	mkdir -p ${DESTDIR}/usr/share/themes/{Greybird,Greybird{-bright/xfce-notify-4.0,{-accessibility,-compact}/xfwm4}}
-	vmkdir usr/share/themes/Greybird-bright/xfce-notify-4.0
-	vmkdir usr/share/themes/Greybird-accessibility/xfwm4
-	vmkdir usr/share/themes/Greybird-compact/xfwm4
 	vcopy "Greybird.emerald gnome-shell gtk-2.0 gtk-3.0 index.theme metacity-1 plank
 	 ubiquity-panel-bg.png unity xfce-notify-4.0 xfwm4" usr/share/themes/Greybird
 	vcopy xfce-notify-4.0_bright/* usr/share/themes/Greybird-bright/xfce-notify-4.0

srcpkgs/gtk+3/template

@@ -1,6 +1,6 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
-version=3.22.29
+version=3.22.30
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -8,24 +8,22 @@ configure_args="--disable-schemas-compile
  $(vopt_enable broadway broadway-backend) $(vopt_enable colord)
  $(vopt_enable cups) $(vopt_enable gir introspection)
  $(vopt_enable wayland wayland-backend) $(vopt_enable x11 x11-backend)"
-short_desc="The GTK+ toolkit (v3)"
+hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
+ gtk-update-icon-cache pkg-config
-homepage="https://www.gtk.org/"
-license="LGPL-2.1-or-later"
-distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=a07d64b939fcc034a066b7723fdf9b24e92c9cfb6a8497593f3471fe56fbbbf8
-
-hostmakedepends="automake gettext-devel libtool pkg-config
- glib-devel gtk-doc gobject-introspection gtk-update-icon-cache
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
-makedepends="libglib-devel atk-devel at-spi2-atk-devel libepoxy-devel
+makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
- libpng-devel fontconfig-devel cairo-devel pango-devel gdk-pixbuf-devel
+ $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
- $(vopt_if colord colord-devel) $(vopt_if cups cups-devel)
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols libwayland-egl MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')"
-depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 dbus-x11)"
+depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
-triggers="gtk3-immodules"
+short_desc="The GTK+ toolkit (v3)"
+maintainer="Juan RP <xtraeme@voidlinux.eu>"
+license="LGPL-2.1-or-later"
+homepage="https://www.gtk.org/"
+distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
+checksum=a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567
 conf_files="/etc/gtk-3.0/im-multipress.conf"
+triggers="gtk3-immodules"
 
 # Package build options
 build_options="broadway colord cups gir wayland x11"
@@ -43,10 +41,12 @@ pre_configure() {
 	sed -i 's,pkg-config,/usr/bin/pkg-config,' autogen.sh
 	NOCONFIGURE=1 ./autogen.sh
 }
+
 do_check() {
 	# Requires xserver running
 	:
 }
+
 post_install() {
 	rm -f ${DESTDIR}/usr/bin/gtk-update-icon-cache
 	rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1
@@ -66,6 +66,7 @@ gtk+3-devel_package() {
 		vmove usr/share/aclocal
 	}
 }
+
 gtk+3-demo_package() {
 	short_desc+=" - demonstration application"
 	pkg_install() {

srcpkgs/gwenview/template

@@ -1,7 +1,7 @@
 # Template file for 'gwenview'.
 pkgname=gwenview
 version=17.12.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools python kdoctools kconfig"
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel

srcpkgs/hunspell-da_DK/template

@@ -1,20 +1,20 @@
 # Template file for 'hunspell-da_DK'
 pkgname=hunspell-da_DK
-version=2.3
+version=2.4
 revision=1
-maintainer="Unix Sheikh <unixsheikh@protonmail.com>"
-homepage="http://www.stavekontrolden.dk/"
-license="GPL-2 LGPL-2.1 MPL-1.1"
 noarch=yes
+create_wrksrc=yes
 hostmakedepends="unzip"
 short_desc="Danish da_DK dictionary for hunspell"
-distfiles="https://github.com/unixsheikh/void-hunspell-da-dk/archive/master.tar.gz"
+maintainer="Unix Sheikh <unixsheikh@protonmail.com>"
-checksum=9396f7ba4447b6e210a0e40b22089357ade94f1eeb264d44be5651dbf6023c86
+license="GPL-2, LGPL-2.1, MPL-1.1"
-create_wrksrc=yes
+homepage="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/"
+distfiles="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/$version/@@download/file/dict-da-$version.oxt>dict-da-$version.zip"
+checksum=c08a7c53dcbae49f5ebb3274e673ec983f623f52c9f8d6f471887de7e4a62476
 
 do_install() {
-	vinstall void-hunspell-da-dk-master/da_DK.aff 644 /usr/share/hunspell
+	vinstall da_DK.aff 644 usr/share/hunspell
-	vinstall void-hunspell-da-dk-master/da_DK.dic 644 /usr/share/hunspell
+	vinstall da_DK.dic 644 usr/share/hunspell
-	vlicense void-hunspell-da-dk-master/README
+	vlicense README_da_DK.txt
 }
 

srcpkgs/hunspell-en_US/template

@@ -1,16 +1,16 @@
 # Template file for 'hunspell-en_US'
 pkgname=hunspell-en_US
-version=2017.08.24
+version=2018.04.16
 revision=1
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://wordlist.aspell.net/dicts"
-license="SCOWL"
-noarch=yes
 hostmakedepends="unzip"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="SCOWL" # not in SPDX
 short_desc="American English en_US dictionary for hunspell"
+homepage="http://wordlist.aspell.net/dicts"
 distfiles="${SOURCEFORGE_SITE}/wordlist/speller/${version}/${pkgname}-${version}.zip"
-checksum=c59ae3f0a597358f7c613ada2875a8d8313a5a80496077ab7ed6a030bf1702b1
+checksum=4efdba6438b916a61c4a12933952f458564f2f2af3db9ab3c27f328b37b30ba2
 create_wrksrc=yes
+noarch=yes
 
 do_install() {
 	sed -i 's/SET UTF8/SET UTF-8/g' en_US.aff

srcpkgs/iverilog/update

@@ -1,3 +1,2 @@
 site="https://api.github.com/repos/steveicarus/$pkgname/tags"
 pattern='"name":\s*"v\K[\d_]+(?=")'
-version=${version//./_}

srcpkgs/jpegoptim/template

@@ -1,6 +1,6 @@
 # Template file for 'jpegoptim'
 pkgname=jpegoptim
-version=1.4.5
+version=1.4.6
 revision=1
 wrksrc="${pkgname}-RELEASE.${version}"
 build_style=gnu-configure
@@ -10,4 +10,4 @@ maintainer="archaeme <normandy@firemail.cc>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/tjko/jpegoptim"
 distfiles="https://github.com/tjko/jpegoptim/archive/RELEASE.${version}.tar.gz"
-checksum=53207f479f96c4f792b3187f31abf3534d69c88fe23720d0c23f5310c5d2b2f5
+checksum=c44dcfac0a113c3bec13d0fc60faf57a0f9a31f88473ccad33ecdf210b4c0c52

srcpkgs/k3b/template

@@ -1,20 +1,20 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=17.12.0
+version=17.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake"
-makedepends="ffmpeg-devel kcmutils-devel kcoreaddons-devel kfilemetadata5-devel
+makedepends="kcmutils-devel kfilemetadata5-devel knewstuff-devel
- kio-devel knewstuff-devel knotifyconfig-devel lame-devel libcddb-devel
+ knotifyconfig-devel lame-devel libXft-devel libcddb-devel libdvdread-devel
- libdvdread-devel libkcddb-devel libmad-devel libmpcdec-devel libmusicbrainz5-devel
+ libkcddb-devel libmad-devel libmpcdec-devel libmusicbrainz5-devel
- libsamplerate-devel libXft-devel qt5-devel taglib-devel"
+ libsamplerate-devel"
 short_desc="CD/DVD Kreator for Linux"
-depends="cdrtools cdrdao dvd+rw-tools"
+depends="cdrdao cdrtools dvd+rw-tools"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/k3b"
 distfiles="https://github.com/KDE/${pkgname}/archive/v${version}.tar.gz"
-checksum=dcb39dfa97dfa102242c0c93ab79949ea81297d06f6fe321a5ac45e36e5127e7
+checksum=86db1367956ff3f240caf10032c6b9d29cce67cdcbe72282830306f5fafa4f9c
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

srcpkgs/kactivities-devel

@@ -1 +0,0 @@
-kactivities

srcpkgs/kactivities/template

@@ -1,25 +0,0 @@
-# Template file for 'kactivities'
-pkgname=kactivities
-version=4.13.3
-revision=3
-build_style=cmake
-configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DWITH_NepomukCore=OFF"
-hostmakedepends="automoc4 pkg-config"
-makedepends="libressl-devel qt-devel phonon-devel kdelibs-devel"
-short_desc="KDE API for using and interacting with the Activity Manager"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="GPL, LGPL, FDL"
-homepage="https://projects.kde.org/projects/kde/kactivities"
-distfiles="http://download.kde.org/Attic/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c7cb9d023f6e5cd01d76568c3590303ea3ecb4ebe9535b31862957846f5e898a
-
-kactivities-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}

srcpkgs/kakoune/template

@@ -1,6 +1,7 @@
 # Template file for 'kakoune'
 pkgname=kakoune
-version=20180409
+reverts=20180409_1
+version=2018.04.13
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -13,4 +14,4 @@ maintainer="Jakub Skrzypnik <j.skrzypnik@openmailbox.org>"
 license="Unlicense"
 homepage="http://kakoune.org"
 distfiles="https://github.com/mawww/kakoune/releases/download/v${version}/kakoune-${version}.tar.bz2"
-checksum=ed0a2626788d0f5b906ceaa43393b0a796efeafa9f4d253138ff2c608467ade9
+checksum=cd8ccf8d833a7de8014b6d64f0c34105bc5996c3671275b00ced77996dd17fce

srcpkgs/kalarmcal-devel

@@ -0,0 +1 @@
+kalarmcal

srcpkgs/kalarmcal/template

@@ -0,0 +1,26 @@
+# Template file for 'kalarmcal'
+pkgname=kalarmcal
+version=17.12.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
+ kdoctools kdesignerplugin"
+makedepends="kidentitymanagement-devel kholidays-devel kcalcore-devel akonadi5-devel
+ kdelibs4support-devel"
+short_desc="KAlarm client library"
+maintainer="John <johnz@posteo.net>"
+license="LGPL-2.1-or-later"
+homepage="https://community.kde.org/KDE_PIM"
+distfiles="https://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=751e694451ffa0073d9e46306b6ffab5c410841fc31a0cdf524a7eaf71326f8d
+
+kalarmcal-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/kcalcore-devel

@@ -0,0 +1 @@
+kcalcore

srcpkgs/kcalcore/template

@@ -0,0 +1,28 @@
+# Template file for 'kcalcore'
+pkgname=kcalcore
+version=17.12.3
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python bison"
+makedepends="libical-devel qt5-devel"
+short_desc="The KDE calendar access library"
+maintainer="John <johnz@posteo.net>"
+license="LGPL-2.0-or-later"
+homepage="https://community.kde.org/KDE_PIM"
+distfiles="https://download.kde.org/stable/applications/${version}/src/kcalcore-${version}.tar.xz"
+checksum=7f80fcbbeea8d349327f4bba6241d348e9b159242b0686a9a97c99fb466bb888
+
+case $XBPS_TARGET_MACHINE in
+	*-musl) CFLAGS="-D_GNU_SOURCE";;
+esac
+
+kcalcore-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/qt5/mkspecs
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/kcalcore/update

@@ -0,0 +1,2 @@
+site="https://download.kde.org/stable/applications/"
+pattern='href="\K[\d\.]+(?=/")'

srcpkgs/kcalutils-devel

@@ -0,0 +1 @@
+kcalutils