diff --git a/.travis.yml b/.travis.yml index a17e00d512..2158be8ef8 100644 --- 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: diff --git a/common/shlibs b/common/shlibs index a8ce6a6133..f0eede9712 100644 --- 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 diff --git a/common/travis/build.sh b/common/travis/build.sh index 782e2facd7..bf5b437367 100755 --- 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 diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh index 89f0c2104c..fcc99a6ae2 100755 --- 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 diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index ab866ae492..25b43014ec 100644 --- 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" diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index f5adc1d6fa..a19f7e77e0 100644 --- 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 " 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 diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template index 7fff830a70..4ae89c4395 100644 --- 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 " 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" diff --git a/srcpkgs/MultiMarkdown/template b/srcpkgs/MultiMarkdown/template index a3b41ba9cb..811a0bd6fe 100644 --- 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 " 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 diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template index d4b2e94b19..d72faea08d 100644 --- 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 " -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 } diff --git a/srcpkgs/SoapyHackRF/template b/srcpkgs/SoapyHackRF/template index 58010122b9..2527e99705 100644 --- 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 " license="MIT" homepage="https://github.com/pothosware/SoapyHackRF" distfiles="${homepage}/archive/soapy-hackrf-${version}.tar.gz" -checksum=1f96103e9390f059e469b537c9f697fe998df10c78504f531408626023dc81fd +checksum=7b24a47cee42156093bf82982b4fc6184a7c86101c3b8ee450274e57ee1c4b90 post_install() { vlicense LICENSE diff --git a/srcpkgs/SoapyRTLSDR/template b/srcpkgs/SoapyRTLSDR/template index 5e86952c8b..fa021eb56b 100644 --- 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 " 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 diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index dded7cf9b4..88ea74ceff 100644 --- 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 " 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 diff --git a/srcpkgs/acr/template b/srcpkgs/acr/template index 1e05b1aa8d..11fab37b8b 100644 --- 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 " -license="GPL-3" -homepage="http://radare.org" -distfiles="${homepage}/get/acr-${version}.tar.gz" -checksum=b44c083ce988c62f9ac929784e1de69db01ec56b9e71ea9fcc5bed93f88052c6 +maintainer="criw " +license="GPL-2.0-or-later" +homepage="https://github.com/radare/acr" +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=12b2f5ceb4da4507fba5242fe5596b8e25916478709f1d6189cbc016b01e6661 diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template index f71bae7a23..36e164fc1b 100644 --- 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 " license="Apache-2.0" homepage="https://github.com/jwilm/alacritty" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=1d697f08bb4a63142d6ca36b2eaef0ce92cbd13eb029b1a393fcca691237bd1c +checksum=91d9f6b01770fa3e9ac4da306bbe95eae56819f13cc77668d7dd1ed2874b60b5 nocross=yes diff --git a/srcpkgs/annie/template b/srcpkgs/annie/template index 9c55514b19..9da84e693d 100644 --- 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 " 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 diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template index 0da8e5ba64..be51be0171 100644 --- 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 diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index ff35d8e58c..25e1a2fa2c 100644 --- 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 " +maintainer="Enno Boland " 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}" diff --git a/srcpkgs/barrier-gui b/srcpkgs/barrier-gui new file mode 120000 index 0000000000..cea14745a4 --- /dev/null +++ b/srcpkgs/barrier-gui @@ -0,0 +1 @@ +barrier \ No newline at end of file diff --git a/srcpkgs/barrier/files/barrierc/run b/srcpkgs/barrier/files/barrierc/run new file mode 100755 index 0000000000..f57a57edaf --- /dev/null +++ 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 diff --git a/srcpkgs/barrier/files/barriers/run b/srcpkgs/barrier/files/barriers/run new file mode 100755 index 0000000000..c59b48edf9 --- /dev/null +++ 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} diff --git a/srcpkgs/barrier/patches/avahi.patch b/srcpkgs/barrier/patches/avahi.patch new file mode 100644 index 0000000000..fe5704552f --- /dev/null +++ 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") diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template new file mode 100644 index 0000000000..d165a70516 --- /dev/null +++ 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 " +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 + } +} diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template index adbf6f9aeb..b85137515e 100644 --- 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 " 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 - diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template index 8d3bb98c3e..61a2718970 100644 --- 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 " 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() { diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index bce73c6187..bd9acdde2e 100644 --- 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 " 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 diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template index 74e1e23994..34031c7268 100644 --- 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 " 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 diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template index 0b5e22424e..5dcf54d4ab 100644 --- 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 " 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" } -} \ No newline at end of file +} diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template index 3751d059b4..0ee7586ee0 100644 --- 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 " 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 \ diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template index 140a2bce66..29e963015c 100644 --- 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" diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 549dfa02ca..f22a60b0a1 100644 --- 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 " 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/" diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template index 183d8c31ed..bd1190d4b2 100644 --- 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 " -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 diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template index f744579ba3..1dc10037e3 100644 --- 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 " 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() { diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index cfa6f4d1c2..9c3656aaa8 100644 --- 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 " -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 } diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 4b2774824d..1eb4610c3a 100644 --- 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 " 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 diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template index 679e497765..bde3cbc5b7 100644 --- 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 " 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 diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template index 100c56ada4..87dddba1b7 100644 --- 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 " 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 } } diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 07de4f599f..f4ae6a77b1 100644 --- 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 " -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 diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index ceea8f55a0..7e8c6c1043 100644 --- 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() { diff --git a/srcpkgs/desktop-file-utils/template b/srcpkgs/desktop-file-utils/template index f65bad5cfd..183600878f 100644 --- 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" diff --git a/srcpkgs/disorderfs/template b/srcpkgs/disorderfs/template index f812188009..702620b5a0 100644 --- 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 " 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() { diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template index 58f9ba69ac..bb2f02503d 100644 --- 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" diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template index 41db30aeeb..31ef8a8d30 100644 --- 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 " -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 diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch new file mode 100644 index 0000000000..fe770eda69 --- /dev/null +++ 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 \ diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index eabe4618cc..6854e9df64 100644 --- 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" diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template index f4c3ef0bee..adf54f2c14 100644 --- 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 " license="EPL" diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index ffae90dc65..1687770ad9 100644 --- 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 " 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 diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template index 6b8deea5fa..c1dd11cb77 100644 --- 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 " +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 diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 30d3776f6e..8f36b6c0b5 100644 --- 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 diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index 529efb7bf3..1e9e3947d2 100644 --- 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 diff --git a/srcpkgs/filelight/patches/musl.patch b/srcpkgs/filelight/patches/musl.patch new file mode 100644 index 0000000000..7c0252b649 --- /dev/null +++ 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 + +-#if !defined(__GLIBC__) || (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) ++#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) + + #include + +--- 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 + #elif !defined(Q_OS_WIN) ++#ifdef __GLIBC__ + #include + #endif ++#endif + #include + #include + #include +--- 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 +- +-#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) +- +-#include +- +-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 diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template index 760c792b2a..946c8c28f4 100644 --- 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 diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 3561e56f69..30464a6e19 100644 --- 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 diff --git a/srcpkgs/fmit/template b/srcpkgs/fmit/template index 24a621be10..4805706550 100644 --- 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 " short_desc="Graphical utility for tuning your musical instruments" +maintainer="cr6git " 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" diff --git a/srcpkgs/font-hanazono/template b/srcpkgs/font-hanazono/template index 775d45dcc3..7da5f57737 100644 --- 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 " 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 diff --git a/srcpkgs/font-hanazono/update b/srcpkgs/font-hanazono/update new file mode 100644 index 0000000000..05a274a350 --- /dev/null +++ b/srcpkgs/font-hanazono/update @@ -0,0 +1,2 @@ +pkgname=hanazono +site="https://ja.osdn.net/projects/hanazono-font/releases/rss" diff --git a/srcpkgs/freeipmi/template b/srcpkgs/freeipmi/template index 09a477602c..41743f7ae7 100644 --- 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 " +maintainer="Toyam Cox " 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 } diff --git a/srcpkgs/garden/template b/srcpkgs/garden/template index c94f38ac8e..80fd94cab5 100644 --- 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 " short_desc="Old school 2D vertical shoot-em-up with some innovative elements" +maintainer="cr6git " +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 diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template index 552b34f2e0..cd1a451e10 100644 --- 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 " diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index ba6c36feb4..988d66bf12 100644 --- 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 " 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 diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template index 7f25715220..57fb9e815f 100644 --- 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 " +maintainer="Enno Boland " 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" } } diff --git a/srcpkgs/gimp/patches/fix-cross.patch b/srcpkgs/gimp/patches/fix-cross.patch new file mode 100644 index 0000000000..f34a548403 --- /dev/null +++ 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) \ diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index 7fdfac0ac7..ce4c0e8349 100644 --- 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 " +maintainer="Kartik S " +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 diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template index 83b68d59f5..5c0e33cbaa 100644 --- 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 " @@ -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" diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index efcc13ad65..949abc594b 100644 --- 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" diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template index 8502e24ec2..ec92a8ed32 100644 --- 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 " -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 } diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 4c691ef4f4..4865c8bcc7 100644 --- 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} } diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template index c966126458..b303784971 100644 --- 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 " -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 } diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 6f1b52a43f..c442b242c2 100644 --- 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 " 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 diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template index fa9eb1afa2..5058b4fc91 100644 --- 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" diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 8dd35dce27..2797514e21 100644 --- 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" diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template index bf4800dcc5..78ed74107f 100644 --- 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 diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template index 005fd823b1..0e3e154a65 100644 --- 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" diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index 1ac6d5bcb0..f660ace158 100644 --- 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 " diff --git a/srcpkgs/googler/template b/srcpkgs/googler/template index 33c2fe066c..1f7b0f03af 100644 --- 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 " -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() { diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index 4e81e01440..3406051c97 100644 --- 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 " 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() { diff --git a/srcpkgs/graphviz/update b/srcpkgs/graphviz/update index 655477750d..0299a507c3 100644 --- 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)' diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template index 4642767457..830a899626 100644 --- 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 " 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() { diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index ad86cdd784..57888bed6b 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,6 +1,6 @@ # Template file for 'gst-libav' pkgname=gst-libav -version=1.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 " -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 diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template index 634c49dd33..e50ef981da 100644 --- 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 " -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*) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index f344b2d3ff..bd45937971 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 -version=1.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 " -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 diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index 74cb0811f6..21eeb8baec 100644 --- 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 " +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";; diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 91e888cd6b..e2411320ea 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-good1'. pkgname=gst-plugins-good1 -version=1.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 " +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 diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 1d85a6ea16..174dc9828c 100644 --- 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 " -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 diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index 74635c5f86..a2e7bf89c5 100644 --- 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 " -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" diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template index 44a4cc6f04..1b3b4f3273 100644 --- 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 " -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 diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template index a31d440a85..64eadbf432 100644 --- 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 " -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 diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template index bf21aeec97..bc402edc4d 100644 --- 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 " -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 diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index fa507bb4a5..1cb4915d47 100644 --- 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 " 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" diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template index 504e83316b..af330dee9f 100644 --- 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" diff --git a/srcpkgs/hdf5/template b/srcpkgs/hdf5/template index 39883b2f6d..936da63eb4 100644 --- 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 " -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() { diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template index c0221ff0a9..3f8206c54d 100644 --- 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 " -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() { diff --git a/srcpkgs/hedgewars/update b/srcpkgs/hedgewars/update new file mode 100644 index 0000000000..937d41b2a7 --- /dev/null +++ b/srcpkgs/hedgewars/update @@ -0,0 +1 @@ +site='http://www.hedgewars.org/download.html' diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template index ea48d9edb2..352a47e249 100644 --- 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 " 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 diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index a8679e45f4..0a25e432fa 100644 --- 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 " 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" diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template index 197f23ab1e..ab54fb5e1f 100644 --- 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 " 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 diff --git a/srcpkgs/ifupdown/template b/srcpkgs/ifupdown/template index 2ac9828909..a4abe4b52b 100644 --- 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 " 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 diff --git a/srcpkgs/imagewriter/patches/musl.patch b/srcpkgs/imagewriter/patches/musl.patch new file mode 100644 index 0000000000..2ea8e2a002 --- /dev/null +++ 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 + #include +-#include ++#include + + #ifdef USEUDISKS2 + #include "udisks2_interface.h" diff --git a/srcpkgs/imagewriter/template b/srcpkgs/imagewriter/template new file mode 100644 index 0000000000..a72de44e28 --- /dev/null +++ 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 " +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 + diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template index 697dce9088..8fadf5fc9b 100644 --- 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 " 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" diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template index 30bf85ed2f..655743ebab 100644 --- 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 " license="NCSA" homepage="https://iperf.fr/" distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz" -checksum=7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2 +checksum=b7d650d07c6bb0e357b5938a20e4ac33876012fddb952299c5d321e6958da5d2 post_install() { vlicense COPYING LICENSE diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template index 4a028e678b..8296967be8 100644 --- a/srcpkgs/jgmenu/template +++ b/srcpkgs/jgmenu/template @@ -1,7 +1,7 @@ # Template file for 'jgmenu' pkgname=jgmenu -version=0.8.2 -revision=2 +version=0.9 +revision=1 build_style=gnu-makefile make_use_env=yes make_install_args="prefix=/usr" @@ -10,7 +10,7 @@ makedepends="librsvg-devel libXinerama-devel libxml2-devel menu-cache-devel pang depends="desktop-file-utils python3" short_desc="Small X11 menu intended to be used with openbox and tint2" maintainer="cr6git " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://www.github.com/johanmalm/jgmenu" distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz" -checksum=d019b6eae72b34e41afc2ca3220d139e8329cf2c1aefac77826cec33b5a9ad37 +checksum=2095de1d0bceadba5a5e6e002626a936a95b0f08c4f3397f943d161cf606b3bb diff --git a/srcpkgs/kbdd/template b/srcpkgs/kbdd/template index 539054c3dd..675c192fec 100644 --- a/srcpkgs/kbdd/template +++ b/srcpkgs/kbdd/template @@ -3,16 +3,22 @@ pkgname=kbdd version=0.7.1 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config libtool automake dbus-glib-devel glib-devel" -makedepends="libX11-devel dbus-glib-devel glib-devel" -depends="libX11" +build_options="dbus" +build_options_default="dbus" +configure_args="--enable-dbus=$(vopt_if dbus yes no)" +hostmakedepends="automake libtool pkg-config" +makedepends="libX11-devel glib-devel $(vopt_if dbus dbus-glib-devel)" short_desc="Simple daemon and library to make per window layout using XKB" maintainer="SolitudeSF " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/qnikst/kbdd" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=17b3ee6054e86f9d54e70023582061f287a14a96bd8841a99b61921f3a3b165a +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" glib-devel $(vopt_if dbus dbus-glib-devel)" +fi + pre_configure() { libtoolize --force aclocal diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template index 6476c91f6d..a14ba20763 100644 --- a/srcpkgs/kdeconnect/template +++ b/srcpkgs/kdeconnect/template @@ -1,16 +1,17 @@ # Template file for 'kdeconnect' pkgname=kdeconnect -version=1.2 +version=1.3 revision=1 wrksrc=kdeconnect-kde-${version} -#create_wrksrc=yes build_style=cmake -hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config" -makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel qt5-declarative-devel libfakekey-devel " +hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config + qt5-qmake python3 kdoctools" +makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel + qt5-declarative-devel libfakekey-devel kwayland-devel" depends="kde-cli-tools qca-qt5-ossl" short_desc="A multi-platform app that allows your devices to communicate" maintainer="Yuxuan Shui " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/KDE/kdeconnect-kde" distfiles="https://github.com/KDE/kdeconnect-kde/archive/v${version}.tar.gz" -checksum=09ce31ef8b91751dca4708b94a7bf0aa74c5b4f0935dafb2d1b97b1749cca78a +checksum=8a3fbac56093cf8038604aa5735b787d92da02c26a2e02249ea47c1849790525 diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template index af813a4299..68c72be66b 100644 --- a/srcpkgs/khal/template +++ b/srcpkgs/khal/template @@ -1,20 +1,19 @@ # Template file for 'khal' pkgname=khal -version=0.9.8 +version=0.9.9 revision=1 noarch=yes build_style=python3-module pycompile_module="khal" hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-click python3-configobj - python3-dateutil python3-icalendar python3-pytz python3-tzlocal - python3-urwid python3-xdg python3-atomicwrites" +depends="python3-atomicwrites python3-click python3-configobj python3-icalendar + python3-setuptools python3-tzlocal python3-urwid python3-xdg" short_desc="Command-line calendar build around CalDAV" maintainer="Oliver Kiddle " license="MIT" homepage="http://lostpackets.de/khal/" distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz" -checksum=fe049e1ed3238461c108f7ef4abba09f46130f77f0e2b80418529f6dfb1b9dae +checksum=50e7c40028c37d4ec76a3ef80e99af5f837ad6857590e76cc64ee29b16560937 pre_build() { sed -i setup.py \ diff --git a/srcpkgs/kitty-terminfo b/srcpkgs/kitty-terminfo new file mode 120000 index 0000000000..659fb6b426 --- /dev/null +++ b/srcpkgs/kitty-terminfo @@ -0,0 +1 @@ +kitty \ No newline at end of file diff --git a/srcpkgs/kitty/patches/comparison.patch b/srcpkgs/kitty/patches/comparison.patch new file mode 100644 index 0000000000..9251655c1b --- /dev/null +++ b/srcpkgs/kitty/patches/comparison.patch @@ -0,0 +1,11 @@ +--- kitty/keys.c 2018-05-05 06:33:02.268283599 -0700 ++++ kitty/keys.c 2018-05-05 06:32:45.995284267 -0700 +@@ -77,7 +77,7 @@ + } + + static inline bool +-is_ascii_control_char(char c) { ++is_ascii_control_char(signed char c) { + return c == 0 || (1 <= c && c <= 31) || c == 127; + } + diff --git a/srcpkgs/kitty/patches/python-compile-workers.patch b/srcpkgs/kitty/patches/python-compile-workers.patch new file mode 100644 index 0000000000..7c09927032 --- /dev/null +++ b/srcpkgs/kitty/patches/python-compile-workers.patch @@ -0,0 +1,11 @@ +--- setup.py 2018-05-04 21:16:28.000000000 -0700 ++++ setup.py 2018-05-05 06:30:39.111289470 -0700 +@@ -559,7 +559,7 @@ + shutil.copytree('kitty', os.path.join(libdir, 'kitty'), ignore=src_ignore) + shutil.copytree('kittens', os.path.join(libdir, 'kittens'), ignore=src_ignore) + import compileall +- compileall.compile_dir(libdir, quiet=1, workers=4) ++ compileall.compile_dir(libdir, quiet=1, workers=1) + for root, dirs, files in os.walk(libdir): + for f in files: + path = os.path.join(root, f) diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template new file mode 100644 index 0000000000..f6d7d7bf71 --- /dev/null +++ b/srcpkgs/kitty/template @@ -0,0 +1,41 @@ +# Template file for 'kitty' +pkgname=kitty +version=0.10.1 +revision=1 +python_version=3 +hostmakedepends="ncurses pkg-config python3-devel wayland-devel wayland-protocols" +makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel + python3-devel wayland-devel wayland-protocols" +depends="kitty-terminfo" +conf_files="/etc/kitty/kitty.conf" +short_desc="Modern, hackable, featureful, OpenGL based terminal emulator" +maintainer="Julio Galvan " +license="GPL-3.0-or-later" +homepage="https://github.com/kovidgoyal/kitty" +distfiles="https://github.com/kovidgoyal/kitty/archive/v${version}.tar.gz" +checksum=ef22208497a76e2f88ebe56c176e4608f049b056252cf1bf122c9c1ec711cfa6 + +do_build() { + if [ -n "$CROSS_BUILD" ]; then + export CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python3.6m" + sed -i "s|-fpie|-fpie ${CFLAGS}|g" setup.py + fi + case "$XBPS_TARGET_MACHINE" in + *-musl) + sed -i 's/pow10/pow_10/g' kitty/parser.c;; + esac + python3 setup.py linux-package --prefix=${DESTDIR}/usr --verbose +} + +do_install() { + vmkdir etc/kitty + cp ${DESTDIR}/usr/lib/kitty/kitty/kitty.conf ${DESTDIR}/etc/kitty/ +} + +kitty-terminfo_package() { + short_desc+=" - terminfo data" + noarch=yes + pkg_install() { + vmove usr/share/terminfo + } +} diff --git a/srcpkgs/kubectl b/srcpkgs/kubectl new file mode 120000 index 0000000000..581eb68ee1 --- /dev/null +++ b/srcpkgs/kubectl @@ -0,0 +1 @@ +kubernetes/ \ No newline at end of file diff --git a/srcpkgs/kubernetes/kubectl.INSTALL.msg b/srcpkgs/kubernetes/kubectl.INSTALL.msg new file mode 100644 index 0000000000..4e22b6215e --- /dev/null +++ b/srcpkgs/kubernetes/kubectl.INSTALL.msg @@ -0,0 +1,4 @@ +For bash completions, install the 'bash-completion' package. +For zsh completions, put the following code in your ~/.zshrc: + + source /usr/share/kubectl/completion.zsh diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index ecae5613d9..92d71879e0 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,24 +1,32 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.10.2 +version=1.10.3 revision=2 build_style=go nocross=yes only_for_archs="x86_64 x86_64-musl" hostmakedepends="rsync git go-bindata" +depends="kubectl" short_desc="Container Cluster Manager for Docker" maintainer="Andrea Brancaleoni " license="Apache-2.0" go_import_path="github.com/kubernetes/kubernetes" homepage="http://kubernetes.io" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=41df701cfb19c3f308f3066203c7f8225d509aa895ca4103564ccc957b391c6b +checksum=f3750b19d6d7471ea33230f96a420c53df46d8a060a4f14722992c5c7bdd9055 system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" do_build() { make + hack/generate-docs.sh + find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line + do + $line completion bash > completion.bash + $line completion zsh > completion.zsh + break + done } do_install() { @@ -42,3 +50,14 @@ do_install() { vlicense LICENSE } + +kubectl_package() { + short_desc="Controls the Kubernetes cluster manager" + pkg_install() { + vmove usr/bin/kubectl + vmove usr/share/man/man1/kubectl* + vinstall completion.bash 644 usr/share/bash-completion/completions kubectl + vinstall completion.zsh 644 usr/share/kubectl + vlicense LICENSE + } +} diff --git a/srcpkgs/libbsd/patches/musl.patch b/srcpkgs/libbsd/patches/musl.patch index f6436c0f70..a82343d83d 100644 --- a/srcpkgs/libbsd/patches/musl.patch +++ b/srcpkgs/libbsd/patches/musl.patch @@ -1,22 +1,14 @@ ---- include/bsd/string.h 2017-08-05 13:20:54.000000000 +0200 -+++ include/bsd/string.h 2018-02-24 12:07:30.705680366 +0100 -@@ -42,7 +42,7 @@ - char *strnstr(const char *str, const char *find, size_t str_len); - void strmode(mode_t mode, char *str); +Source: maxice8 +Upstream: no +Reason: fixes compilation + +--- src/flopen.c ++++ src/flopen.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) -+#if defined(_GNU_SOURCE) - void explicit_bzero(void *buf, size_t len); - #endif - __END_DECLS ---- include/bsd/stdlib.h 2017-08-05 13:20:00.000000000 +0200 -+++ include/bsd/stdlib.h 2018-02-24 12:09:25.072688523 +0100 -@@ -67,7 +67,7 @@ - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if defined(_GNU_SOURCE) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif + #include diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template index 9045c7b3f5..c7069f8abf 100644 --- a/srcpkgs/libbsd/template +++ b/srcpkgs/libbsd/template @@ -1,15 +1,15 @@ # Template file for 'libbsd' pkgname=libbsd -version=0.8.7 +version=0.9.1 revision=1 build_style=gnu-configure makedepends="libressl-devel" short_desc="Provides useful functions commonly found on BSD system" maintainer="Juan RP " -homepage="http://libbsd.freedesktop.org/" -license="BSD" -distfiles="http://libbsd.freedesktop.org/releases/libbsd-${version}.tar.xz" -checksum=f548f10e5af5a08b1e22889ce84315b1ebe41505b015c9596bad03fd13a12b31 +license="BSD-3-Clause" +homepage="https://libbsd.freedesktop.org/" +distfiles="https://libbsd.freedesktop.org/releases/libbsd-${version}.tar.xz" +checksum=56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4 post_install() { vlicense COPYING diff --git a/srcpkgs/libcprops/patches/musl.patch b/srcpkgs/libcprops/patches/musl.patch new file mode 100644 index 0000000000..0ff6e0fb20 --- /dev/null +++ b/srcpkgs/libcprops/patches/musl.patch @@ -0,0 +1,20 @@ +--- util.c.orig 2012-01-13 23:25:58.000000000 +0100 ++++ util.c 2018-05-26 20:14:12.290726591 +0200 +@@ -386,7 +386,7 @@ + msg = "Invalid back reference to a subexpression."; + break; + +-#ifdef linux ++#ifdef __GLIBC__ + case REG_EEND: + msg = "Non specific error."; + break; +@@ -400,7 +400,7 @@ + msg = "Invalid use of pattern operators such as group or list."; + break; + +-#ifdef linux ++#ifdef __GLIBC__ + case REG_ESIZE: + msg = "Compiled regular expression requires a pattern buffer larger than 64Kb."; + break; diff --git a/srcpkgs/libcprops/template b/srcpkgs/libcprops/template index 964d1b4eaa..cb4705ca05 100644 --- a/srcpkgs/libcprops/template +++ b/srcpkgs/libcprops/template @@ -4,7 +4,7 @@ version=0.1.12 revision=2 build_style=gnu-configure configure_args="--disable-cpsp --disable-cpsvc" -hostmakedepends="which flex makedepend" +hostmakedepends="flex makedepend" short_desc="C prototyping tools" maintainer="Juan RP " homepage="http://cprops.sourceforge.net/" diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 78fcffff5e..58215bdf12 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,6 +1,6 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.28.1 +version=3.28.2 revision=1 configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false) -Dwith_introspection=$(vopt_if gir true false)" @@ -13,7 +13,7 @@ maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz" -checksum=627cdbd1fda815ad8308f8a01ba9a23d4a8fd11cc783e40d6eadbffba2bc4912 +checksum=56519e13bd14b7f3280cc404d7ada924b5195990a9e4bb4843392c2eb1b7ddcd build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template index 0a9551572a..dfc5081d84 100644 --- a/srcpkgs/libdwarf/template +++ b/srcpkgs/libdwarf/template @@ -1,20 +1,20 @@ -# Template build file for 'libdwarf' +# Template file for 'libdwarf' pkgname=libdwarf -version=20180129 +version=20180527 revision=1 +wrksrc="dwarf-${version}" +build_wrksrc=libdwarf build_style=gnu-configure configure_args="--prefix=/usr --enable-shared" +makedepends="elfutils-devel" short_desc="DWARF Debugging Information Format Library" maintainer="John Regan " -license="GPL-2, LGPL-2.1" -makedepends="elfutils-devel" +license="LGPL-2.1-only" homepage="http://www.prevanders.net/dwarf.html" distfiles="http://prevanders.net/${pkgname}-${version}.tar.gz" -checksum=8bd91b57064b0c14ade5a009d3a1ce819f1b6ec0e189fc876eb8f42a8720d8a6 -wrksrc="dwarf-${version}" -build_wrksrc="libdwarf" +checksum=47e014211f3cfef54a78e8f6dea0b211c4825724871361adf39d9706eb9b0f1f -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then make_cmd="make HOSTCC=cc HOSTCFLAGS=-I./ HOSTLDFLAGS=" pre_build() { diff --git a/srcpkgs/libedit/patches/musl.patch b/srcpkgs/libedit/patches/musl.patch deleted file mode 100644 index 0357ad208f..0000000000 --- a/srcpkgs/libedit/patches/musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/chartype.h.orig 2016-06-21 07:40:21.355084769 +0200 -+++ src/chartype.h 2016-06-21 07:40:54.315758800 +0200 -@@ -33,7 +33,7 @@ - * supports non-BMP code points without requiring UTF-16, but nothing - * seems to actually advertise this properly, despite Unicode 3.1 having - * been around since 2001... */ --#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) -+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && (defined(__linux__) && defined(__GLIBC__)) - #ifndef __STDC_ISO_10646__ - /* In many places it is assumed that the first 127 code points are ASCII - * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template index f4eca4b03d..e787226ddb 100644 --- a/srcpkgs/libedit/template +++ b/srcpkgs/libedit/template @@ -1,18 +1,18 @@ # Template file for 'libedit' pkgname=libedit -_datever=20170329 +_datever=20180525 _distver=3.1 version=${_datever}.${_distver} -revision=2 +revision=1 wrksrc="${pkgname}-${_datever}-${_distver}" build_style=gnu-configure makedepends="ncurses-devel" short_desc="Port of the NetBSD Command Line Editor Library" maintainer="Juan RP " -license="2-clause-BSD" +license="BSD-2-Clause" homepage="http://www.thrysoee.dk/editline/" distfiles="http://www.thrysoee.dk/editline/libedit-${_datever}-${_distver}.tar.gz" -checksum=91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be +checksum=c41bea8fd140fb57ba67a98ec1d8ae0b8ffa82f4aba9c35a87e5a9499e653116 post_install() { vlicense COPYING diff --git a/srcpkgs/libepoxy/template b/srcpkgs/libepoxy/template index e4de297cc0..49dc650adc 100644 --- a/srcpkgs/libepoxy/template +++ b/srcpkgs/libepoxy/template @@ -1,6 +1,6 @@ # Template file for 'libepoxy' pkgname=libepoxy -version=1.5.1 +version=1.5.2 revision=1 build_style=meson hostmakedepends="pkg-config python xorg-util-macros" @@ -9,8 +9,9 @@ short_desc="Library for handling OpenGL function pointer management for you" maintainer="Juan RP " license="MIT" homepage="https://github.com/anholt/libepoxy" +#changelog="https://github.com/anholt/libepoxy/releases" distfiles="https://github.com/anholt/libepoxy/archive/${version}.tar.gz" -checksum=f53a35db484341c0a77f1bb0eb04cc9389e3049d2437bcf5915a1cebd2c04ff7 +checksum=1ffc3ffe0567f986ff5731d4ef3a3765e0a4f9d642fffdae303362567eecd689 case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" -Dhas-dlvsym=false" ;; diff --git a/srcpkgs/libfcitx-qt5/template b/srcpkgs/libfcitx-qt5/template index 43a529ce22..3b9e9e99c4 100644 --- a/srcpkgs/libfcitx-qt5/template +++ b/srcpkgs/libfcitx-qt5/template @@ -1,20 +1,19 @@ # Template file for 'libfcitx-qt5' pkgname=libfcitx-qt5 -version=1.2.2 +version=1.2.3 revision=1 +wrksrc="fcitx-qt5-${version}" build_style=cmake +hostmakedepends="extra-cmake-modules pkg-config" +makedepends="fcitx-devel libxkbcommon-devel qt5-devel" short_desc="Flexible Context-aware Input Tool with eXtension - Qt5 IM module" maintainer="Robert La Spina " -license="GPL-2, LGPL-2.1" +license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://fcitx-im.org/" distfiles="http://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-${version}.tar.xz" -checksum=24599e7789c7fd6edc0fa246d2f4b216e9b4b223112c1d40597fbb764a0bc3b4 -hostmakedepends="pkg-config extra-cmake-modules" -makedepends="libxkbcommon-devel qt5-devel fcitx-devel" +checksum=fef09d3f5a7e6b4860169290c0cfe731a9039793ebbf43f6d823fcb920c3dfa5 -wrksrc="fcitx-qt5-${version}" - -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools libfcitx" fi @@ -23,7 +22,7 @@ libfcitx-qt5-devel_package() { depends="${sourcepkg}-${version}_${revision} ${makedepends}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/lib/cmake } } diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index cf816ec459..7ab8f4a732 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,6 +1,6 @@ # Template file for 'libguestfs' pkgname=libguestfs -version=1.39.4 +version=1.39.5 revision=1 _version_short=${version%.*} build_style=gnu-configure @@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://libguestfs.org" distfiles="http://libguestfs.org/download/$_version_short-development/$pkgname-$version.tar.gz" -checksum=a4cce82dcc3f373a154134f52a79d5ff5c9c38caa319b809db59b3db3ac60530 +checksum=84fe4045fb0e2bbddb9646313b86cf0271c3b92daa4aa955c61f07d1c9c17401 conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf diff --git a/srcpkgs/libpqxx/template b/srcpkgs/libpqxx/template index be6c9ecc06..44f6cee8b4 100644 --- a/srcpkgs/libpqxx/template +++ b/srcpkgs/libpqxx/template @@ -1,6 +1,6 @@ # Template file for 'libpqxx' pkgname=libpqxx -version=6.2.2 +version=6.2.3 revision=1 build_style=gnu-configure configure_args="--enable-shared --disable-documentation" @@ -9,9 +9,10 @@ makedepends="postgresql-libs-devel" short_desc="C++ connector for PostgreSQL" maintainer="John Regan " license="BSD-3-Clause" +#changelog="https://raw.githubusercontent.com/jtv/libpqxx/master/NEWS" homepage="http://pqxx.org/development/libpqxx" distfiles="https://github.com/jtv/${pkgname}/archive/${version}.tar.gz" -checksum=610985bd0eba744ec3b425e24d8a003221df6c8d8bf4aac9f7da0390a3a97b6b +checksum=382b88992c6162c9814388cc8575eb774ffad03d49743a5d9576aa3bffc91dfa post_install() { vlicense COPYING @@ -23,7 +24,7 @@ libpqxx-devel_package() { pkg_install() { vmove usr/bin/pqxx-config vmove usr/include - vmove usr/lib/*.a + vmove "usr/lib/*.a" vmove usr/lib/libpqxx.so vmove usr/lib/pkgconfig } diff --git a/srcpkgs/libpurple-skypeweb/template b/srcpkgs/libpurple-skypeweb/template index 4bf94391f2..c19d338b7a 100644 --- a/srcpkgs/libpurple-skypeweb/template +++ b/srcpkgs/libpurple-skypeweb/template @@ -1,16 +1,15 @@ # Template file for 'libpurple-skypeweb' - -pkgname="libpurple-skypeweb" -version=1.4 +pkgname=libpurple-skypeweb +version=1.5 revision=1 +wrksrc="skype4pidgin-${version}" +build_wrksrc=skypeweb build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="libpurple-devel json-glib-devel" short_desc="A Skype plugin for libpurple - uses the Skype Web API" maintainer="John Regan " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/EionRobb/skype4pidgin" distfiles="https://github.com/EionRobb/skype4pidgin/archive/${version}.tar.gz" -checksum=026962ed818df7f2e54409d78e0d6f1fb64c2ef4f4264a489d2c04c2bae0da82 -wrksrc="skype4pidgin-${version}" -build_wrksrc="skypeweb" +checksum=bb5fc550bff8f66f90a9ffacfc6bc2ed50fee86f4f500942aebc315d073f6e9d diff --git a/srcpkgs/libunistring/template b/srcpkgs/libunistring/template index ff8558896a..226b96a0de 100644 --- a/srcpkgs/libunistring/template +++ b/srcpkgs/libunistring/template @@ -1,14 +1,14 @@ -# Template build file for 'libunistring'. +# Template file for 'libunistring' pkgname=libunistring -version=0.9.9 +version=0.9.10 revision=1 build_style=gnu-configure short_desc="Library for manipulating Unicode strings and C strings" maintainer="Juan RP " -license="LGPL-3" -homepage="http://www.gnu.org/software/${pkgname}" +license="LGPL-3.0-or-later" +homepage="https://www.gnu.org/software/libunistring" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=f5e90c08f9e5427ca3a2c0c53f19aa38b25c500913510ad25afef86448bea84a +checksum=a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b libunistring-devel_package() { short_desc+=" - development files)" diff --git a/srcpkgs/linux4.16/files/arm-dotconfig b/srcpkgs/linux4.16/files/arm-dotconfig index 770cb26d26..a676cf7793 100644 --- a/srcpkgs/linux4.16/files/arm-dotconfig +++ b/srcpkgs/linux4.16/files/arm-dotconfig @@ -1791,7 +1791,7 @@ CONFIG_DS1682=m CONFIG_SRAM=y CONFIG_SRAM_EXEC=y # CONFIG_PCI_ENDPOINT_TEST is not set -# CONFIG_MISC_RTSX is not set +CONFIG_MISC_RTSX=m CONFIG_C2PORT=m # @@ -1856,8 +1856,8 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_LIB is not set # CONFIG_OCXL_BASE is not set -# CONFIG_MISC_RTSX_PCI is not set -# CONFIG_MISC_RTSX_USB is not set +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -5083,6 +5083,8 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m # CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_CQHCI=m # CONFIG_MMC_TOSHIBA_PCI is not set CONFIG_MMC_MTK=m @@ -5104,6 +5106,8 @@ CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m diff --git a/srcpkgs/linux4.16/files/arm64-dotconfig b/srcpkgs/linux4.16/files/arm64-dotconfig index 75bd1d2381..d669e37bc0 100644 --- a/srcpkgs/linux4.16/files/arm64-dotconfig +++ b/srcpkgs/linux4.16/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.16.0-rc6 Kernel Configuration +# Linux/arm64 4.16.10 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -568,6 +568,7 @@ CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_1024718=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -1944,7 +1945,7 @@ CONFIG_SENSORS_APDS990X=m CONFIG_SRAM=y CONFIG_VEXPRESS_SYSCFG=y # CONFIG_PCI_ENDPOINT_TEST is not set -# CONFIG_MISC_RTSX is not set +CONFIG_MISC_RTSX=m # CONFIG_C2PORT is not set # @@ -2009,8 +2010,8 @@ CONFIG_ECHO=m # CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_LIB is not set # CONFIG_OCXL_BASE is not set -# CONFIG_MISC_RTSX_PCI is not set -# CONFIG_MISC_RTSX_USB is not set +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m # # SCSI device support @@ -6086,6 +6087,8 @@ CONFIG_MMC_DW_PCI=y CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m # CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_SUNXI=y CONFIG_MMC_CQHCI=y CONFIG_MMC_TOSHIBA_PCI=y @@ -6110,6 +6113,8 @@ CONFIG_MSPRO_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m diff --git a/srcpkgs/linux4.16/files/i386-dotconfig b/srcpkgs/linux4.16/files/i386-dotconfig index d9dc5bd0c7..9752350c66 100644 --- a/srcpkgs/linux4.16/files/i386-dotconfig +++ b/srcpkgs/linux4.16/files/i386-dotconfig @@ -1985,7 +1985,7 @@ CONFIG_USB_SWITCH_FSA9480=m CONFIG_LATTICE_ECP3_CONFIG=m CONFIG_SRAM=y # CONFIG_PCI_ENDPOINT_TEST is not set -# CONFIG_MISC_RTSX is not set +CONFIG_MISC_RTSX=m CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -2055,8 +2055,8 @@ CONFIG_ECHO=m # CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_LIB is not set # CONFIG_OCXL_BASE is not set -# CONFIG_MISC_RTSX_PCI is not set -# CONFIG_MISC_RTSX_USB is not set +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -6253,6 +6253,8 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m # CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_CQHCI=m CONFIG_MMC_TOSHIBA_PCI=m CONFIG_MMC_MTK=m @@ -6273,6 +6275,8 @@ CONFIG_MS_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m diff --git a/srcpkgs/linux4.16/files/x86_64-dotconfig b/srcpkgs/linux4.16/files/x86_64-dotconfig index 7d20004a57..5c381e6e45 100644 --- a/srcpkgs/linux4.16/files/x86_64-dotconfig +++ b/srcpkgs/linux4.16/files/x86_64-dotconfig @@ -2019,7 +2019,7 @@ CONFIG_USB_SWITCH_FSA9480=m CONFIG_LATTICE_ECP3_CONFIG=m CONFIG_SRAM=y # CONFIG_PCI_ENDPOINT_TEST is not set -# CONFIG_MISC_RTSX is not set +CONFIG_MISC_RTSX=m CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -2097,8 +2097,8 @@ CONFIG_ECHO=m # CONFIG_CXL_AFU_DRIVER_OPS is not set # CONFIG_CXL_LIB is not set # CONFIG_OCXL_BASE is not set -# CONFIG_MISC_RTSX_PCI is not set -# CONFIG_MISC_RTSX_USB is not set +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -5173,7 +5173,7 @@ CONFIG_DRM_AMD_ACP=y CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_PRE_VEGA=y # CONFIG_DRM_AMD_DC_FBC is not set -# CONFIG_DRM_AMD_DC_DCN1_0 is not set +CONFIG_DRM_AMD_DC_DCN1_0=y # CONFIG_DEBUG_KERNEL_DC is not set # @@ -6293,6 +6293,8 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m # CONFIG_MMC_USDHI6ROL0 is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_CQHCI=m CONFIG_MMC_TOSHIBA_PCI=m CONFIG_MMC_MTK=m @@ -6313,6 +6315,8 @@ CONFIG_MS_BLOCK=m CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m diff --git a/srcpkgs/linux4.16/template b/srcpkgs/linux4.16/template index 64daf52dd2..1ea99c6ff5 100644 --- a/srcpkgs/linux4.16/template +++ b/srcpkgs/linux4.16/template @@ -1,6 +1,6 @@ # Template file for 'linux4.16' pkgname=linux4.16 -version=4.16.9 +version=4.16.12 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=6037bb398ee6ae1a3d917cb575b61e7741fa084ba397e08abc271bf09d6d9b8a +checksum=567078358d5a3490d1410696f36f36f5e88f98bef9f4d3c0d68c605aeb71111d nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 05962968d7..fe8bdd3bb2 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin -version=0.15.1 -revision=3 +version=0.16.0 +revision=1 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.litecoin.org/" distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz" -checksum=570adae0d4a9567110967aba2ea5d90ce8c421313f453523c4fd23b9339c7d2b +checksum=8364a69f05cec64e1fd492d41372552cdde86358d22bb0e074dbf917e65371a0 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools protobuf" diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 89f475c712..209eaf914b 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,17 +1,17 @@ # Template file for 'lollypop' pkgname=lollypop -version=0.9.504 +version=0.9.514 revision=1 build_style=meson noarch=yes -hostmakedepends="intltool itstool pkg-config glib-devel gobject-introspection python3" +hostmakedepends="intltool itstool pkg-config glib-devel gobject-introspection python3 git" makedepends="gtk+3-devel python3-devel" depends="gst-libav libsecret libnotify python3-youtube-dl python3-dbus python3-gobject python3-pylast totem-pl-parser python3-wikipedia" pycompile_module="lollypop" short_desc="A music player for GNOME" maintainer="Jürgen Buchmüller " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Lollypop" -distfiles="https://gitlab.gnome.org/gnumdk/lollypop/uploads/98a3b6d073c5fed4333627f26d325a5f/lollypop-${version}.tar.xz" -checksum=549baa80f6d005107e6c29b55f68a1d1275c898877fff5dc48ef7549ef2f247b +distfiles="https://gitlab.gnome.org/gnumdk/lollypop/uploads/fc731e0878cea850ebadb46afd69b3b8/lollypop-${version}.tar.xz" +checksum=b9597979372a54445e8317e417331557302d212775a9d528593c568dc8c91803 diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 73a8f48722..2a395bafbd 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,6 +1,6 @@ # Template file for 'lutris' pkgname=lutris -version=0.4.16 +version=0.4.17 revision=1 noarch=yes build_style=python3-module @@ -12,4 +12,4 @@ maintainer="Jan Wey. " license="GPL-3.0-or-later" homepage="https://lutris.net" distfiles="https://github.com/lutris/lutris/archive/v${version}.tar.gz" -checksum=0d07e425c3aeff2f50e1327b2c76bae8ae461af8d002b90bdbf111ec56e9a6fb +checksum=8db1bbcaf61b7212a9607cbde1cfce9ac34cab7df896c7a0d8dc8e77eff50c62 diff --git a/srcpkgs/lxd/patches/musl-limits.patch b/srcpkgs/lxd/patches/musl-limits.patch deleted file mode 100644 index 247b22ef81..0000000000 --- a/srcpkgs/lxd/patches/musl-limits.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dist/src/github.com/lxc/lxd/lxd/main_forkfile.go -+++ dist/src/github.com/lxc/lxd/lxd/main_forkfile.go -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - extern char* advance_arg(bool required); - extern void error(char *msg); diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template index 2f6949d414..656004593a 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -1,19 +1,19 @@ # Template file for 'lxd' pkgname=lxd -version=3.0.0 +version=3.1 revision=1 build_style=go go_import_path="github.com/lxc/lxd" go_package="${go_import_path}/lxd ${go_import_path}/lxc" hostmakedepends="git bzr pkg-config" makedepends="lxc-devel acl-devel" -depends="lxc liblxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables" +depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables" short_desc="LXD is a next generation system container manager" maintainer="iaroki " license="Apache-2.0" homepage="https://linuxcontainers.org/lxd" distfiles="https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" -checksum=9c13f1bfbec68021c8e2264bcbcdf1f53de693256affa0f92a134d9d5ccbb754 +checksum=bcfe2661d97af0dcc0ac5de8407b6e24de8615e6b7881bd4bf8e9c59fefc673f system_groups="lxd" post_install() { diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template index 47d3bff766..e8c5e2cf5e 100644 --- a/srcpkgs/mcelog/template +++ b/srcpkgs/mcelog/template @@ -1,6 +1,6 @@ # Template file for 'mcelog' pkgname=mcelog -version=157 +version=158 revision=1 conf_files="/etc/mcelog/mcelog.conf" only_for_archs="i686 i686-musl x86_64 x86_64-musl" @@ -8,9 +8,9 @@ short_desc="Decode kernel machine check log on x86 machines" maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="http://www.mcelog.org/" -_changelog="https://github.com/andikleen/mcelog/releases" +#changelog="https://github.com/andikleen/mcelog/releases" distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz" -checksum=bd0af97f0a2d7509d3872c1597b24ba5d6433c15df390a9849a7ba79f4832bdb +checksum=4736ec895e9bbe62e9189557fb2dd023d9509e116194783b895d2ecc71fa9c86 do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs} diff --git a/srcpkgs/mdds0/update b/srcpkgs/mdds0/update index b0fc8a69ee..e4eef5b30a 100644 --- a/srcpkgs/mdds0/update +++ b/srcpkgs/mdds0/update @@ -1,3 +1,2 @@ -site=https://gitlab.com/mdds/mdds pkgname=mdds ignore="1.*.*" diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template index b0d76067df..d01e14c561 100644 --- a/srcpkgs/memcached/template +++ b/srcpkgs/memcached/template @@ -1,6 +1,6 @@ # Template file for 'memcached' pkgname=memcached -version=1.5.7 +version=1.5.8 revision=1 configure_args="--enable-seccomp" build_style=gnu-configure @@ -11,7 +11,7 @@ license="BSD-3-Clause" homepage="http://www.memcached.org" #changelog=https://github.com/memcached/memcached/wiki/ReleaseNotes distfiles="http://memcached.org/files/${pkgname}-${version}.tar.gz" -checksum=5bb706a8fc7ae7461a6788eaddd85e4a4e84e952d3a80c21926342c2838f4e46 +checksum=7388c3989442a46d7e04e8ac2631464e9ce44d5114d79c41dd8780b4b186f6de post_install() { vlicense COPYING LICENSE diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template index 3c1d08bcfd..5d4d7f68f3 100644 --- a/srcpkgs/mg/template +++ b/srcpkgs/mg/template @@ -1,15 +1,15 @@ # Template file for 'mg' pkgname=mg -version=20171014 +version=20180408 revision=1 hostmakedepends="pkg-config" makedepends="libbsd-devel ncurses-devel" -homepage="http://homepage.boetes.org/software/mg" +homepage="https://github.com/hboetes/mg" short_desc="Micro GNU/emacs" maintainer="Juan RP " license="Public Domain" -distfiles="$homepage/mg-$version.tar.gz" -checksum=51519698f3f44acd984d7805e4e315ded50c15aba8222521f88756fd67745341 +distfiles="https://github.com/hboetes/mg/archive/${version}.tar.gz" +checksum=85c1d47500fd042e427b670c630c228668bcc4f532a280f9ecce3d302229bbe4 CFLAGS="-DTCSASOFT=0" diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template index 1de04e2d9f..c72695f74d 100644 --- a/srcpkgs/minikube/template +++ b/srcpkgs/minikube/template @@ -1,7 +1,7 @@ # Template file for 'minikube' pkgname=minikube -version=0.26.1 -revision=2 +version=0.27.0 +revision=1 only_for_archs="x86_64 x86_64-musl" build_style=go hostmakedepends="git go-bindata python pkg-config" diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index 098d2b1735..9528f75c57 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,24 +1,24 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 -version=1.16 -revision=4 +version=1.16.1 +revision=1 +wrksrc="krb5-${version}" +build_style=gnu-configure +hostmakedepends="e2fsprogs-devel flex perl pkg-config" +makedepends="e2fsprogs-devel libldap-devel" +#depends="mit-krb5-client)=${version}_${revision}" short_desc="MIT Kerberos 5 implementation" maintainer="Juan RP " license="MIT" homepage="http://web.mit.edu/kerberos" -distfiles="$homepage/dist/krb5/1.16/krb5-${version}.tar.gz" -checksum=faeb125f83b0fb4cdb2f99f088140631bb47d975982de0956d18c85842969e08 - -build_style=gnu-configure -wrksrc="krb5-${version}" -hostmakedepends="perl flex e2fsprogs-devel pkg-config" -makedepends="db-devel e2fsprogs-devel libressl-devel libldap-devel" -depends="mit-krb5-client>=${version}_${revision}" +distfiles="${homepage}/dist/krb5/1.16/krb5-${version}.tar.gz" +checksum=214ffe394e3ad0c730564074ec44f1da119159d94281bbec541dc29168d21117 post_extract() { # Fix db plugin. sed -i -e "s|||" $wrksrc/src/plugins/kdb/db2/*.[ch] } + do_configure() { WARN_CFLAGS= ./src/configure ${configure_args} --sbindir=/usr/bin \ --disable-rpath --with-system-et --without-system-verto --with-ldap \ @@ -27,6 +27,7 @@ do_configure() { acx_pthread_ok=yes ac_cv_func_regcomp=yes ac_cv_printf_positional=yes \ krb5_cv_attr_constructor_destructor=yes,yes } + pre_build() { sed -i "/LDFLAGS=/d" src/build-tools/krb5-config.in } @@ -53,6 +54,7 @@ mit-krb5-client_package() { done } } + mit-krb5-devel_package() { depends="${makedepends} mit-krb5-libs>=${version}_${revision}" short_desc+=" - development files" @@ -63,6 +65,7 @@ mit-krb5-devel_package() { vmove "usr/lib/*.so" } } + mit-krb5-libs_package() { short_desc+=" - runtime libraries" pkg_install() { diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 3d20bf37ef..199814bc65 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,8 +1,7 @@ # Template file for 'monero-gui' pkgname=monero-gui version=0.12.0.0 -revision=4 -replaces="monero-core>=0" +revision=5 build_style=qmake hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel" makedepends="libatomic-devel monero-devel boost-devel libunwind-devel miniupnpc-devel diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch new file mode 100644 index 0000000000..1e93d5b1bc --- /dev/null +++ b/srcpkgs/monero/patches/system-miniupnpc.patch @@ -0,0 +1,101 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -430,6 +430,14 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") + + add_subdirectory(external) + ++# Final setup for miniupnpc ++if(UPNP_STATIC OR IOS) ++ add_definitions("-DUPNP_STATIC") ++else() ++ add_definitions("-DUPNP_DYNAMIC") ++ include_directories(${UPNP_INCLUDE}) ++endif() ++ + # Final setup for libunbound + include_directories(${UNBOUND_INCLUDE}) + link_directories(${UNBOUND_LIBRARY_DIRS}) +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index 1fc4d64c..b4f712ee 100644 +--- external/CMakeLists.txt ++++ external/CMakeLists.txt +@@ -34,21 +34,42 @@ + # We always compile if we are building statically to reduce static dependency issues... + # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with + # others. ++if(NOT IOS) ++ find_package(Miniupnpc QUIET) ++endif() + +-find_package(Miniupnpc REQUIRED) ++# If we have the correct shared version and we're not building static, use it ++if(STATIC OR IOS) ++ set(USE_SHARED_MINIUPNPC false) ++elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ set(USE_SHARED_MINIUPNPC true) ++endif() + +-message(STATUS "Using in-tree miniupnpc") ++if(USE_SHARED_MINIUPNPC) ++ message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}") + +-add_subdirectory(miniupnp/miniupnpc) ++ set(UPNP_STATIC false PARENT_SCOPE) ++ set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) ++ set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) ++else() ++ if(STATIC) ++ message(STATUS "Using miniupnpc from local source tree for static build") ++ else() ++ message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)") ++ endif() + +-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-if(MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") +-elseif(NOT MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") +-endif() ++ add_subdirectory(miniupnp/miniupnpc) ++ ++ set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") ++ if(MSVC) ++ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") ++ elseif(NOT MSVC) ++ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") ++ endif() + +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++ set(UPNP_STATIC true PARENT_SCOPE) ++ set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++endif() + + find_package(Unbound) + +diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl +index 9b21705e..76340a22 100644 +--- src/p2p/net_node.inl ++++ src/p2p/net_node.inl +@@ -49,9 +49,16 @@ + #include "storages/levin_abstract_invoke2.h" + #include "cryptonote_core/cryptonote_core.h" + +-#include +-#include +-#include ++// We have to look for miniupnpc headers in different places, dependent on if its compiled or external ++#ifdef UPNP_STATIC ++ #include ++ #include ++ #include ++#else ++ #include "miniupnpc.h" ++ #include "upnpcommands.h" ++ #include "upnperrors.h" ++#endif + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" +-- +2.17.0 + diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 75c457da52..41efa71065 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,10 +1,10 @@ # Template file for 'monero' pkgname=monero -version=0.12.0.0 -revision=3 +version=0.12.1.0 +revision=1 conf_files="/etc/monerod.conf" build_style=cmake -hostmakedepends="pkg-config git qt5-host-tools" +hostmakedepends="pkg-config qt5-host-tools" configure_args="-DBUILD_GUI_DEPS=ON -DHAVE_LIBRESSL=1" makedepends="libressl-devel boost-devel libldns-devel libunwind-devel readline-devel unbound-devel miniupnpc-devel libldns-devel expat-devel @@ -15,10 +15,10 @@ make_dirs=" /var/log/monero 0755 monero monero" short_desc="Private, secure, untraceable, decentralised digital currency" maintainer="Helmut Pozimski " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://getmonero.org" distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz" -checksum=5e8303900a39e296c4ebaa41d957ab9ee04e915704e1049f82a9cbd4eedc8ffb +checksum=e5f32361ce39a9849a262afb1d5ce211f593c486dcca7bb0af60fcc26ee52b35 if [ "$CROSS_BUILD" ]; then configure_args+=" -DTHREADS_PTHREAD_ARG=OFF" diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template index 53b36df27a..68630ee586 100644 --- a/srcpkgs/mozo/template +++ b/srcpkgs/mozo/template @@ -1,17 +1,17 @@ # Template file for 'mozo' pkgname=mozo version=1.20.0 -revision=1 +revision=2 noarch=yes nocross=yes build_style=gnu-configure -hostmakedepends="pkg-config intltool itstool python-gobject-devel" +hostmakedepends="intltool itstool pkg-config" makedepends="glib-devel mate-menus-devel python-gobject-devel" -depends="mate-menus python-gobject gtk+3 desktop-file-utils" +depends="desktop-file-utils gtk+3 mate-menus python-gobject" pycompile_module="Mozo" short_desc="MATE menu editing tool" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://mate-desktop.org" -distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mozo-${version}.tar.xz" checksum=ef20df929fa89e33e818be5038cb222ed5022165a751435a53d2ddabda560884 diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template index 18b3821fa7..64e11488f1 100644 --- a/srcpkgs/mpc/template +++ b/srcpkgs/mpc/template @@ -1,19 +1,19 @@ # Template file for 'mpc' pkgname=mpc -version=0.29 +version=0.30 revision=1 build_style=meson -hostmakedepends="pkg-config python3-Sphinx" -makedepends="libmpdclient-devel" +configure_args="-Dtest=true" +hostmakedepends="pkg-config" +makedepends="libmpdclient-devel check-devel" short_desc="Minimalist command line interface to MPD" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.musicpd.org/clients/mpc/" +#changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/master/NEWS" distfiles="http://www.musicpd.org/download/mpc/${version%.*}/mpc-${version}.tar.xz" -checksum=02f1daec902cb48f8cdaa6fe21c7219f6231b091dddbe437a3a4fb12cb07b9d3 +checksum=65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce post_install() { vinstall contrib/mpc-completion.bash 644 usr/share/bash-completion/completions mpc - # Manpages installed on wrong path - mv "${DESTDIR}"/usr/share/man/man1/man/mpc.1 "${DESTDIR}"/usr/share/man/man1/mpc.1 } diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index d7b7dc9eec..da6266ce49 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,6 +1,6 @@ # Template file for 'mpd' pkgname=mpd -version=0.20.19 +version=0.20.20 revision=1 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins @@ -27,7 +27,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://www.musicpd.org/" distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=01cdef1b9217588a8fa64dc2cba900c138e1363a787837b4c8327c652b7956c3 +checksum=a9e458c6e07cdf62649de7722e1e5a7f13aa82eeb397bfbbebc07cf5cf273584 # Package build options build_options="jack lame mpcdec pulseaudio libao wavpack sndio cdio" diff --git a/srcpkgs/mt-st/template b/srcpkgs/mt-st/template index e812f0808d..09152f711c 100644 --- a/srcpkgs/mt-st/template +++ b/srcpkgs/mt-st/template @@ -1,13 +1,14 @@ # Template file for 'mt-st' pkgname=mt-st -version=1.1 -revision=2 +version=1.3 +revision=1 +wrksrc="${pkgname}-${pkgname}-${version}" short_desc="Linux SCSI tape driver aware magnetic tape control (aka mt)" maintainer="allan " -license="GPL-2" -homepage="http://ftp.ibiblio.org/pub/linux/system/backup/" -distfiles="ftp://ftp.ibiblio.org/pub/linux/system/backup/mt-st-${version}.tar.gz" -checksum=945cb4f3d9957dabe768f5941a9148b746396836c797b25f020c84319ba8170d +license="GPL-2.0-or-later" +homepage="https://github.com/iustin/mt-st" +distfiles="https://github.com/iustin/mt-st/archive/mt-st-${version}.tar.gz" +checksum=85c3d88365233b1fd34e109f8d455d498d3d2e286558c8ca85d7435abfbf173d do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" diff --git a/srcpkgs/myrddin/template b/srcpkgs/myrddin/template index 4bfad62274..76e99872e2 100644 --- a/srcpkgs/myrddin/template +++ b/srcpkgs/myrddin/template @@ -1,7 +1,7 @@ # Template file for 'myrddin' pkgname=myrddin -version=0.2.0 -revision=2 +version=0.2.2 +revision=1 wrksrc=mc only_for_archs="x86_64 x86_64-musl" build_style=configure @@ -12,7 +12,7 @@ maintainer="Duncaen " license="MIT" homepage="https://myrlang.org/" distfiles="https://myrlang.org/releases/myrddin-${version}.tar.xz" -checksum=4ad37b856edddc1172d584aaf67621eaccd6f378b132e6350c5c5ef9383eabcf +checksum=b6692384c2863e9832f5966e7f6ce8d791fcbdcda50b68e3fb5fd29925baf6eb post_install() { vlicense LICENSE diff --git a/srcpkgs/nanomsg/template b/srcpkgs/nanomsg/template index 38b0abdf4d..62668d26f6 100644 --- a/srcpkgs/nanomsg/template +++ b/srcpkgs/nanomsg/template @@ -1,14 +1,15 @@ # Template file for 'nanomsg' pkgname=nanomsg -version=1.1.2 +version=1.1.3 revision=1 -short_desc='Simple, high-performance implementation of "scalability protocols"' -homepage='http://nanomsg.org/' -license="MIT" build_style=cmake +short_desc='Simple, high-performance implementation of "scalability protocols"' maintainer="Toyam Cox " +license="MIT" +homepage='http://nanomsg.org/' +#changelog="https://github.com/nanomsg/nanomsg/releases" distfiles="https://github.com/nanomsg/nanomsg/archive/$version.tar.gz>nanomsg-${version}.tar.gz" -checksum=3c52165a735c2fb597d2306593ae4b17900688b90113d4115ad8480288f28ccb +checksum=a25b7da0a3596fa45f4102b15c4329801711cceba2a530eeaff41189a46b6329 post_install() { vlicense COPYING @@ -20,6 +21,7 @@ nanomsg-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.so + vmove "usr/lib/*.so" + vmove usr/lib/cmake } } diff --git a/srcpkgs/nasm/patches/gcc81-pure_func.patch b/srcpkgs/nasm/patches/gcc81-pure_func.patch new file mode 100644 index 0000000000..b5c24d59f2 --- /dev/null +++ b/srcpkgs/nasm/patches/gcc81-pure_func.patch @@ -0,0 +1,11 @@ +--- include/nasmlib.h 2017-11-29 20:44:08.000000000 +0100 ++++ include/nasmlib.h 2018-05-22 11:26:47.909787252 +0200 +@@ -191,7 +191,7 @@ + * seg_init: Initialise the segment-number allocator. + * seg_alloc: allocate a hitherto unused segment number. + */ +-void pure_func seg_init(void); ++void seg_init(void); + int32_t pure_func seg_alloc(void); + + /* diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template index a2e00145cf..0ee61a7093 100644 --- a/srcpkgs/navit/template +++ b/srcpkgs/navit/template @@ -1,12 +1,10 @@ # Template file for 'navit' pkgname=navit -version=0.5.1+rc1 +version=0.5.1 revision=1 -_ver="${version/+/-}" -wrksrc="${pkgname}-${_ver}" build_style=cmake configure_args="-DLIBDIR=lib/navit -Wno-dev" -hostmakedepends="pkg-config qt5-host-tools" +hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="SDL-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel fontconfig-devel zlib-devel libpng-devel qt5-declarative-devel qt5-svg-devel qt5-location-devel SDL_ttf-devel SDL_image-devel libfreeglut-devel gtk+-devel @@ -14,11 +12,11 @@ makedepends="SDL-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel python3-devel" short_desc="Turn-by-turn Navigation Software" maintainer="Toyam Cox " -license="GPL-2" +license="GPL-2.0-only, LGPL-2.0-only" homepage="http://www.navit-project.org/" -distfiles="https://github.com/navit-gps/navit/archive/v${_ver}.tar.gz" -checksum=c15f1dd35fd949378ac69c9ba26808c9eafb548eed22f9655bcb3e2ed4fa8944 +distfiles="https://github.com/navit-gps/navit/archive/v${version}.tar.gz" +checksum=251f17e10509f782798eeb1bb9f8085d4356742d00dde5a354a41a508f54ec27 pre_configure() { - sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt + sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt } diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template index 7d92bf6b54..15543bd8ce 100644 --- a/srcpkgs/neofetch/template +++ b/srcpkgs/neofetch/template @@ -1,6 +1,6 @@ # Template file for 'neofetch' pkgname=neofetch -version=4.0.0 +version=4.0.2 revision=1 noarch=yes build_style=gnu-makefile @@ -10,7 +10,7 @@ maintainer="Muhammad Herdiansyah " license="MIT" homepage="https://github.com/dylanaraps/neofetch" distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=b2dae233007ac7d5717df7b1f8f742aebcb84289d5a048398eab3566a8204278 +checksum=3cd4db97d732dd91424b357166d38edccec236c21612b392318b48a3ffa29004 post_install() { vlicense LICENSE.md diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index c30111fc91..6b4dd1884f 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,16 +1,16 @@ # Template file for 'nheko' pkgname=nheko -version=0.3.1 +version=0.4.2 revision=1 build_style=cmake hostmakedepends="git qt5-host-tools qt5-qmake" -makedepends="lmdb-devel qt5-multimedia-devel qt5-tools-devel" +makedepends="lmdb-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel" short_desc="Desktop client for the Matrix protocol" maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://github.com/mujx/nheko" distfiles="https://github.com/mujx/nheko/archive/v${version}.tar.gz" -checksum=2298f1f1fd3c51603c8479eb7eb16ba50c059459964f930240e35ff7dbaafde5 +checksum=8a66fb40d75d08dabe61246e89bfb6be9aaee66a96bc9439876de8bfd48fb78f pre_configure() { sed -i 's/Werror/Wno-error/g' cmake/CompilerFlags.cmake diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template index adfe6df2df..23fe0cf8a0 100644 --- a/srcpkgs/nicotine+/template +++ b/srcpkgs/nicotine+/template @@ -1,7 +1,8 @@ # Template file for 'nicotine+' pkgname=nicotine+ -version=1.2.16 -revision=3 +version=1.4.1 +revision=1 +wrksrc="nicotine-plus-${version}" noarch=yes build_style=python2-module hostmakedepends="python-gobject2-devel" @@ -9,7 +10,7 @@ depends="pygtk mutagen librsvg" pycompile_module="pynicotine" short_desc="Soulseek music-sharing client written in Python" maintainer="doggone " -license="GPL-3" -homepage="http://nicotine-plus.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/nicotine-plus/${pkgname}-${version}.tar.gz" -checksum=0fa7732270342f75189df99431d44088b4f7ae90f0c24298ea264ce89670dc9d +license="GPL-3.0-or-later" +homepage="http://www.nicotine-plus.org/" +distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz" +checksum=1b38ef196d981e4eb96fa990cc463143289784f988f559c4400b1d461497b7d6 diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template index 8f8ff93f77..41bafc5a67 100644 --- a/srcpkgs/nncp/template +++ b/srcpkgs/nncp/template @@ -1,15 +1,15 @@ # Template file for 'nncp' pkgname=nncp -version=3.0 -revision=4 +version=3.1 +revision=1 build_style=go go_import_path=cypherpunks.ru/nncp short_desc="Node to Node copy, utilities for secure store-and-forward" maintainer="Leah Neukirchen " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.nncpgo.org/" distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz" -checksum=248b22572f576e79a19672e9b82eb64918fc95a9194408c067ea4dd30468286d +checksum=b93445164230b58e8aaadaa2066f37f2493ccb71b025126bbcad8fad6535149f do_build() { make diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index 23d49f8d67..ae58655c7d 100644 --- a/srcpkgs/nomacs/template +++ b/srcpkgs/nomacs/template @@ -1,18 +1,18 @@ # Template file for 'nomacs' pkgname=nomacs -version=3.6.1 -revision=3 +version=3.8.1 +revision=1 build_style=cmake build_wrksrc="ImageLounge" configure_args="-DUSE_SYSTEM_QUAZIP=1" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools quazip-qt5-devel" makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel libraw-devel quazip-qt5-devel" short_desc="Simple yet powerful Qt imageviewer" maintainer="Kharlamov Alexey " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://nomacs.org/" distfiles="https://github.com/nomacs/nomacs/archive/${version}.tar.gz" -checksum=09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068 +checksum=1a6b0f5fb0cb61956fafce0d6d49e25abc4b34b77b1485654d9b03b786b8ea00 pre_configure() { # fix build with quazip-qt5 diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index ac60dab420..257651a22a 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=53.0.2907.57 +version=53.0.2907.68 revision=1 only_for_archs="x86_64" repository="nonfree" @@ -11,7 +11,7 @@ maintainer="Diogo Leal " license="Proprietary" homepage="https://www.opera.com/computer" distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" -checksum=e8915f5486a050b72b5b2171b647809c042c0899b172e10cb96d9e0a94b50473 +checksum=f38a9f835e55c088a66f15c1b62a99d235133e905809724df77d502080efea65 do_extract() { ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}_amd64.deb diff --git a/srcpkgs/overpass-otf/template b/srcpkgs/overpass-otf/template index cabec0130e..818f264a91 100644 --- a/srcpkgs/overpass-otf/template +++ b/srcpkgs/overpass-otf/template @@ -1,6 +1,6 @@ # Template file for 'overpass-otf' pkgname=overpass-otf -version=3.0.2 +version=3.0.3 revision=1 wrksrc="Overpass-${version}" noarch=yes @@ -11,7 +11,7 @@ maintainer="cr6git " license="OFL-1.1, LGPL-2.1" homepage="http://overpassfont.org" distfiles="https://github.com/RedHatBrand/Overpass/archive/${version}.tar.gz" -checksum=0be7e2b4a1b63be10d8fd290f3cee2f57fe38c865e415185685ee2bd442a9b20 +checksum=5575965097b1682330a9a4d36e4090bfe53f6cf97f72351adbf44e05e008a8aa do_install() { for files in desktop-fonts/overpass/*.otf; do diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template index 28ad768a38..0bababc6b2 100644 --- a/srcpkgs/p11-kit/template +++ b/srcpkgs/p11-kit/template @@ -1,6 +1,6 @@ # Template file for 'p11-kit' pkgname=p11-kit -version=0.23.10 +version=0.23.11 revision=1 build_style=gnu-configure configure_args="--with-module-path=/usr/lib/pkcs11 --without-trust-paths" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="BSD-3-Clause" homepage="https://github.com/p11-glue/p11-kit" distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.gz" -checksum=f9212a3f225ef543e13fae9945527d66c0cbb67246320035dd94fab2bce5ae43 +checksum=b243c8daa573f85cb9873352a4c38563812fe3045e960593eb45db7dfdea4a2b post_install() { mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example ${DESTDIR}/etc/pkcs11/pkcs11.conf diff --git a/srcpkgs/pan/template b/srcpkgs/pan/template index 7c2bb9f788..694644dede 100644 --- a/srcpkgs/pan/template +++ b/srcpkgs/pan/template @@ -1,16 +1,15 @@ -# Template build file for 'pan' +# Template file for 'pan' pkgname=pan -version=0.144 +version=0.145 revision=1 build_style=gnu-configure configure_args="--with-gnutls" hostmakedepends="pkg-config yelp-tools" makedepends="gmime-devel gnutls-devel gtk+-devel" -depends="desktop-file-utils" -maintainer="cr6git " +depends="desktop-file-utils hicolor-icon-theme" short_desc="Usenet newsreader that's good at both text and binaries" +maintainer="cr6git " +license="GFDL-1.1-or-later, GPL-2.0-only" homepage="http://pan.rebelbase.com" -license="GPL-2" distfiles="http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2" -checksum=91fae377c1b01f173f21d89d9e503c9a59f902e25423b15d5db04bf4cbf10750 - +checksum=68da514a8088513502b418859a7df7638866f75d03a429197cf9c23176559cac diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index 96704a3fcd..6fed31e373 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,6 +1,6 @@ # Template file for 'parallel' pkgname=parallel -version=20180422 +version=20180522 revision=1 noarch=yes build_style=gnu-configure @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " homepage="http://www.gnu.org/software/parallel/" license="GPL-3.0-or-later" distfiles="${GNU_SITE}/$pkgname/$pkgname-${version}.tar.bz2" -checksum=9dce21cac7d91bd84cef0da106182ad3c96ac18e012595df4981b4c7fbba4e77 +checksum=eb017e2aea57464c3c91bd1120d419a303d2c204c35ec41fc156e6536ffa0cce pre_configure() { # no html and pdf doc diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template index efd7d08867..e5227ba1b7 100644 --- a/srcpkgs/pdfgrep/template +++ b/srcpkgs/pdfgrep/template @@ -1,6 +1,6 @@ # Template file for 'pdfgrep' pkgname=pdfgrep -version=2.1.0 +version=2.1.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://pdfgrep.org" distfiles="http://pdfgrep.org/download/pdfgrep-${version}.tar.gz" -checksum=c9c16b4816389b20313aebb4fbad86f7775ae03330fcc08c82fa522ed810548d +checksum=2c8155f30fe5d9d8ec4340e48133ed0b241496bbebe29498931f975c67a10c0b diff --git a/srcpkgs/perl-DateTime-Locale/template b/srcpkgs/perl-DateTime-Locale/template index 0c805d9fdf..9a1c3a4184 100644 --- a/srcpkgs/perl-DateTime-Locale/template +++ b/srcpkgs/perl-DateTime-Locale/template @@ -1,7 +1,8 @@ # Template file for 'perl-DateTime-Locale' pkgname=perl-DateTime-Locale -version=1.19 +version=1.20 revision=1 +noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl-File-ShareDir-Install" @@ -11,7 +12,7 @@ depends="perl-File-ShareDir perl-List-MoreUtils perl-Params-ValidationCompiler short_desc="Localization support for DateTime.pm" maintainer="John Regan " license="Artistic-1.0-Perl, GPL-1.0-or-later" +#changelog="http://cpansearch.perl.org/src/DROLSKY/DateTime-Locale-${version}/Changes" homepage="http://search.cpan.org/dist/DateTime-Locale/" distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-${version}.tar.gz" -checksum=e25645e5820b59a4dbbcc636a75e44961ff10e4d16b2593e5bd7633b15ae2773 -noarch=yes +checksum=998f034234441932c82a4598fa49a14f346d6e981d1d2d91a179913a9f81b898 diff --git a/srcpkgs/perl-DateTime/template b/srcpkgs/perl-DateTime/template index f7ef226c35..5e4449b5e1 100644 --- a/srcpkgs/perl-DateTime/template +++ b/srcpkgs/perl-DateTime/template @@ -1,6 +1,6 @@ -# Template build file for 'perl-DateTime'. +# Template file for 'perl-DateTime' pkgname=perl-DateTime -version=1.48 +version=1.49 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -10,7 +10,7 @@ checkdepends="perl-CPAN-Meta-Check perl-Test-Fatal perl-Test-Warnings" depends="${makedepends}" short_desc="A date and time object for Perl" maintainer="John Regan " -homepage="http://search.cpan.org/dist/DateTime" license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="http://search.cpan.org/dist/DateTime" distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-$version.tar.gz" -checksum=5005446eabed6ac96c93e40d284987f0fd1bbfd41a1a7dd5e2abe646dfd68c3e +checksum=708ed4a3dbaca8dc470fe29538e6fc0d25eca1831e9e77bea55a9812f0277c41 diff --git a/srcpkgs/perl-Glib-Object-Introspection/template b/srcpkgs/perl-Glib-Object-Introspection/template index d73fb28b88..6b17319056 100644 --- a/srcpkgs/perl-Glib-Object-Introspection/template +++ b/srcpkgs/perl-Glib-Object-Introspection/template @@ -1,16 +1,16 @@ # Template file for 'perl-Glib-Object-Introspection' pkgname=perl-Glib-Object-Introspection -version=0.044 +version=0.045 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module -nocross=yes hostmakedepends="perl" makedepends="perl-ExtUtils-PkgConfig perl-ExtUtils-Depends perl-Glib libgirepository-devel" depends="perl-ExtUtils-PkgConfig perl-ExtUtils-Depends perl-Glib" short_desc="Dynamically create Perl language bindings" maintainer="Orphaned " -license="LGPL-3" +license="LGPL-3.0-or-later" homepage="http://search.cpan.org/~tsch/Glib-Object-Introspection/" distfiles="http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/Glib-Object-Introspection-${version}.tar.gz" -checksum=093c47141db683bf8dcbf1c3e7b2ece2b2b5488739197b8b623f50838eb7e734 +checksum=5f0b88d5cf9b9d5d60c90ea9d411076bea54a2c0757c8f4d527520e5f332e7bb +nocross=yes diff --git a/srcpkgs/perl-Glib/template b/srcpkgs/perl-Glib/template index df78110578..b67f97be7a 100644 --- a/srcpkgs/perl-Glib/template +++ b/srcpkgs/perl-Glib/template @@ -1,16 +1,16 @@ # Template file for 'perl-Glib' pkgname=perl-Glib -version=1.326 +version=1.327 revision=1 -wrksrc="Glib-$version" +wrksrc="Glib-${version}" build_style=perl-module -nocross=yes hostmakedepends="perl" makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig glib-devel" depends="${hostmakedepends/glib-devel/}" short_desc="Perl bindings for Glib 2" maintainer="Juan RP " +license="LGPL-2.1-or-later" homepage="http://gtk2-perl.sourceforge.net/" -license="LGPL-2.1" distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Glib-$version.tar.gz" -checksum=020d0308220cb6e03a086bd45d33dd8fe03b265c502bfc2b4e58f2dbe64c365f +checksum=1350d92975969387d27c9001a834037a0a2183789f4b0cd67e0af6021794f058 +nocross=yes diff --git a/srcpkgs/perl-Gtk3/template b/srcpkgs/perl-Gtk3/template index c48bb02fc8..90d4cd0eae 100644 --- a/srcpkgs/perl-Gtk3/template +++ b/srcpkgs/perl-Gtk3/template @@ -1,9 +1,9 @@ # Template file for 'perl-Gtk3' pkgname=perl-Gtk3 -version=0.033 +version=0.034 revision=1 noarch=yes -wrksrc="${pkgname/perl-/}-${version}" +wrksrc="${pkgname#perl-}-${version}" build_style=perl-module hostmakedepends="perl" makedepends="perl perl-Cairo-GObject perl-Glib-Object-Introspection" @@ -14,4 +14,4 @@ maintainer="newbluemoon " license="LGPL-2.1-or-later" homepage="http://gtk2-perl.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/gtk2-perl/Gtk3/Gtk3-${version}.tar.gz" -checksum=e18c9c4d860cf29c9b0fe9d2e2c6d342646c179f4dd7d787b3d0183932e10e93 +checksum=0adb213b72604310cd4190c78969b4e46f94638c364040d4dceab8f629f45d2d diff --git a/srcpkgs/perl-Mail-DKIM/template b/srcpkgs/perl-Mail-DKIM/template index 4f9c836712..b4f7c5e3a4 100644 --- a/srcpkgs/perl-Mail-DKIM/template +++ b/srcpkgs/perl-Mail-DKIM/template @@ -1,16 +1,18 @@ # Template file for 'perl-Mail-DKIM' pkgname=perl-Mail-DKIM -version=0.52 +version=0.53 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" -makedepends="${hostmakedepends} perl-Net-DNS perl-MailTools perl-Crypt-OpenSSL-RSA" +makedepends="${hostmakedepends} perl-Net-DNS perl-MailTools perl-Crypt-OpenSSL-RSA + perl-YAML-LibYAML" depends="${makedepends}" +checkdepends="perl-Test-RequiresInternet perl-Net-DNS-Resolver-Mock" short_desc="Perl module for DKIM message signing" maintainer="johannes " -license="GPL-2" +license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="http://search.cpan.org/dist/Mail-DKIM/" distfiles="${CPAN_SITE}/Mail/Mail-DKIM-${version}.tar.gz" -checksum=9eaf0b212af1883b9c3f709dcf4811e46122546a38ae979a08756fbfcffb6cb5 +checksum=7c44099e201f69a594b81605488e317c79d6436dab43e3289d8c61bda67315ab diff --git a/srcpkgs/perl-Mojolicious/template b/srcpkgs/perl-Mojolicious/template index 4a6d7c7a6e..02d36c3de0 100644 --- a/srcpkgs/perl-Mojolicious/template +++ b/srcpkgs/perl-Mojolicious/template @@ -1,6 +1,6 @@ # Template file for 'perl-Mojolicious' pkgname=perl-Mojolicious -version=7.80 +version=7.82 revision=1 noarch=yes wrksrc="${pkgname//perl-/}-${version}" @@ -12,5 +12,5 @@ maintainer="Urs Schulz " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/${pkgname//perl-/}/" distfiles="${CPAN_SITE}/${pkgname//perl-/}/${pkgname//perl-/}-${version}.tar.gz" -checksum=27c84a68bfe79f57ffe50b622346cfc3c81ffef7f897262451bae17a74823ced +checksum=70c5f211ba81982752eae189ca7aea0ea14fb7534449114d0a3d47d96c0d05c4 diff --git a/srcpkgs/perl-Net-DNS-Resolver-Mock/template b/srcpkgs/perl-Net-DNS-Resolver-Mock/template new file mode 100644 index 0000000000..819f21285a --- /dev/null +++ b/srcpkgs/perl-Net-DNS-Resolver-Mock/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Net-DNS-Resolver-Mock' +pkgname=perl-Net-DNS-Resolver-Mock +version=1.20170814 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl perl-Net-DNS" +depends="${makedepends}" +short_desc="Mock a DNS Resolver object for testing" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="http://search.cpan.org/dist/Net-DNS-Resolver-Mock" +distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-${version}.tar.gz" +checksum=d9853cc65ed8dea1ad2f2c548897151eecbb66ba7c767f88254deb2ab6b3c2e1 diff --git a/srcpkgs/perl-YAML-LibYAML/template b/srcpkgs/perl-YAML-LibYAML/template new file mode 100644 index 0000000000..1b2c3f2e9d --- /dev/null +++ b/srcpkgs/perl-YAML-LibYAML/template @@ -0,0 +1,16 @@ +# Template file for 'perl-YAML-LibYAML' +pkgname=perl-YAML-LibYAML +version=0.69 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="${makedepends}" +short_desc="Perl YAML Serialization using XS and libyaml" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="http://search.cpan.org/dist/YAML-LibYAML" +distfiles="${CPAN_SITE}/YAML/YAML-LibYAML-${version}.tar.gz" +checksum=6348ba03ff04d22330f05397d55ed26d4e40e921efcc207fa15fcbba87dcba1a diff --git a/srcpkgs/phorward/template b/srcpkgs/phorward/template index e36745f08a..f6c4bd6ca4 100644 --- a/srcpkgs/phorward/template +++ b/srcpkgs/phorward/template @@ -1,6 +1,6 @@ # Template build file for 'phorward' pkgname=phorward -version=0.22.0 +version=0.22.3 revision=1 build_style=gnu-configure short_desc="Software package consisting of a powerful C functions library" @@ -8,12 +8,16 @@ maintainer="Juan RP " license="BSD-3-Clause" homepage="http://www.phorward-software.com" distfiles="https://github.com/phorward/phorward/archive/v${version}.tar.gz" -checksum=9656eea3b52f6774b06bcf5ad6b6328e9a0f0b5312db559a63a3d83cf7ea74b7 +checksum=da2543472e2308507b2cbc66e13708bd97457a16cfdfac87e9a0073e87604480 + +post_install() { + vlicense LICENSE +} libphorward_package() { short_desc+=" - libraries" pkg_install() { - vmove usr/lib/libphorward.so.* + vmove "usr/lib/libphorward.so.*" } } diff --git a/srcpkgs/plymouth/files/71-plymouth-seat.rules b/srcpkgs/plymouth/files/71-plymouth-seat.rules new file mode 100644 index 0000000000..a49d446f3d --- /dev/null +++ b/srcpkgs/plymouth/files/71-plymouth-seat.rules @@ -0,0 +1,9 @@ +ACTION=="remove", GOTO="seat_end" + +SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="seat", TAG+="master-of-seat" +SUBSYSTEM=="drm", KERNEL=="card[0-9]*", TAG+="seat", TAG+="master-of-seat" + +TAG=="seat", ENV{ID_PATH}=="", IMPORT{builtin}="path_id" +TAG=="seat", ENV{ID_FOR_SEAT}=="", ENV{ID_PATH_TAG}!="", ENV{ID_FOR_SEAT}="$env{SUBSYSTEM}-$env{ID_PATH_TAG}" + +LABEL="seat_end" diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index cf334245dc..8071db942d 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -1,7 +1,7 @@ # Template file for 'plymouth' pkgname=plymouth version=0.9.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-system-root-install=no \ --without-rhgb-compat-link --enable-systemd-integration=no \ @@ -25,6 +25,10 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +post_install() { + vinstall ${FILESDIR}/71-plymouth-seat.rules 644 usr/lib/udev/rules.d/ +} + plymouth-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/powerstat/template b/srcpkgs/powerstat/template index 631d6bc931..d63c4d99c1 100644 --- a/srcpkgs/powerstat/template +++ b/srcpkgs/powerstat/template @@ -1,14 +1,14 @@ # Template file for 'powerstat' pkgname=powerstat -version=0.02.15 +version=0.02.16 revision=1 build_style=gnu-makefile short_desc="Measures the power consumption using the ACPI battery information" maintainer="Enno Boland " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://kernel.ubuntu.com/~cking/powerstat/" distfiles="http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz" -checksum=bdf7550cf74dddc2aa9160dc279594ac9c360ffab1f9db265fdf9eb3b1300655 +checksum=3589dfecae9f15e47299a9ed101283704d274829e95afdbcd4680040e8195d93 do_build() { make CC=$CC CFLAGS+="-DVERSION=\\\"$version\\\" $CFLAGS" ${makejobs} diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index 4444812d26..216b8fe810 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,8 +1,8 @@ # Template file for 'ppsspp' pkgname=ppsspp -version=1.5.4 +version=1.6 revision=1 -build_wrksrc="${pkgname}-${version}" +build_wrksrc="ppsspp-${version}" build_style=cmake configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1" hostmakedepends="pkg-config" @@ -10,21 +10,21 @@ makedepends="zlib-devel glew-devel SDL2-devel ffmpeg-devel" depends="desktop-file-utils" short_desc="A fast and portable PSP emulator" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.ppsspp.org/" -create_wrksrc=yes distfiles=" https://github.com/hrydgard/ppsspp/archive/v${version}.tar.gz - https://github.com/hrydgard/ppsspp-lang/archive/6f00429315.tar.gz + https://github.com/hrydgard/ppsspp-lang/archive/c2c4ad9c38c5f5e97ff022a703c470fcd53da249.tar.gz https://github.com/hrydgard/glslang/archive/2edde6665d.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f5.tar.gz https://github.com/Kingcom/armips/archive/8b4cadaf62.tar.gz" -checksum="e739155f135f9b3e2e5ce85d0cc11028c4ad71a0078673abe3f908ac6875284a - 8dd3618cb90d38d784aa42c750d81621b7d8ad30b09552a5f60cfe671c3993cc +checksum="d5f7f10b0d39cd927c08bb296a22c9b724ce40f8cc0be17136ff845f33b7ffa5 + 5a97d1a2949482082bb4e7dff7704cb0fe8263a828cc66773e1d70c7bce472dc 5e20a5758c13cc3967a2c31e7017fe4d8135c005733662be4585d9d19b5d8f34 282d1f17bd3003162dd945b8ba5c5a10cb5738a7750949a8200ff6555f10ff28 c4a2bdc231d8e30fb9a19467b7cc9854e844fb3aafc83449e31152b97ace2157" nocross=yes +create_wrksrc=yes pre_configure() { # copy submodules to right location diff --git a/srcpkgs/ppsspp/update b/srcpkgs/ppsspp/update new file mode 100644 index 0000000000..ae1709d246 --- /dev/null +++ b/srcpkgs/ppsspp/update @@ -0,0 +1,2 @@ +site=https://github.com/hrydgard/ppsspp/tags +pattern='/archive/(v?|ppsspp-)?\K[\d\.]+(?=\.tar\.gz")' diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template index 411ecb769d..d8969d11a0 100644 --- a/srcpkgs/py3status/template +++ b/srcpkgs/py3status/template @@ -1,6 +1,6 @@ # Template file for 'py3status' pkgname=py3status -version=3.9 +version=3.10 revision=1 noarch=yes build_style=python3-module @@ -12,7 +12,7 @@ license="BSD-3-Clause" maintainer="teldra " homepage="https://github.com/ultrabug/py3status" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=ca44cfed88943f5e35bef1c7bf928e4517ac4532a505b339ef48fd5a9bf7adcc +checksum=bf1ffdb1ef408d46c819651356e65ec250d50fef7332d0768927daa4688e39d4 post_install() { vlicense LICENSE diff --git a/srcpkgs/pycharm-community/files/pycharm.desktop b/srcpkgs/pycharm-community/files/pycharm.desktop new file mode 100644 index 0000000000..47c62596a8 --- /dev/null +++ b/srcpkgs/pycharm-community/files/pycharm.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=PyCharm +Exec=pycharm %f +Terminal=false +Type=Application +Categories=Development; diff --git a/srcpkgs/pycharm-community/template b/srcpkgs/pycharm-community/template index a427b424c5..0c571f2dbd 100644 --- a/srcpkgs/pycharm-community/template +++ b/srcpkgs/pycharm-community/template @@ -1,14 +1,14 @@ # Template file for 'pycharm-community' pkgname=pycharm-community -version=2017.3.3 +version=2018.1.3 revision=1 depends="virtual?java-environment giflib libXtst" short_desc="Python integrated development environment" maintainer="Felix Van der Jeugt " license="Apache-2.0" -homepage="https://www.jetbrains.org/" +homepage="https://www.jetbrains.org/pycharm/" distfiles="https://download-cf.jetbrains.com/python/${pkgname}-${version}.tar.gz" -checksum=7974700acf1a16e45f8d92adb13dd6460323e3ada58d92064d4d18ef28ba37c9 +checksum=561976581892ae5e6b924ff3ce61958b30ba1610e191211a4799437359c399b3 repository=nonfree nopie=yes only_for_archs="i686 x86_64" @@ -32,4 +32,5 @@ do_install() { fi ln -sf /usr/share/pycharm/bin/pycharm.sh ${DESTDIR}/usr/bin/pycharm + vinstall ${FILESDIR}/pycharm.desktop 644 usr/share/applications } diff --git a/srcpkgs/pycharm-community/update b/srcpkgs/pycharm-community/update new file mode 100644 index 0000000000..866772c028 --- /dev/null +++ b/srcpkgs/pycharm-community/update @@ -0,0 +1 @@ +site='https://data.services.jetbrains.com/products/releases?code=PCC&latest=true&type=release' diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template index 6f3fb5cd2e..a7507f3fd3 100644 --- a/srcpkgs/python-Cheroot/template +++ b/srcpkgs/python-Cheroot/template @@ -1,20 +1,21 @@ -broken="https://github.com/cherrypy/cheroot/blob/master/CHANGES.rst#v630" # Template file for 'python-Cheroot' pkgname=python-Cheroot -version=6.3.0 -revision=1 +version=6.3.1 +revision=2 noarch=yes wrksrc="cheroot-${version}" build_style=python-module pycompile_module="cheroot" hostmakedepends="python-setuptools python3-setuptools" -depends="python-six python-more-itertools python-backports.functools_lru_cache" +depends="python-setuptools python-six python-more-itertools + python-backports.functools_lru_cache" short_desc="High-performance, pure-Python HTTP server (Python2)" maintainer="Andrea Brancaleoni " license="BSD-3-Clause" homepage="https://github.com/cherrypy/cheroot" distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz" -checksum=56c07903580d51ebd456e764d2bef334e97025369cfe6af56357053a9ff72446 +checksum=e83ecc6bd473c340a10adac19cc69c65607638fa3e8b37cf0b26b6fdf4db4994 +alternatives="cheroot:cheroot:/usr/bin/cheroot2" pre_build() { sed -i setup.py \ @@ -28,9 +29,11 @@ post_install() { python3-Cheroot_package() { noarch=yes pycompile_module="cheroot" - depends="python3-six python3-more-itertools" + depends="python3-setuptools python3-six python3-more-itertools" + alternatives="cheroot:cheroot:/usr/bin/cheroot3" short_desc="${short_desc/Python2/Python3}" pkg_install() { + vmove usr/bin/*3 vmove usr/lib/python3* vlicense LICENSE.md } diff --git a/srcpkgs/python-CherryPy/template b/srcpkgs/python-CherryPy/template index 443599f33b..79f80c976f 100644 --- a/srcpkgs/python-CherryPy/template +++ b/srcpkgs/python-CherryPy/template @@ -1,4 +1,3 @@ -broken="Missing portend dependency" # Template file for 'python-CherryPy' pkgname=python-CherryPy version=15.0.0 diff --git a/srcpkgs/python-Flask-OAuthlib/template b/srcpkgs/python-Flask-OAuthlib/template index 58f0a5af6b..9252c7dc0a 100644 --- a/srcpkgs/python-Flask-OAuthlib/template +++ b/srcpkgs/python-Flask-OAuthlib/template @@ -1,7 +1,7 @@ # Template file for 'python-Flask-OAuthlib' pkgname=python-Flask-OAuthlib -version=0.9.4 -revision=2 +version=0.9.5 +revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python-Flask python-requests-oauthlib" short_desc="OAuthlib for Flask (Python2)" maintainer="Eivind Uggedal " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/lepture/flask-oauthlib" distfiles="${PYPI_SITE}/F/Flask-OAuthlib/Flask-OAuthlib-${version}.tar.gz" -checksum=bcd6f2f4f58c764824a1de31b9beae22585c5191992d298c0be0b3118dfcbdc6 +checksum=cbfe835902569909a19828582c3381148995ad677243016ccad9c951acf69406 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-Markups/template b/srcpkgs/python-Markups/template index 9312829c50..d029df420f 100644 --- a/srcpkgs/python-Markups/template +++ b/srcpkgs/python-Markups/template @@ -1,19 +1,20 @@ # Template file for 'python-Markups' pkgname=python-Markups -version=2.0.1 -revision=2 +version=3.0.0 +revision=1 noarch=yes wrksrc="Markups-${version}" build_style=python-module +pycompile_module="markups" hostmakedepends="python-setuptools python3-setuptools" depends="python" -pycompile_module="markups" short_desc="Wrapper around the various text markup languages (Python2)" maintainer="Enno Boland " +changelog="https://raw.githubusercontent.com/retext-project/pymarkups/master/changelog" +license="BSD-3-Clause" homepage="https://github.com/mitya57/pymarkups" -license="BSD" distfiles="${PYPI_SITE}/M/Markups/Markups-${version}.tar.gz" -checksum=ef65593afe187cd1135da1a9c9f6dde2b0ecd2cda4895790628d270e8b0b7030 +checksum=1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-MiniMock/template b/srcpkgs/python-MiniMock/template index c83354267d..5a2b8a0a5d 100644 --- a/srcpkgs/python-MiniMock/template +++ b/srcpkgs/python-MiniMock/template @@ -1,10 +1,11 @@ # Template file for 'python-MiniMock' pkgname=python-MiniMock version=1.2.8 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module -pycompile_module="minimock" +pycompile_module="minimock.py" hostmakedepends="python-setuptools python3-setuptools" depends="python" short_desc="The simplest possible mock library in Python2" @@ -13,7 +14,6 @@ license="MIT" homepage="https://pypi.org/project/MiniMock/" distfiles="${PYPI_SITE}/M/MiniMock/MiniMock-${version}.tar.gz" checksum=5fdfdfeadf0fc781d0592a1b90d2fcc11581f682ff7cba6201cfdb15c3ea5a4c -noarch=yes post_install() { vlicense docs/license.txt @@ -21,8 +21,8 @@ post_install() { python3-MiniMock_package() { noarch=yes - pycompile_module="minimock" depends="python3" + pycompile_module="minimock.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-SPARQLWrapper/template b/srcpkgs/python-SPARQLWrapper/template index 1bc8afa252..d496c77f5d 100644 --- a/srcpkgs/python-SPARQLWrapper/template +++ b/srcpkgs/python-SPARQLWrapper/template @@ -1,19 +1,19 @@ # Template file for 'python-SPARQLWrapper' pkgname=python-SPARQLWrapper -version=1.8.1 +version=1.8.2 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" build_style=python-module +pycompile_module="SPARQLWrapper" hostmakedepends="python-setuptools python3-setuptools" depends="python-rdflib" -pycompile_module="SPARQLWrapper" short_desc="SPARQL Endpoint interface to Python (Python2)" maintainer="Juan RP " homepage="https://rdflib.github.io/sparqlwrapper/" license="W3C" distfiles="${PYPI_SITE}/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz" -checksum=da760be6f448f2030f2b4f7cecd4c55b0c2133458d5c420c50f78169db133e82 +checksum=7f4c8d38ea1bfcffbc358c9a05de35a3fd7152cc3e8ea57963ee7a0a242f7a5e python3-SPARQLWrapper_package() { noarch=yes diff --git a/srcpkgs/python-appdirs/template b/srcpkgs/python-appdirs/template index cf406e6349..ac4fce9dea 100644 --- a/srcpkgs/python-appdirs/template +++ b/srcpkgs/python-appdirs/template @@ -1,18 +1,19 @@ # Template file for 'python-appdirs' pkgname=python-appdirs version=1.4.3 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module -pycompile_module="appdirs" +pycompile_module="appdirs.py" hostmakedepends="python-setuptools python3-setuptools" -short_desc="A small Python2 module for determining appropiate appdirs" +depends="python" +short_desc="Python2 module for determining appropriate platform-specific dirs" maintainer="maxice8 " license="MIT" -homepage="http://github.com/ActiveState/appdirs" +homepage="https://github.com/ActiveState/appdirs/" distfiles="${PYPI_SITE}/a/appdirs/appdirs-${version}.tar.gz" checksum=9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 -noarch=yes do_check() { python setup.py test @@ -24,7 +25,8 @@ post_install() { python3-appdirs_package() { noarch=yes - pycompile_module="appdirs" + depends="python3" + pycompile_module="appdirs.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-chess/template b/srcpkgs/python-chess/template index 513f252b02..8db35e5f7f 100644 --- a/srcpkgs/python-chess/template +++ b/srcpkgs/python-chess/template @@ -1,6 +1,6 @@ # Template file for 'python-chess' pkgname=python-chess -version=0.23.5 +version=0.23.6 revision=1 noarch=yes build_style=python-module @@ -12,7 +12,7 @@ maintainer="cipr3s " license="GPL-3.0-or-later" homepage="https://github.com/niklasf/python-chess" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=e8741b8ea94b7749697db3dd4811b7706b94f52dfd00eb29a14cfc54b7e84e6a +checksum=9fff4cc105b63b64b79e602760e89d4e622d8a1193fe69a42bb17ad53e5a6020 python3-chess_package() { noarch=yes diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python-coverage/patches/no-versioned-coverage.patch new file mode 100644 index 0000000000..18e9d541c1 --- /dev/null +++ b/srcpkgs/python-coverage/patches/no-versioned-coverage.patch @@ -0,0 +1,16 @@ +--- setup.py.orig ++++ setup.py +@@ -86,12 +86,9 @@ setup_args = dict( + }, + + entry_points={ +- # Install a script as "coverage", and as "coverage[23]", and as +- # "coverage-2.7" (or whatever). ++ # Install a script as "coverage" + 'console_scripts': [ + 'coverage = coverage.cmdline:main', +- 'coverage%d = coverage.cmdline:main' % sys.version_info[:1], +- 'coverage-%d.%d = coverage.cmdline:main' % sys.version_info[:2], + ], + }, + diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template index fb2ef64a9b..03a427aa69 100644 --- a/srcpkgs/python-coverage/template +++ b/srcpkgs/python-coverage/template @@ -1,11 +1,12 @@ # Template file for 'python-coverage' pkgname=python-coverage version=4.5.1 -revision=1 +revision=2 wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="coverage" hostmakedepends="python-setuptools python3-setuptools" +makedepends="python-devel python3-devel" depends="python-setuptools" short_desc="Code coverage testing for Python2" maintainer="maxice8 " @@ -13,17 +14,15 @@ license="Apache-2.0" homepage="https://bitbucket.org/ned/coveragepy" distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz" checksum=56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1 -alternatives="python-coverage:coverage:/usr/bin/coverage2" -noarch=yes +alternatives="coverage:coverage:/usr/bin/coverage2" python3-coverage_package() { - noarch=yes pycompile_module="coverage" - short_desc="${short_desc/Python2/Python3}" - alternatives="python-coverage:coverage:/usr/bin/coverage3" depends="python3-setuptools" + short_desc="${short_desc/Python2/Python3}" + alternatives="coverage:coverage:/usr/bin/coverage3" pkg_install() { - vmove "usr/bin/*3*" - vmove /usr/lib/python3* + vmove usr/bin/*3 + vmove usr/lib/python3* } } diff --git a/srcpkgs/python-cram/template b/srcpkgs/python-cram/template index fcb19b3731..191c71922c 100644 --- a/srcpkgs/python-cram/template +++ b/srcpkgs/python-cram/template @@ -1,25 +1,25 @@ # Template file for 'python-cram' pkgname=python-cram version=0.7 -revision=1 +revision=2 +noarch=yes wrksrc="cram-${version}" build_style=python-module pycompile_module="cram" hostmakedepends="python-setuptools python3-setuptools" depends="python" -short_desc="Simple testing framework in Python2 for commandline applications" +short_desc="Simple testing framework for commandline applications (Python2)" maintainer="maxice8 " license="GPL-2" homepage="https://bitheap.org/cram/" distfiles="${PYPI_SITE}/c/cram/cram-${version}.tar.gz" checksum=7da7445af2ce15b90aad5ec4792f857cef5786d71f14377e9eb994d8b8337f2f -alternatives="python-cram:cram:/usr/bin/cram2" -noarch=yes +alternatives="cram:cram:/usr/bin/cram2" python3-cram_package() { noarch=yes pycompile_module="cram" - alternatives="python-cram:cram:/usr/bin/cram3" + alternatives="cram:cram:/usr/bin/cram3" short_desc="${short_desc/Python2/Python3}" depends="python3" pkg_install() { diff --git a/srcpkgs/python-curtsies/patches/fix-setup.py.patch b/srcpkgs/python-curtsies/patches/fix-setup.py.patch new file mode 100644 index 0000000000..a7587e733e --- /dev/null +++ b/srcpkgs/python-curtsies/patches/fix-setup.py.patch @@ -0,0 +1,11 @@ +--- setup.py.orig ++++ setup.py +@@ -41,7 +41,7 @@ def get_long_description(): + install_requires = [ + 'blessings>=1.5', + 'wcwidth>=0.1.4', +- 'typing', ++ 'typing;python_version<"3.5"', + ], + tests_require = [ + 'mock', diff --git a/srcpkgs/python-curtsies/template b/srcpkgs/python-curtsies/template index cc61c6fbdc..a9b557d420 100644 --- a/srcpkgs/python-curtsies/template +++ b/srcpkgs/python-curtsies/template @@ -1,19 +1,19 @@ # Template file for 'python-curtsies' pkgname=python-curtsies -version=0.2.12 +version=0.3.0 revision=1 noarch=yes wrksrc="curtsies-${version}" build_style=python-module pycompile_module="curtsies" hostmakedepends="python-setuptools python3-setuptools" -depends="python-blessings>=1.5 python-wcwidth>=0.1.4" +depends="python-blessings python-wcwidth python-typing" short_desc="Curses-like terminal wrapper, with colored strings (Python2)" maintainer="Maurizio Porrato " homepage="https://github.com/thomasballinger/curtsies" license="MIT" distfiles="${PYPI_SITE}/c/curtsies/curtsies-${version}.tar.gz" -checksum=691047d1f8e97daec01866e762706743d0d7461ff69e04acb704dee4b55722cb +checksum=89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9 post_install() { vlicense LICENSE @@ -22,7 +22,7 @@ post_install() { python3-curtsies_package() { noarch=yes pycompile_module="curtsies" - depends="python3-blessings>=1.5 python3-wcwidth>=0.1.4" + depends="python3-blessings python3-wcwidth" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-envdir/files/LICENSE b/srcpkgs/python-envdir/files/LICENSE deleted file mode 100644 index 939d8e18c0..0000000000 --- a/srcpkgs/python-envdir/files/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2013 Jannis Leidel and contributors - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. - diff --git a/srcpkgs/python-envdir/template b/srcpkgs/python-envdir/template index 304dfba31e..5a370a2e2f 100644 --- a/srcpkgs/python-envdir/template +++ b/srcpkgs/python-envdir/template @@ -1,23 +1,22 @@ # Template file for 'python-envdir' pkgname=python-envdir version=1.0.1 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="envdir" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools" -short_desc="A Python2 port of daemontools' envdir" +short_desc="Python2 port of daemontools' envdir" maintainer="maxice8 " license="MIT" homepage="https://github.com/jezdez/envdir" distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz" checksum=779a308a07a673f391db87ef639d4b0f9921238bba02dd3e98c3281520faee95 -noarch=yes alternatives=" - python-envdir:envdir:/usr/bin/envdir2 - python-envdir:envshell:/usr/bin/envshell2 -" + envdir:envdir:/usr/bin/envdir2 + envdir:envshell:/usr/bin/envshell2" post_install() { vlicense LICENSE @@ -25,9 +24,8 @@ post_install() { python3-envdir_package() { alternatives=" - python-envdir:envdir:/usr/bin/envdir3 - python-envdir:envshell:/usr/bin/envshell3 - " + envdir:envdir:/usr/bin/envdir3 + envdir:envshell:/usr/bin/envshell3" noarch=yes pycompile_module="envdir" depends="python3-setuptools" diff --git a/srcpkgs/python-ewmh/template b/srcpkgs/python-ewmh/template index bb8425d654..d64d91c70e 100644 --- a/srcpkgs/python-ewmh/template +++ b/srcpkgs/python-ewmh/template @@ -1,25 +1,25 @@ # Template file for 'python-ewmh' pkgname=python-ewmh version=0.1.6 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="ewmh" hostmakedepends="python-setuptools python3-setuptools" depends="python-xlib" -short_desc="Python implementation of Extended Window Manager Hints, based on Xlib" +short_desc="Python2 implementation of EWMH (Extended Window Manager Hints)" maintainer="maxice8 " -license="GPL-3" +license="LGPL-3.0-or-later" homepage="https://github.com/parkouss/pyewmh" distfiles="${PYPI_SITE}/e/ewmh/ewmh-${version}.tar.gz" checksum=c56b093f7d575181e979bb3a7d15c34065755f811c351ff0a31fede12b09343d -noarch=yes python3-ewmh_package() { - noarch="yes" - depends="python3 python3-xlib" + noarch=yes + depends="python3-xlib" pycompile_module="ewmh" - short_desc="${short_desc/Python/Python3}" + short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* } diff --git a/srcpkgs/python-flaky/template b/srcpkgs/python-flaky/template index c934434cc8..b5e1191d5a 100644 --- a/srcpkgs/python-flaky/template +++ b/srcpkgs/python-flaky/template @@ -1,22 +1,25 @@ # Template file for 'python-flaky' pkgname=python-flaky version=3.4.0 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_modules="flaky" hostmakedepends="python-setuptools python3-setuptools" -short_desc="Plugin for nose or py.test that automatically reruns flaky tests" +depends="python" +short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python2)" maintainer="maxice8 " license="Apache-2.0" homepage="https://github.com/box/flaky" distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz" checksum=4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2 -noarch=yes python3-flaky_package() { noarch=yes + depends="python3" pycompile_modules="flaky" + short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* } diff --git a/srcpkgs/python-grako/template b/srcpkgs/python-grako/template index 80f8b901d3..20c012972d 100644 --- a/srcpkgs/python-grako/template +++ b/srcpkgs/python-grako/template @@ -1,32 +1,33 @@ # Template file for 'python-grako' pkgname=python-grako version=3.99.9 -revision=1 -build_style=python-module +revision=2 wrksrc="neogeny-${pkgname/python-/}-275d3c4fe4ac" -hostmakedepends="python-setuptools python3-setuptools" -# XXX: add python-pygraphviz if it is ever packaged, optional depdendency -# for generating diagramas -depends="python python-regex python-colorama python-yaml python-docutils" -short_desc="Grako that takes EBNF as input, and outputs PEG parsers in Python" +build_style=python-module +pycompile_module="grako" +hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython" +makedepends="python-devel python3-devel" +depends="python-setuptools" +short_desc="Grammar compiler, EBNF input, PEG/Packrat parser output (Python2)" maintainer="maxice8 " -license="BSD" +license="BSD-2-Clause" homepage="https://bitbucket.org/neogeny/grako" distfiles="https://bitbucket.org/neogeny/grako/get/${version}.tar.bz2" checksum=82cc8d601a272106ed3bbc09f37b04b85f21cbe4c8bbebb41bb9d57ac419696f -pycompile_module="grako" -noarch=yes +alternatives="grako:grako:/usr/bin/grako2" +pre_build() { + sed -i '/setup_requires=/d' setup.py +} post_install() { vlicense LICENSE.txt } python3-grako_package() { - noarch=yes - # python3-regex is ommited due to being an optional dependency - depends="python3 python3-colorama python3-yaml python3-docutils" pycompile_module="grako" + depends="python3-setuptools" short_desc="${short_desc/Python2/Python3}" + alternatives="grako:grako:/usr/bin/grako3" pkg_install() { vmove usr/lib/python3* vmove usr/bin/grako3 diff --git a/srcpkgs/python-graphviz/template b/srcpkgs/python-graphviz/template index abcf2522e0..9a7be0799c 100644 --- a/srcpkgs/python-graphviz/template +++ b/srcpkgs/python-graphviz/template @@ -1,14 +1,14 @@ # Template file for 'python-graphviz' pkgname=python-graphviz version=0.8.3 -revision=1 +revision=2 noarch=yes wrksrc="${pkgname/python-/}-${version}" build_style=python-module pycompile_module="graphviz" hostmakedepends="python-setuptools python3-setuptools" depends="graphviz python" -short_desc="Simple Python interface for Graphviz" +short_desc="Simple Python2 interface for Graphviz" maintainer="maxice8 " license="MIT" homepage="https://github.com/xflr6/graphviz" diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template index 18d8099fbf..229de61f0e 100644 --- a/srcpkgs/python-hypothesis/template +++ b/srcpkgs/python-hypothesis/template @@ -1,21 +1,21 @@ # Template file for 'python-hypothesis' pkgname=python-hypothesis version=3.55.0 -revision=1 -wrksrc="${pkgname/python-//}-python-${version}" +revision=2 +noarch=yes +wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="hypothesis" hostmakedepends="python-setuptools python3-setuptools" -depends="python-attrs python-coverage python-enum34 python-pandas" +depends="python-attrs python-coverage python-enum34" checkdepends="python-coverage python-enum34 python-pytest python3-coverage python3-flaky python3-pytest python3-pytz" -short_desc="A Python2 library for property based testing" +short_desc="Python2 library for property based testing" maintainer="maxice8 " license="MPL-2.0" -homepage="http://hypothesis.works/" +homepage="https://hypothesis.works/" distfiles="https://github.com/HypothesisWorks/hypothesis-python/archive/${version}.tar.gz" -checksum=d13348dc2bf80c17ccd760580407ad7e2a68921e9cd3b9ee9b2139076abab741 -noarch=yes +checksum=9b9bb4855ddfb2680154b715fad2730212bb75909edb9fb0d8964651df2359d4 do_check() { # pytest doesn't recognize -n switch @@ -33,14 +33,13 @@ do_check() { PYTHONPATH="${PY3PATH}" python3 -m pytest tests/cover PYTHONPATH="${PY3PATH}" python3 -m pytest tests/py3 PYTHONPATH="${PY2PATH}" python2 -m pytest tests/py2 - } python3-hypothesis_package() { noarch=yes pycompile_module="hypothesis" + depends="python3-attrs python3-coverage" short_desc="${short_desc/Python2/Python3}" - depends="python3-attrs python3-coverage python3-pytz python3-pandas" pkg_install() { vmove usr/lib/python3* } diff --git a/srcpkgs/python-magic/template b/srcpkgs/python-magic/template index 75d9fe9985..092ee7ea03 100644 --- a/srcpkgs/python-magic/template +++ b/srcpkgs/python-magic/template @@ -1,8 +1,10 @@ # Template file for 'python-magic' pkgname=python-magic version=0.4.15 -revision=1 +revision=2 +noarch=yes build_style=python-module +pycompile_module="magic.py" hostmakedepends="python-setuptools python3-setuptools" makedepends="python libmagic" short_desc="File type identification using libmagic (Python2)" @@ -11,8 +13,6 @@ license="MIT" homepage="https://github.com/ahupp/python-magic" distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz" checksum=6d730389249ab1e34ffb0a3c5beaa44e116687ffa081e0176dab6c59ff271593 -pycompile_module="magic" -noarch=yes post_install() { vlicense LICENSE @@ -21,7 +21,7 @@ post_install() { python3-magic_package() { noarch=yes depends="python3 libmagic" - pycompile_module="magic" + pycompile_module="magic.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-more-itertools/template b/srcpkgs/python-more-itertools/template index ea53fc4139..5eee9f4df6 100644 --- a/srcpkgs/python-more-itertools/template +++ b/srcpkgs/python-more-itertools/template @@ -1,20 +1,25 @@ # Template file for 'python-more-itertools' pkgname=python-more-itertools -version=4.1.0 +version=4.2.0 revision=1 wrksrc="more-itertools-${version}" build_style=python-module pycompile_module="more_itertools" hostmakedepends="python-setuptools python3-setuptools" depends="python-six" +checkdepends="python3-six" short_desc="More Python2 routines for operating on itertables" maintainer="maxice8 " license="MIT" homepage="https://github.com/erikrose/more-itertools" distfiles="https://github.com/erikrose/more-itertools/archive/${version}.tar.gz" -checksum=658d8828473fa368eb3a903a676e805554b5ea03fcde4c53c936effb54ede846 +checksum=1a6c632624a9c7d710e729c7592608f0558b678a84a0b7dee1b53a914f577234 noarch=yes +do_check() { + python3 setup.py test +} + post_install() { vlicense LICENSE } diff --git a/srcpkgs/python-nose/patches/setup.py.patch b/srcpkgs/python-nose/patches/setup.py.patch new file mode 100644 index 0000000000..617ce52951 --- /dev/null +++ b/srcpkgs/python-nose/patches/setup.py.patch @@ -0,0 +1,18 @@ +--- setup.py.orig ++++ setup.py +@@ -30,7 +30,6 @@ try: + entry_points = { + 'console_scripts': [ + 'nosetests = nose:run_exit', +- 'nosetests%s = nose:run_exit' % py_vers_tag, + ], + 'distutils.commands': [ + ' nosetests = nose.commands:nosetests', +@@ -106,7 +105,6 @@ setup( + license = 'GNU LGPL', + keywords = 'test unittest doctest automatic discovery', + url = 'http://readthedocs.org/docs/nose/', +- data_files = [('man/man1', ['nosetests.1'])], + package_data = {'': ['*.txt', + 'examples/*.py', + 'examples/*/*.py']}, diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template new file mode 100644 index 0000000000..de40a23fc3 --- /dev/null +++ b/srcpkgs/python-nose/template @@ -0,0 +1,30 @@ +# Template file for 'python-nose' +pkgname=python-nose +version=1.3.7 +revision=2 +noarch=yes +wrksrc="nose-${version}" +build_style=python-module +pycompile_modules="nose" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-setuptools" +short_desc="The nicer testing for Python2" +maintainer="maxice8 " +license="LGPL-2.1-or-later" +homepage="https://github.com/nose-devs/nose" +#changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG" +distfiles="${PYPI_SITE}/n/nose/nose-${version}.tar.gz" +checksum=f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 +alternatives="nose:nosetests:/usr/bin/nosetests2" + +python3-nose_package() { + noarch=yes + pycompile_module="nose" + depends="python3-setuptools" + short_desc="${short_desc/Python2/Python3}" + alternatives="nose:nosetests:/usr/bin/nosetests3" + pkg_install() { + vmove usr/bin/*3 + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-nose2/patches/no-versioned-nose2.patch b/srcpkgs/python-nose2/patches/no-versioned-nose2.patch new file mode 100644 index 0000000000..bfe3dfa0c2 --- /dev/null +++ b/srcpkgs/python-nose2/patches/no-versioned-nose2.patch @@ -0,0 +1,10 @@ +--- setup.py.orig ++++ setup.py +@@ -89,7 +89,6 @@ else: + params['entry_points'] = { + 'console_scripts': [ + '%s = nose2:discover' % SCRIPT1, +- '%s = nose2:discover' % SCRIPT2, + ], + } + params['install_requires'] = parse_requirements('requirements.txt') diff --git a/srcpkgs/python-nose2/template b/srcpkgs/python-nose2/template index 483594bd86..9c842785f2 100644 --- a/srcpkgs/python-nose2/template +++ b/srcpkgs/python-nose2/template @@ -1,33 +1,36 @@ # Template file for 'python-nose2' pkgname=python-nose2 version=0.7.4 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="nose2" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools python-coverage python-six python-mock" -short_desc="Nose2 is the next generation of nicer testing for Python2" +short_desc="The next generation of nicer testing (Python2)" maintainer="maxice8 " -license="2-Clause-BSD" +license="BSD-2-Clause" homepage="https://github.com/nose-devs/nose2" distfiles="${PYPI_SITE}/n/nose2/nose2-${version}.tar.gz" checksum=954a62cfb2d2ac06dad32995cbc822bf00cc11e20d543963515932fd4eff33fa -alternatives="python-nose2:nosetest:/usr/bin/nose2-2.7" -noarch=yes +alternatives="nose2:nose2:/usr/bin/python2-nose2" post_install() { vlicense license.txt + # XXX override the default naming scheme + cp -a ${DESTDIR}/usr/bin/nose2 ${DESTDIR}/usr/bin/python3-nose2 + mv ${DESTDIR}/usr/bin/nose2 ${DESTDIR}/usr/bin/python2-nose2 } python3-nose2_package() { noarch=yes - pycompile_Module="nose2" + pycompile_module="nose2" short_desc="${short_desc/Python2/Python3}" depends="python3-setuptools python3-coverage python3-six" - alternatives="python-nose2:nosetest:/usr/bin/nose2-3.6" + alternatives="nose2:nose2:/usr/bin/python3-nose2" pkg_install() { - vmove "usr/bin/*3*" + vmove usr/bin/python3-nose2 vmove usr/lib/python3* vlicense license.txt } diff --git a/srcpkgs/python-oauthlib/template b/srcpkgs/python-oauthlib/template index 6510940e51..3667d288b0 100644 --- a/srcpkgs/python-oauthlib/template +++ b/srcpkgs/python-oauthlib/template @@ -1,6 +1,6 @@ # Template file for 'python-oauthlib' pkgname=python-oauthlib -version=2.0.7 +version=2.1.0 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -11,9 +11,9 @@ depends="python" short_desc="Python2 implementation of the OAuth request-signing logic" maintainer="Eivind Uggedal " license="BSD-3-Clause" -homepage="https://github.com/idan/oauthlib" +homepage="https://github.com/oauthlib/oauthlib" distfiles="${PYPI_SITE}/o/oauthlib/oauthlib-${version}.tar.gz" -checksum=909665297635fa11fe9914c146d875f2ed41c8c2d78e21a529dd71c0ba756508 +checksum=ac35665a61c1685c56336bda97d5eefa246f1202618a1d6f34fccb1bdd404162 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-owm/template b/srcpkgs/python-owm/template index 6adca7d48d..e679b23504 100644 --- a/srcpkgs/python-owm/template +++ b/srcpkgs/python-owm/template @@ -1,13 +1,13 @@ # Template file for 'python-owm' pkgname=python-owm version=2.8.0 -revision=1 +revision=2 wrksrc="pyowm-${version}" build_style=python2-module pycompile_module="pyowm" hostmakedepends="python-setuptools" -depends="python" -short_desc="A Python2 wrapper around the OpenWeatherMap web API" +depends="python-requests" +short_desc="Python2 wrapper around the OpenWeatherMap web API" maintainer="maxice8 " license="MIT" homepage="https://github.com/csparpa/pyowm" diff --git a/srcpkgs/python-parse/template b/srcpkgs/python-parse/template index 96d5d93c9f..3471bf6074 100644 --- a/srcpkgs/python-parse/template +++ b/srcpkgs/python-parse/template @@ -1,7 +1,7 @@ # Template file for 'python-parse' pkgname=python-parse -version=1.8.2 -revision=2 +version=1.8.4 +revision=1 noarch=yes wrksrc="parse-${version}" build_style=python-module @@ -13,7 +13,11 @@ maintainer="Eivind Uggedal " license="MIT" homepage="https://github.com/r1chardj0n3s/parse" distfiles="${PYPI_SITE}/p/parse/parse-${version}.tar.gz" -checksum=8048dde3f5ca07ad7ac7350460952d83b63eaacecdac1b37f45fd74870d849d2 +checksum=c3cdf6206f22aeebfa00e5b954fcfea13d1b2dc271c75806b6025b94fb490939 + +do_check() { + python3 setup.py test +} post_install() { sed -n '/Copyright/,/SOFTWARE\./p' parse.py >LICENSE diff --git a/srcpkgs/python-parso/template b/srcpkgs/python-parso/template index d84c845132..d3aa9d76d3 100644 --- a/srcpkgs/python-parso/template +++ b/srcpkgs/python-parso/template @@ -1,6 +1,6 @@ # Template file for 'python-parso' pkgname=python-parso -version=0.2.0 +version=0.2.1 revision=1 noarch=yes wrksrc="parso-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/davidhalter/parso" license="MIT" distfiles="${PYPI_SITE}/p/parso/parso-${version}.tar.gz" -checksum=62bd6bf7f04ab5c817704ff513ef175328676471bdef3629d4bdd46626f75551 +checksum=f0604a40b96e062b0fd99cf134cc2d5cdf66939d0902f8267d938b0d5b26707f post_install() { vlicense LICENSE.txt LICENSE diff --git a/srcpkgs/python-pdfrw-example b/srcpkgs/python-pdfrw-example deleted file mode 120000 index 031da98853..0000000000 --- a/srcpkgs/python-pdfrw-example +++ /dev/null @@ -1 +0,0 @@ -python-pdfrw \ No newline at end of file diff --git a/srcpkgs/python-pdfrw/template b/srcpkgs/python-pdfrw/template index e0097384fc..164f33e1bc 100644 --- a/srcpkgs/python-pdfrw/template +++ b/srcpkgs/python-pdfrw/template @@ -1,42 +1,37 @@ # Template file for 'python-pdfrw' pkgname=python-pdfrw version=0.4 -revision=1 +revision=2 +noarch=yes +replaces="python-pdfrw-example<${version}_${revision}" wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="pdfrw" -noarch=yes hostmakedepends="python-setuptools python3-setuptools" depends="python" -short_desc="Pdfrw is a pure Python2 library that reads and writes PDFs" +short_desc="Pure Python2 library that reads and writes PDFs" maintainer="maxice8 " -license="MIT, BSD" +license="MIT, BSD-3-Clause" homepage="https://github.com/pmaupin/pdfrw" distfiles="${PYPI_SITE}/p/pdfrw/pdfrw-${version}.tar.gz" checksum=0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4 post_install() { vlicense LICENSE.txt + vmkdir usr/share/examples/${pkgname} + vcopy examples/* usr/share/examples/${pkgname} } python3-pdfrw_package() { + replaces="python-pdfrw-example<${version}_${revision}" noarch=yes pycompile_module="pdfrw" depends="python3" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vmkdir usr/share/examples/${pkgname} + vcopy examples/* usr/share/examples/${pkgname} vlicense LICENSE.txt } } - -python-pdfrw-example_package() { - noarch=yes - short_desc+=" - example scripts" - pkg_install() { - vmkdir usr/share/"${pkgname}"/example - vcopy "${wrksrc}/examples/*" usr/share/"${pkgname}"/example - } -} - - diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template index 094fbfa45a..2a94054de8 100644 --- a/srcpkgs/python-peewee/template +++ b/srcpkgs/python-peewee/template @@ -1,7 +1,7 @@ # Template file for 'python-peewee' pkgname=python-peewee -version=3.3.4 -revision=2 +version=3.4.0 +revision=1 wrksrc="peewee-${version}" build_style=python-module pycompile_module="playhouse peewee.py pwiz.py" @@ -12,7 +12,7 @@ maintainer="johannes " license="MIT" homepage="https://github.com/coleifer/peewee" distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz" -checksum=b36f4aec9b29bc97237588534b020a4bc6c401986cc918be731490f28e05764e +checksum=fb2e5a2fb3ce41e2f6cbb2c91f08b6cdf364514b62b5a379f799b6df31a24594 alternatives="peewee:pwiz:/usr/bin/pwiz.py2" post_install() { diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template index a43eb094bc..be1e50ffef 100644 --- a/srcpkgs/python-prctl/template +++ b/srcpkgs/python-prctl/template @@ -1,26 +1,20 @@ # Template file for 'python-prctl' pkgname=python-prctl version=1.7 -revision=1 +revision=2 build_style=python-module -pycompile_module="prctl" -hostmakedepends="python-setuptools python3-setuptools" +pycompile_module="prctl.py" +hostmakedepends="python-setuptools python3-setuptools libcap-devel" makedepends="libcap-devel python-devel python3-devel" -depends="python" short_desc="Python2 interface for the Linux prctl syscall" maintainer="maxice8 " -license="GPL-3+" +license="GPL-3.0-or-later" homepage="https://github.com/seveas/python-prctl" distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz" checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5 -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" ${makedepends}" -fi - python3-prctl_package() { - pycompile_module="prctl" - depends="python3" + pycompile_module="prctl.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template index d7a3b6010e..aed740fa05 100644 --- a/srcpkgs/python-pyasn1/template +++ b/srcpkgs/python-pyasn1/template @@ -1,19 +1,19 @@ # Template file for 'python-pyasn1' pkgname=python-pyasn1 -version=0.4.2 +version=0.4.3 revision=1 noarch=yes wrksrc="pyasn1-${version}" build_style=python-module +pycompile_module="pyasn1" hostmakedepends="python-setuptools python3-setuptools" depends="python" -pycompile_module="pyasn1" short_desc="ASN.1 library for Python2" maintainer="Alessio Sergi " homepage="https://github.com/etingof/pyasn1" -license="2-clause-BSD" +license="BSD-2-Clause" distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz" -checksum=d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15 +checksum=fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc post_install() { vlicense LICENSE.rst LICENSE diff --git a/srcpkgs/python-pycountry/template b/srcpkgs/python-pycountry/template index 67079f1447..65161f0bd4 100644 --- a/srcpkgs/python-pycountry/template +++ b/srcpkgs/python-pycountry/template @@ -1,6 +1,6 @@ # Template file for 'python-pycountry' pkgname=python-pycountry -version=18.2.23 +version=18.5.20 revision=1 noarch=yes wrksrc="pycountry-${version}" @@ -13,7 +13,7 @@ maintainer="Farhad Shahbazi " license="LGPL-2.1" homepage="https://pypi.org/project/pycountry/" distfiles="${PYPI_SITE}/p/pycountry/pycountry-${version}.tar.gz" -checksum=46e4b1a21516e41fe6f8c0ef7a9876da8ce9ac3f719e3fed79cf79fd9b6206ee +checksum=d2da27a75d1fcf90e0f116dd5aabb6e7c9ae987f6e205e6ff9096fa8cd9bfccb python3-pycountry_package() { noarch=yes diff --git a/srcpkgs/python-pytest-capturelog/files/LICENSE.txt b/srcpkgs/python-pytest-capturelog/files/LICENSE.txt deleted file mode 100644 index 5cca5a1b8c..0000000000 --- a/srcpkgs/python-pytest-capturelog/files/LICENSE.txt +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License - -Copyright (c) 2010 Meme Dough - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - diff --git a/srcpkgs/python-pytest-capturelog/template b/srcpkgs/python-pytest-capturelog/template deleted file mode 100644 index 5ddb77e3d9..0000000000 --- a/srcpkgs/python-pytest-capturelog/template +++ /dev/null @@ -1,31 +0,0 @@ -# Template file for 'python-pytest-capturelog' -pkgname=python-pytest-capturelog -version=0.7 -revision=1 -wrksrc="${pkgname/python-/}-${version}" -build_style=python-module -pycompile_module="pytest_capturelog.py" -hostmakedepends="python-setuptools python3-setuptools" -depends="python-py" -short_desc="Plugin for py.test to capture log messages for Python2" -maintainer="maxice8 " -license="MIT" -homepage="http://bitbucket.org/memedough/pytest-capturelog/overview" -distfiles="${PYPI_SITE}/p/${pkgname/python-/}/${pkgname/python-/}-${version}.tar.gz" -checksum=b6e8d5189b39462109c2188e6b512d6cc7e66d62bb5be65389ed50e96d22000d -noarch=yes - -post_install() { - vlicense "${FILESDIR}/LICENSE.txt" -} - -python3-pytest-capturelog_package() { - noarch=yes - pycompile_module="pytest_capturelog.py" - short_desc="${short_desc/Python2/Python3}" - depends="python3-py" - pkg_install() { - vmove usr/lib/python3* - vlicense "${FILESDIR}/LICENSE.txt" - } -} diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template index 880a0fc217..d3d47bdce0 100644 --- a/srcpkgs/python-pytest/template +++ b/srcpkgs/python-pytest/template @@ -1,7 +1,7 @@ # Template file for 'python-pytest' pkgname=python-pytest -version=3.5.1 -revision=2 +version=3.6.0 +revision=1 noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module @@ -16,7 +16,7 @@ maintainer="maxice8 " license="MIT" homepage="https://docs.pytest.org/en/latest/" distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz" -checksum=54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8 +checksum=39555d023af3200d004d09e51b4dd9fdd828baa863cded3fd6ba2f29f757ae2d alternatives=" pytest:pytest:/usr/bin/pytest2 pytest:py.test:/usr/bin/py.test2" diff --git a/srcpkgs/python-raven/template b/srcpkgs/python-raven/template index d42e03f876..995b90a8d3 100644 --- a/srcpkgs/python-raven/template +++ b/srcpkgs/python-raven/template @@ -1,6 +1,6 @@ # Template file for 'python-raven' pkgname=python-raven -version=6.7.0 +version=6.8.0 revision=1 noarch=yes wrksrc="raven-${version}" @@ -13,7 +13,7 @@ maintainer="Michael Aldridge " license="BSD-3-Clause" homepage="https://github.com/getsentry/raven-python" distfiles="${PYPI_SITE}/r/raven/raven-${version}.tar.gz" -checksum=f908e9b39f02580e7f822030d119ed3b2e8d32300a2fec6373e5827d588bbae7 +checksum=95aecf76c414facaddbb056f3e98c7936318123e467728f2e50b3a66b65a6ef7 alternatives="raven:raven:/usr/bin/raven2" post_install() { diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template index 6e57312e02..0e9f8d6fd6 100644 --- a/srcpkgs/python-snappy/template +++ b/srcpkgs/python-snappy/template @@ -5,9 +5,7 @@ revision=1 build_style=python-module pycompile_module="snappy" hostmakedepends="python-setuptools python3-setuptools" -checkdepends="python-nose2 python-cffi" makedepends="python-devel python3-devel snappy-devel" -depends="python" short_desc="Python2 bindings for the snappy compression library from Google" maintainer="maxice8 " license="BSD-3-Clause" @@ -15,10 +13,6 @@ homepage="https://github.com/andrix/python-snappy" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" checksum=2ce83e44587adbc7239589048d660a92f899eb45af4e48e73092192a8b0f0789 -do_check() { - nosetest -} - post_install() { vlicense LICENSE } @@ -26,7 +20,6 @@ post_install() { python3-snappy_package() { pycompile_module="snappy" short_desc="${pkgname/Python2/Python3}" - depends="python3" pkg_install() { vmove usr/lib/python3* vlicense LICENSE diff --git a/srcpkgs/python-vispy/template b/srcpkgs/python-vispy/template index 43673d7f56..265d8fca12 100644 --- a/srcpkgs/python-vispy/template +++ b/srcpkgs/python-vispy/template @@ -1,6 +1,6 @@ # Template file for 'python-vispy' pkgname=python-vispy -version=0.5.2 +version=0.5.3 revision=1 noarch=yes pycompile_module="vispy" @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python-numpy" short_desc="Python2 library for interactive scientific visualization" maintainer="johannes " -license="BSD" +license="BSD-3-Clause" homepage="http://vispy.org" distfiles="${PYPI_SITE}/v/vispy/vispy-${version}.tar.gz" -checksum=297b71eff249fd3550ce56512a6c8d10ed21ea42b50591cae0b49348eafb6e85 +checksum=f6c36408df851b91322c928aadb2c8aaf3b31150e11f723784cc81b6280fdcc0 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python-watchdog/template b/srcpkgs/python-watchdog/template index 36e8e9172e..f1cb2020da 100644 --- a/srcpkgs/python-watchdog/template +++ b/srcpkgs/python-watchdog/template @@ -1,25 +1,26 @@ # Template file for 'python-watchdog' pkgname=python-watchdog version=0.8.3 -revision=1 +revision=2 +noarch=yes wrksrc="watchdog-${version}" build_style=python-module pycompile_module="watchdog" -alternatives="watchdog:watchmedo:/usr/bin/watchmedo2" hostmakedepends="python-setuptools python3-setuptools" -makedepends="python-devel python3-devel" -depends="python-yaml python-argh python-pathtools" +depends="python-setuptools python-yaml python-argh python-pathtools" short_desc="Python2 API and shell utilities to monitor file system events" maintainer="Maurizio Porrato " homepage="http://github.com/gorakhargosh/watchdog" license="Apache-2.0" distfiles="${PYPI_SITE}/w/watchdog/watchdog-${version}.tar.gz" checksum=7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162 +alternatives="watchdog:watchmedo:/usr/bin/watchmedo2" python3-watchdog_package() { + noarch=yes pycompile_module="watchdog" alternatives="watchdog:watchmedo:/usr/bin/watchmedo3" - depends="python3-yaml python3-argh python3-pathtools" + depends="python3-setuptools python3-yaml python3-argh python3-pathtools" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-websocket-client/template b/srcpkgs/python-websocket-client/template index 5282fbf315..9eddfdab6e 100644 --- a/srcpkgs/python-websocket-client/template +++ b/srcpkgs/python-websocket-client/template @@ -1,6 +1,6 @@ # Template file for 'python-websocket-client' pkgname=python-websocket-client -version=0.47.0 +version=0.48.0 revision=1 noarch=yes wrksrc="websocket_client-${version}" @@ -10,10 +10,10 @@ depends="python-six ca-certificates" pycompile_module="websocket" short_desc="WebSocket client for Python2" maintainer="Sergi Alvarez " -homepage="https://github.com/websocket-client/websocket-client" license="LGPL-2.1-or-later" +homepage="https://github.com/websocket-client/websocket-client" distfiles="${PYPI_SITE}/w/websocket-client/websocket_client-${version}.tar.gz" -checksum=a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 +checksum=18f1170e6a1b5463986739d9fd45c4308b0d025c1b2f9b88788d8f69e8a5eb4a alternatives="websocket-client:wsdump:/usr/bin/wsdump.py2" pre_build() { diff --git a/srcpkgs/python-xmltodict/template b/srcpkgs/python-xmltodict/template index 306e83a7b5..715cf3f20b 100644 --- a/srcpkgs/python-xmltodict/template +++ b/srcpkgs/python-xmltodict/template @@ -2,22 +2,22 @@ pkgname=python-xmltodict version=0.11.0 revision=1 +noarch=yes wrksrc="xmltodict-${version}" build_style=python-module pycompile_module="xmltodict.py" hostmakedepends="python-setuptools python3-setuptools" depends="python" -checkdepends="python3-nose2" +checkdepends="python3-nose" short_desc="Python2 module that makes working with XML feel like working JSON" maintainer="maxice8 " license="MIT" homepage="https://github.com/martinblech/xmltodict" distfiles="${PYPI_SITE}/x/xmltodict/xmltodict-${version}.tar.gz" checksum=8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df -noarch=yes do_check() { - nosetest + nosetests3 } post_install() { diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template index 740a7f817b..933aa46607 100644 --- a/srcpkgs/python3-aiohttp/template +++ b/srcpkgs/python3-aiohttp/template @@ -1,6 +1,6 @@ # Template file for 'python3-aiohttp' pkgname=python3-aiohttp -version=3.1.3 +version=3.2.1 revision=1 wrksrc="aiohttp-${version}" build_style=python3-module @@ -14,9 +14,10 @@ depends="python3-async-timeout python3-attrs python3-chardet python3-idna-ssl short_desc="HTTP client/server for asyncio (PEP-3156)" maintainer="Michael Aldridge " license="Apache-2.0" +#changelog="https://raw.githubusercontent.com/aio-libs/aiohttp/master/CHANGES.rst" homepage="https://aiohttp.readthedocs.io/" distfiles="https://github.com/aio-libs/aiohttp/archive/v${version}.tar.gz" -checksum=876d74ee986051590cf4af90365fe4268a19586a72024551e84ce6c0c5d11bfa +checksum=6cf1c7fd052bc92e0be940e5b2e877a202d2d0fdf36cbf2aa3ef3c92f4e2327a do_check() { python3 setup.py test diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template index c50d9894f9..7cab8e45d9 100644 --- a/srcpkgs/python3-async-timeout/template +++ b/srcpkgs/python3-async-timeout/template @@ -1,6 +1,6 @@ # Template file for 'python3-async-timeout' pkgname=python3-async-timeout -version=2.0.1 +version=3.0.0 revision=1 noarch=yes wrksrc="async-timeout-${version}" @@ -11,6 +11,7 @@ depends="python3" short_desc="Timeout context manager for asyncio programs" maintainer="Michael Aldridge " license="Apache-2.0" +#changelog="https://raw.githubusercontent.com/aio-libs/async-timeout/master/CHANGES.rst" homepage="https://github.com/aio-libs/async-timeout" distfiles="https://github.com/aio-libs/async-timeout/archive/v${version}.tar.gz" -checksum=75a300199bb1bc11bb79a9ba7525a547ea0d3109000660e4ca57d4069b4544c3 +checksum=48341ca53e51d5e975154e14f3d75444355243482c7319bb95b727a487d92cc8 diff --git a/srcpkgs/python3-idna-ssl/template b/srcpkgs/python3-idna-ssl/template index a3ab53ab84..6e795b477a 100644 --- a/srcpkgs/python3-idna-ssl/template +++ b/srcpkgs/python3-idna-ssl/template @@ -1,7 +1,8 @@ # Template file for 'python3-idna-ssl' pkgname=python3-idna-ssl version=1.0.1 -revision=1 +revision=2 +noarch=yes wrksrc="idna-ssl-${version}" build_style=python3-module pycompile_module="idna_ssl.py" diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template index 6de08d76c8..5772113c14 100644 --- a/srcpkgs/python3-multidict/template +++ b/srcpkgs/python3-multidict/template @@ -1,15 +1,22 @@ # Template file for 'python3-multidict' pkgname=python3-multidict -version=4.2.0 +version=4.3.1 revision=1 wrksrc="multidict-${version}" build_style=python3-module pycompile_module="multidict" hostmakedepends="python3-Cython python3-setuptools" makedepends="python3-devel" +checkdepends="python3-pytest python3-perf" short_desc="Multidict implementation from aiohttp" maintainer="Michael Aldridge " license="Apache-2.0" +#changelog="https://raw.githubusercontent.com/aio-libs/multidict/master/docs/changes.rst" homepage="https://github.com/aio-libs/multidict" distfiles="https://github.com/aio-libs/multidict/archive/v${version}.tar.gz" -checksum=e449839b6f272ec63687c3451dc6d3726491f6a267b701b1bf7549148aaa00c7 +checksum=2d4f7249a11bd4387e2bbb8a29267be927db86b50d1beff9c0f6b53e00d81a65 + +do_check() { + sed -i 's|--cov=multidict||g' pytest.ini + python3 setup.py test +} diff --git a/srcpkgs/python3-nose b/srcpkgs/python3-nose new file mode 120000 index 0000000000..32467a70a1 --- /dev/null +++ b/srcpkgs/python3-nose @@ -0,0 +1 @@ +python-nose \ No newline at end of file diff --git a/srcpkgs/python3-nose/template b/srcpkgs/python3-nose/template deleted file mode 100644 index abb4b97874..0000000000 --- a/srcpkgs/python3-nose/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'python3-nose' -pkgname=python3-nose -version=1.3.7 -revision=1 -wrksrc="nose-release_${version}" -build_style=python3-module -pycompile_modules="nose" -hostmakedepends="python3-setuptools" -depends="python3" -short_desc="Nose is nicer testing for python3" -maintainer="maxice8 " -license="LGPL-2.1-or-later" -homepage="https://github.com/nose-devs/nose" -#changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG" -distfiles="https://github.com/nose-devs/nose/archive/release_${version}.tar.gz" -checksum=ab1ee7744662c5bf58a510ae46d879ebe140c3e40d6871c09b36b24b6a480b39 - -pre_build() { - # fix manpage location - sed -i 's|man/man1|share/man/man1|g' setup.py -} diff --git a/srcpkgs/python3-perf/template b/srcpkgs/python3-perf/template new file mode 100644 index 0000000000..a0cadf3bf3 --- /dev/null +++ b/srcpkgs/python3-perf/template @@ -0,0 +1,21 @@ +# Template file for 'python3-perf' +pkgname=python3-perf +version=1.5.1 +revision=1 +noarch=yes +wrksrc="perf-${version}" +build_style=python3-module +pycompile_module="perf" +hostmakedepends="python3-setuptools" +depends="python3-six" +short_desc="Toolkit to run python benchmarks" +maintainer="maxice8 " +license="MIT" +#changelog="https://raw.githubusercontent.com/vstinner/perf/master/doc/changelog.rst" +homepage="https://github.com/vstinner/perf" +distfiles="https://github.com/vstinner/perf/archive/${version}.tar.gz" +checksum=0b20382c819114bcbb7b6ff27b1259d44a4b68e5b791324ef9a12e0afaa2e294 + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/python3-pytest-capturelog b/srcpkgs/python3-pytest-capturelog deleted file mode 120000 index e6b907ead3..0000000000 --- a/srcpkgs/python3-pytest-capturelog +++ /dev/null @@ -1 +0,0 @@ -python-pytest-capturelog \ No newline at end of file diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template index ae3ea68e11..9c81c815ad 100644 --- a/srcpkgs/python3-yarl/template +++ b/srcpkgs/python3-yarl/template @@ -1,20 +1,20 @@ # Template file for 'python3-yarl' pkgname=python3-yarl -version=1.1.1 +version=1.2.5 revision=1 wrksrc="yarl-${version}" build_style=python3-module pycompile_module="yarl" -hostmakedepends="python3-setuptools python3-Cython" +hostmakedepends="python3-Cython python3-setuptools" makedepends="python3-devel" -depends="python3-multidict python3-idna" -checkdepends="python3-pytest ${depends}" +depends="python3-idna python3-multidict" +checkdepends="python3-idna python3-multidict python3-pytest" short_desc="Yet another URL library" maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://yarl.readthedocs.io/" distfiles="https://github.com/aio-libs/yarl/archive/v${version}.tar.gz" -checksum=90c726bdf744046cfd516f679441a65996ffbc672c28120b14fdd475b1b600a3 +checksum=dd5d9c9ec94eb6b2467de42e7fe6725c8508070d774a13aa2f0695f0945cec19 do_check() { python3 setup.py test diff --git a/srcpkgs/pywal/template b/srcpkgs/pywal/template index 8133c09999..65feaec4f5 100644 --- a/srcpkgs/pywal/template +++ b/srcpkgs/pywal/template @@ -1,6 +1,6 @@ # Template file for 'pywal' pkgname=pywal -version=2.1.0 +version=3.0.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -8,9 +8,10 @@ depends="python3-setuptools ImageMagick" short_desc="Generate and change colorschemes on the fly" maintainer="Yuusha Spacewolf " license="MIT" +#changelog="https://raw.githubusercontent.com/dylanaraps/pywal/master/CHANGELOG.md" homepage="https://github.com/dylanaraps/pywal" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=aa9d9809cf4553a70f2cd041c048a362e52240639dc85f5a5c4b8ac66a6fb70d +checksum=003807f7d0c0edf4a01a935ff77f0df053cec27f035c8cdf41824d284ddedbab noarch=yes post_install() { diff --git a/srcpkgs/qgit/template b/srcpkgs/qgit/template index 0d777c6c7c..1f11fe89a9 100644 --- a/srcpkgs/qgit/template +++ b/srcpkgs/qgit/template @@ -1,6 +1,6 @@ # Template file for 'qgit' pkgname=qgit -version=2.7 +version=2.8 revision=1 build_style=cmake wrksrc="${pkgname}-${pkgname}-${version}" @@ -8,10 +8,10 @@ makedepends="qt5-devel" depends="git" short_desc="Qt-based Git GUI" maintainer="Matthias von Faber " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/tibirna/qgit" distfiles="${homepage}/archive/${pkgname}-${version}.tar.gz" -checksum=183d116b2fb38c6a76c99577f6cc86f0241f8b6bdc74042be4cb8631567f5e9e +checksum=792cf639fbf02eb5ec7e76d05a290062982c142355b65de873cce05e90b8a112 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template index f2a6fbe054..3b958e0de4 100644 --- a/srcpkgs/qscintilla-qt5/template +++ b/srcpkgs/qscintilla-qt5/template @@ -1,17 +1,17 @@ # Template file for 'qscintilla-qt5' pkgname=qscintilla-qt5 -version=2.10 -revision=2 +version=2.10.4 +revision=1 wrksrc="QScintilla_gpl-${version}" build_wrksrc="Qt4Qt5" build_style="qmake" makedepends="qt5-devel" short_desc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class" maintainer="Pierre Allegraud " -homepage="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -license="GPL-3" +homepage="https://www.riverbankcomputing.co.uk/software/qscintilla/intro" +license="GPL-3.0-only" distfiles="${SOURCEFORGE_SITE}/pyqt/${wrksrc}.tar.gz" -checksum=16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec +checksum=0353e694a67081e2ecdd7c80e1a848cf79a36dbba78b2afa36009482149b022d if [ -n "$CROSS_BUILD" ]; then hostmakedepends="qt5-devel" diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update new file mode 100644 index 0000000000..4c5ed097b2 --- /dev/null +++ b/srcpkgs/qscintilla-qt5/update @@ -0,0 +1,3 @@ +site="https://www.riverbankcomputing.com/software/qscintilla/download" +pkgname=QScintilla_gpl +ignore="*dev*" diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index 18858c81c8..770566c0da 100644 --- a/srcpkgs/recoll/template +++ b/srcpkgs/recoll/template @@ -1,6 +1,6 @@ # Template file for 'recoll' pkgname=recoll -version=1.23.3 +version=1.24.1 revision=1 build_style=gnu-configure configure_args="--disable-python-module --enable-recollq --disable-x11mon" @@ -8,10 +8,10 @@ hostmakedepends="automake libtool gettext-devel qt5-qmake" makedepends="xapian-core-devel zlib-devel libuuid-devel qt5-webkit-devel qt5-devel" short_desc="Full text search tool based on Xapian backend" maintainer="Rui Abreu Ferreira " -license="GPL-2" -homepage="http://www.lesbonscomptes.com/recoll/" +license="GPL-2.0-or-later" +homepage="https://www.lesbonscomptes.com/recoll/" distfiles="https://www.lesbonscomptes.com/$pkgname/$pkgname-${version}.tar.gz" -checksum=15125871424ef32ac584eb1c3e4fdd4ac7ff32894db60a3ebff32fa7a45d2eb6 +checksum=1d6433cd79fc25fc2941620eba8be934629189fd078c8b8a4028a301bc7f75eb if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel qt5-webkit-devel" diff --git a/srcpkgs/recoll/update b/srcpkgs/recoll/update new file mode 100644 index 0000000000..dcc285e571 --- /dev/null +++ b/srcpkgs/recoll/update @@ -0,0 +1 @@ +site="https://www.lesbonscomptes.com/recoll/download.html" diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template index 3676f0d91d..c1abaa2e26 100644 --- a/srcpkgs/redshift/template +++ b/srcpkgs/redshift/template @@ -1,19 +1,20 @@ # Template file for 'redshift' pkgname=redshift -version=1.11 -revision=3 +version=1.12 +revision=1 build_style=gnu-configure build_options="geoclue2" configure_args="--enable-gui --disable-geoclue $(vopt_enable geoclue2)" -hostmakedepends="pkg-config intltool gettext-devel python3-devel" -makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2 glib-devel')" -depends="$(vopt_if geoclue2 geoclue2)" +hostmakedepends="gettext-devel intltool pkg-config python3-devel" +makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2 + glib-devel')" +depends="$(vopt_if geoclue2 'geoclue2')" short_desc="Adjusts the color temperature of your screen to your surroundings" maintainer="Juan RP " license="GPL-3" homepage="http://jonls.dk/redshift/" distfiles="https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz" -checksum=10e350f93951c0521dd6f103d67a485972c307214f036e009acea2978fe4f359 +checksum=d2f8c5300e3ce2a84fe6584d2f1483aa9eadc668ab1951b2c2b8a03ece3a22ba redshift-gtk_package() { depends="${sourcepkg}-${version}_${revision} gtk+3 python3-gobject diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template index d6480de0cb..5d3886a740 100644 --- a/srcpkgs/restic/template +++ b/srcpkgs/restic/template @@ -1,17 +1,17 @@ # Template file for 'restic' pkgname=restic -version=0.8.3 -revision=3 +version=0.9.0 +revision=1 build_style=go go_import_path="github.com/restic/restic" go_package="${go_import_path}/cmd/restic" go_ldflags="-X 'main.version=${version} (Void Linux)'" short_desc="Backup solution written in Go" maintainer="Florian Eich " -license="BSD" +license="BSD-2-Clause" homepage="https://restic.github.io/" distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz" -checksum=0cf697c88404b180d6d6ff2e7d2c27b2fcb9536da6dbdf15ad4d320af7e8f17c +checksum=5b46612254dcaec09a6f7ddae70e116f77c0f87ac7988dc379b34d0fd4bbc4c4 post_install() { vlicense LICENSE diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index d58e74f4c9..6cf70d754b 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,6 +1,6 @@ # Template file for 'retroarch' pkgname=retroarch -version=1.7.1 +version=1.7.3 revision=1 wrksrc="RetroArch-$version" conf_files="/etc/retroarch.cfg" @@ -20,10 +20,10 @@ makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel depends="$(vopt_if vulkan 'vulkan-loader')" short_desc="Official reference frontend for the libretro API" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.libretro.com/" distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" -checksum=e9189c7da6b2ca0142528eca14f26104ee322f052f8609203d90b60938d8d3f3 +checksum=a60c2244609bb87cdb56dd8e1020c3be757569b5246141328804ebc5574327ea build_options_default="ffmpeg" diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index 074a956bfa..47f8300aba 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,18 +1,20 @@ # Template file for 'retroshare' pkgname=retroshare -version=0.6.3 -revision=3 -build_style=qmake +version=0.6.4 +revision=1 wrksrc="RetroShare-${version}" -homepage="http://retroshare.github.io" -short_desc="A Decentralized Social Sharing Network" -maintainer="Abel Vdo " -license="GPL-3" +build_style=qmake hostmakedepends="pkg-config qt5-qmake" -makedepends="qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel - libressl-devel libssh-devel zlib-devel bzip2-devel sqlite-devel libopencv-devel - libupnp-devel libgnome-keyring-devel libmicrohttpd-devel sqlcipher-devel - libXScrnSaver-devel libxslt-devel libcurl-devel ffmpeg-devel speex-devel - pulseaudio-devel" +makedepends="ffmpeg-devel libgnome-keyring-devel libmicrohttpd-devel + libopencv-devel libssh-devel libupnp-devel libXScrnSaver-devel libxslt-devel + pulseaudio-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel + speex-devel sqlcipher-devel sqlite-devel" +short_desc="Decentralized, private and secure commmunication and sharing platform" +maintainer="Abel Vdo " +license="GPL-2.0-or-later" +homepage="http://retroshare.net" distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz" -checksum=ddb64aa5148fdc950d4426f52f1cbb11578619b1242614e3c4ca4792ee5ce30b +checksum=84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a + +nocross="https://travis-ci.org/voidlinux/void-packages/jobs/375096223#L1160 + https://travis-ci.org/voidlinux/void-packages/jobs/375096224#L1668" diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template index 424842fb7c..a58f81b7c2 100644 --- a/srcpkgs/riot-desktop/template +++ b/srcpkgs/riot-desktop/template @@ -1,6 +1,6 @@ # Template file for 'riot-desktop' pkgname=riot-desktop -version=0.14.2 +version=0.15.4 revision=1 only_for_archs="i686 x86_64" conf_files="/etc/${pkgname}/config.json" @@ -12,7 +12,7 @@ maintainer="zethra " license="Apache-2.0" homepage="https://riot.im" distfiles="https://github.com/vector-im/riot-web/archive/v${version}.tar.gz" -checksum=3ceb5af585e65c8b240d90e896835d9ff4b1a611b8ced2274b8a1396a8688a56 +checksum=684166bb4f248db995cccaa1e6e46fe03d7c2eccf9581ec7a2223f831144ffcf nocross=yes nostrip=yes diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index febe8027f3..8ea40d51fb 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -5,11 +5,11 @@ # # https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=197689 -_githash="29653ef5475124316b9284adb6cbfc97e9cae48f" +_githash="a2092141807514666a273971cc8fa9e80f14439f" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=4.14.37 +version=4.14.43 revision=1 wrksrc="linux-${_githash}" maintainer="Juan RP " @@ -17,7 +17,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=20e596c9bfaa739bf9178431c9fa332429b63671368826361b1a46ccf3354236 +checksum=7a93087b94e442fcaa89b473586ff36ab609dd2ccc55822bc40e977b68c97d6f _kernver="${version}_${revision}" diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch index 6d22814702..b4f6f7b5ba 100644 --- a/srcpkgs/rpm/patches/fix-musl.patch +++ b/srcpkgs/rpm/patches/fix-musl.patch @@ -17,3 +17,15 @@ AC_CHECK_HEADERS([dwarf.h], [ WITH_LIBDWARF=yes +diff --git rpmio/digest_nss.c rpmio/digest_nss.c +index 992d9ac..5f43b57 100644 +--- rpmio/digest_nss.c ++++ rpmio/digest_nss.c +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include + #include "rpmio/digest.h" diff --git a/srcpkgs/rpm/patches/fixbfd.patch b/srcpkgs/rpm/patches/fixbfd.patch deleted file mode 100644 index 4c7a7f3273..0000000000 --- a/srcpkgs/rpm/patches/fixbfd.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- tools/sepdebugcrcfix.c -+++ tools/sepdebugcrcfix.c -@@ -28,7 +28,19 @@ - #include - #include - #include -+#ifndef PACKAGE -+#define PACKAGE -+#ifndef PACKAGE_VERSION -+#define PACKAGE_VERSION - #include -+#undef PACKAGE_VERSION -+#else -+#include -+#endif -+#undef PACKAGE -+#else -+#include -+#endif - - #define _(x) x - #define static_assert(expr) \ - diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index 8e62cd1aa3..285612ffb5 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -1,6 +1,6 @@ # Template file for 'rpm' pkgname=rpm -version=4.13.1 +version=4.14.1 revision=1 build_style=gnu-configure configure_args="--with-lua --with-cap --with-acl --with-external-db --enable-python PYTHON=python2" @@ -14,7 +14,7 @@ maintainer="maxice8 " license="GPL-2.0-or-later" homepage="http://rpm.org" distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2" -checksum=81e5bc8e46baa0710a19c7d9bb34c24baceefeeafd86a9033e1e4d9613bb5b60 +checksum=43f40e2ccc3ca65bd3238f8c9f8399d4957be0878c2e83cba2746d2d0d96793b conflicts="rpmextract>=0" # Both provide rpm2cpio CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" @@ -34,11 +34,6 @@ pre_configure() { autoreconf -fi } -post_install() { - mv "${DESTDIR}"/bin/rpm "${DESTDIR}"/usr/bin/rpm - rm -r "${DESTDIR}"/bin -} - rpm-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/rpm/update b/srcpkgs/rpm/update new file mode 100644 index 0000000000..7d50f3425f --- /dev/null +++ b/srcpkgs/rpm/update @@ -0,0 +1,3 @@ +site="${distfiles%/*/*} +${distfiles%/*}" +pattern="${pkgname}-\K[\d.]*\d" diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index 665a0f96fb..d2aa8431bc 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,6 +1,6 @@ # Template file for 'rspamd' pkgname=rspamd -version=1.7.4 +version=1.7.5 revision=1 build_style=cmake configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="Apache-2.0" homepage="http://rspamd.com/" distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz" -checksum=0513ebed75b3e4990ae699b868598ae27b27b9e50a20d65dfcca3b1245a1a664 +checksum=5aa2ff72cc74ea1fd220cd3a941745268666465be712c4d014a9fc937b7b1f5f system_accounts="rspamd" rspamd_homedir="/var/lib/rspamd" conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf" diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template index 07e770e11e..cfcf78968d 100644 --- a/srcpkgs/runc/template +++ b/srcpkgs/runc/template @@ -1,20 +1,20 @@ # Template file for 'runc' pkgname=runc version=1.0.0 -revision=4 -_subver="rc4" +revision=5 +_subver="rc5" _ver="$version-$_subver" build_style=go go_import_path=github.com/opencontainers/runc wrksrc="$pkgname-$_ver" -hostmakedepends="git go pkg-config" +hostmakedepends="git pkg-config" makedepends="libseccomp-devel" short_desc="CLI tool for spawning and running OCI containers" maintainer="Paul Knopf " license="Apache-2.0" homepage="https://github.com/opencontainers/runc" distfiles="https://github.com/opencontainers/runc/releases/download/v${_ver}/runc.tar.xz" -checksum=a059c773455b723fa792fab3d82baa1e01de5b68defda70400ba3683831c7d95 +checksum=0304d249d0d381fbe4812999d30491b7abebf5a730aac59119f362cb7fdb2a20 do_build() { cd ${GOSRCPATH} diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template index de0cc48e90..0c93db0b16 100644 --- a/srcpkgs/sabnzbd/template +++ b/srcpkgs/sabnzbd/template @@ -1,6 +1,6 @@ # Template file for 'sabnzbd' pkgname=sabnzbd -version=2.3.3 +version=2.3.4 revision=1 wrksrc="SABnzbd-${version}" pycompile_dirs="/usr/share/sabnzbd" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://sabnzbd.org/" distfiles="https://github.com/sabnzbd/sabnzbd/releases/download/${version}/SABnzbd-${version}-src.tar.gz" -checksum=6e40472cb75c2abfdb7d3d1e896fc240aa1293685ff9f0dad976ada9e255ef1b +checksum=646569d03ef62c7d0a3dac4de4a64ddbf693f84bf3600bb9462d8fa7449d6149 noarch=yes post_extract() { diff --git a/srcpkgs/sc-controller/template b/srcpkgs/sc-controller/template index a702a00c41..731743a929 100644 --- a/srcpkgs/sc-controller/template +++ b/srcpkgs/sc-controller/template @@ -1,7 +1,7 @@ # Template file for 'sc-controller' pkgname=sc-controller -version=0.4.2 +version=0.4.3 revision=1 build_style=python2-module pycompile_module="scc" @@ -12,4 +12,4 @@ maintainer="vintodrimmer " license="GPL-2" homepage="https://github.com/kozec/sc-controller" distfiles="https://github.com/kozec/sc-controller/archive/v${version}.tar.gz" -checksum="ff714fbec121ebe020df432488ce013c1022c2a20e10b2b0edd987de2f4bedbf" +checksum="808cfeb7fc827a2b69d1f488bd5463903ed99cb045add34c7b79779e00827465" diff --git a/srcpkgs/smenu/template b/srcpkgs/smenu/template index ba8762a84d..e2cb1b9c71 100644 --- a/srcpkgs/smenu/template +++ b/srcpkgs/smenu/template @@ -1,6 +1,6 @@ # Template file for 'smenu' pkgname=smenu -version=0.9.12 +version=0.9.13 revision=1 build_style=gnu-configure makedepends="ncurses-devel" @@ -9,6 +9,6 @@ maintainer="maxice8 " license="GPL-2.0-only" homepage="https://github.com/p-gen/smenu" distfiles="https://github.com/p-gen/smenu/archive/v${version}.tar.gz" -checksum=136eadd711b75f52df7582ccb3e41f252a5a3ee38c934ea0980238f3b7eef2ec +checksum=85a829aba2dd77676d7b5d542482762625bc8499df8abba22d6ab0689090870a LDFLAGS="-lncurses" diff --git a/srcpkgs/spectrum3d/template b/srcpkgs/spectrum3d/template index a0b9511ba4..1c9f069248 100644 --- a/srcpkgs/spectrum3d/template +++ b/srcpkgs/spectrum3d/template @@ -1,13 +1,13 @@ # Template file for 'spectrum3d' pkgname=spectrum3d -version=2.5.0 -revision=2 +version=2.7.2 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gstreamer1-devel gtk+3-devel SDL-devel alsa-lib-devel glu-devel" short_desc="Audio spectrum visualiser in 3D for Linux" maintainer="Diogo Leal " -license="GPL-3" -homepage="http://spectrum3d.sourceforge.net" +license="GPL-3.0-or-later" +homepage="https://spectrum3d.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/project/spectrum3d/spectrum3d-${version}.tar.gz" -checksum=6e1993a5630b1a33529464bcd4c549dda87217dc8d80c10d73c3522eef867a88 +checksum=274ec3cb16070e2441d3d202fce946c4c4c22c9ac6275d950ad989ed5111e4cb diff --git a/srcpkgs/spectrum3d/update b/srcpkgs/spectrum3d/update new file mode 100644 index 0000000000..e7628fd0c2 --- /dev/null +++ b/srcpkgs/spectrum3d/update @@ -0,0 +1 @@ +site='http://sourceforge.net/projects/spectrum3d/rss?limit=200' diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template index 91fd3e0a9a..ca6eaf6d91 100644 --- a/srcpkgs/speedtest-cli/template +++ b/srcpkgs/speedtest-cli/template @@ -1,7 +1,7 @@ # Template file for 'speedtest-cli' pkgname=speedtest-cli -version=2.0.0 -revision=2 +version=2.0.2 +revision=1 build_style=python3-module pycompile_module="speedtest.py" hostmakedepends="python3-setuptools" @@ -11,5 +11,5 @@ maintainer="Aaron Marcher " license="Apache-2.0" homepage="https://github.com/sivel/speedtest-cli" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=732daf109a3399c794b293723199d740b0accddef86007a0f85f577bd4ba6c9a +checksum=5e22f2dcce1c9020f33faf559b22727483f022008a2912b85d573e578374b6a0 noarch=yes diff --git a/srcpkgs/ssdeep/template b/srcpkgs/ssdeep/template index ad1d627276..6b51d51157 100644 --- a/srcpkgs/ssdeep/template +++ b/srcpkgs/ssdeep/template @@ -1,14 +1,20 @@ # Template file for 'ssdeep' pkgname=ssdeep -version=2.13 -revision=2 +version=2.14.1 +revision=1 +wrksrc="ssdeep-release-${version}" build_style=gnu-configure +hostmakedepends="automake libtool" short_desc="Compute context triggered piecewise hashes" maintainer="Christian Neukirchen " -license="GPL-2" -homepage="http://ssdeep.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=6e4ca94457cb50ff3343d4dd585473817a461a55a666da1c5a74667924f0f8c5 +license="GPL-2.0-only" +homepage="https://ssdeep-project.github.io/ssdeep/" +distfiles="https://github.com/ssdeep-project/ssdeep/archive/release-${version}.tar.gz" +checksum=d96f667a8427ad96da197884574c7ca8c7518a37d9ac8593b6ea77e7945720a4 + +pre_configure() { + autoreconf -fi +} libfuzzy_package() { short_desc="Fuzzy hashing API" diff --git a/srcpkgs/ssdeep/update b/srcpkgs/ssdeep/update new file mode 100644 index 0000000000..d309484699 --- /dev/null +++ b/srcpkgs/ssdeep/update @@ -0,0 +1 @@ +pkgname=release diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template index 4a3cc80d77..9ef5475c22 100644 --- a/srcpkgs/sslh/template +++ b/srcpkgs/sslh/template @@ -1,15 +1,15 @@ # Template file for 'sslh' pkgname=sslh -version=1.19 +version=1.19c revision=1 hostmakedepends="perl" makedepends="pcre-devel libconfig-devel libcap-devel" short_desc="Applicative Protocol Multiplexer" maintainer="Markus Berger " -license="GPL-2" -homepage="http://www.rutschle.net/tech/sslh.shtml" +license="GPL-2.0-or-later" +homepage="https://www.rutschle.net/tech/sslh/README.html" distfiles="https://github.com/yrutschle/sslh/archive/v${version}.tar.gz" -checksum=8aa0f2af180b71b023b3adef568a2685b2724584f6f2fa2735681815dc8b2fc0 +checksum=b10d22c20eab3ac51e2fac45b1697eb12731038b660e5df7a919c0a45c84a85d do_build() { sed -i 's|^MAN=sslh.8.gz|MAN=sslh.8|g' Makefile diff --git a/srcpkgs/sslh/update b/srcpkgs/sslh/update new file mode 100644 index 0000000000..10395c809d --- /dev/null +++ b/srcpkgs/sslh/update @@ -0,0 +1 @@ +pattern='sslh/archive/v\K[\d.]+[a-z]?(?=\.tar)' diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template index a98b366c6d..12dc8033b7 100644 --- a/srcpkgs/ssr/template +++ b/srcpkgs/ssr/template @@ -1,19 +1,19 @@ # Template file for 'ssr' pkgname=ssr -version=0.3.10 +version=0.3.11 revision=1 build_style=cmake configure_args="-DWITH_QT5=ON" hostmakedepends="pkg-config" -makedepends="alsa-lib-devel ffmpeg-devel glu-devel jack-devel - libXi-devel pulseaudio-devel qt5-tools-devel qt5-x11extras-devel" +makedepends="alsa-lib-devel ffmpeg-devel glu-devel jack-devel pulseaudio-devel + qt5-tools-devel qt5-x11extras-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Simple Screen Recorder for programs and games" maintainer="Logen K " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.maartenbaert.be/simplescreenrecorder/" distfiles="https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz" -checksum=6f3c8507d69a0efd4f159d17cd8f840a8bbeeb8d67ffb7b14b9fc2d1bd4f340b +checksum=54f5c349c54694038586d3dfe0014da5d83044d0cf0ed9c0de525ddc54cbd150 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/stella/template b/srcpkgs/stella/template index 79ac004feb..78c803a364 100644 --- a/srcpkgs/stella/template +++ b/srcpkgs/stella/template @@ -1,6 +1,6 @@ # Template file for 'stella' pkgname=stella -version=5.0.2 +version=5.1.2 revision=1 build_style=gnu-configure makedepends="SDL2-devel glu-devel libpng-devel zlib-devel" @@ -9,7 +9,17 @@ maintainer="Diogo Leal " license="GPL-2" homepage="https://stella-emu.github.io/" distfiles="https://github.com/stella-emu/stella/releases/download/${version}/stella-${version}-src.tar.xz" -checksum=74ee708b68340b65519a04a22c61921cdcf69a1d308600c212414b28e9e689ac +checksum=77b210d51af7e4be88c14014d507e48367bcdff6b8ba513793f035f3e30a21bd + +post_extract() { + case "$XBPS_TARGET_MACHINE" in + *-musl) + sed -i 's/::PAGE_SIZE/::_PAGE_SIZE/g' $(grep -r '::PAGE_SIZE' -l) + sed -i 's/PAGE_SIZE/_PAGE_SIZE/g' src/emucore/MT24LC256.[ch]xx \ + src/emucore/System.hxx + ;; + esac +} do_configure() { ./configure --prefix=/usr diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template index 848d0a5800..a6b6929907 100644 --- a/srcpkgs/stunnel/template +++ b/srcpkgs/stunnel/template @@ -1,7 +1,7 @@ # Template file for 'stunnel' pkgname=stunnel -version=5.44 -revision=3 +version=5.45 +revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="perl" @@ -9,10 +9,10 @@ makedepends="libressl-devel" checkdepends="nmap" short_desc="SSL encryption wrapper" maintainer="Toyam Cox " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://www.stunnel.org/" distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz" -checksum=990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299 +checksum=548244839b8a4bf4dffea46c97893b203d1b9eed118c3dd6a9ac4d8d02592ee3 post_install() { rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8 diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template index c7cb1ecec0..6527bb4e56 100644 --- a/srcpkgs/telepathy-mission-control/template +++ b/srcpkgs/telepathy-mission-control/template @@ -1,19 +1,19 @@ # Template file for 'telepathy-mission-control' pkgname=telepathy-mission-control -version=5:5.16.1 -revision=2 +version=5:5.16.4 +revision=1 wrksrc="${pkgname}-${version#*:}" build_style=gnu-configure configure_args="--disable-static --enable-gnome-keyring --disable-schemas-compile" hostmakedepends="pkg-config python-devel intltool libxslt glib-devel" makedepends="libglib-devel telepathy-glib-devel NetworkManager-devel libgnome-keyring-devel" depends="telepathy-glib>=0.22" -short_desc="Telepathy component providing abstraction for details of connection managers" +short_desc="Account manager and channel dispatcher for the Telepathy framework" maintainer="Juan RP " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="http://telepathy.freedesktop.org" -distfiles="$homepage/releases/$pkgname/$pkgname-${version#*:}.tar.gz" -checksum=14ceb7d53535b43d44b8271ad11319d1d0fe6d193d154636b9e62b42799b9723 +distfiles="${homepage}/releases/${pkgname}/${pkgname}-${version#*:}.tar.gz" +checksum=9769ddac7ad8aad21f6db854016792162b57e6fa0b0aed8d823d76a71fe7e6cb telepathy-mission-control-devel_package() { depends="telepathy-glib-devel>=0.22 ${sourcepkg}>=${version}" diff --git a/srcpkgs/telepathy-mission-control/update b/srcpkgs/telepathy-mission-control/update new file mode 100644 index 0000000000..f1d68892e9 --- /dev/null +++ b/srcpkgs/telepathy-mission-control/update @@ -0,0 +1,2 @@ +version="${version#*:}" +ignore="*.9[0-9].*" diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index 49b73d2a49..9787f903db 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,7 +1,7 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.26 -revision=2 +version=3.27 +revision=1 noarch=yes build_style=python3-module pycompile_module="thefuck" @@ -15,7 +15,7 @@ maintainer="Benjamin 'Doctors' Hoffmeyer " license="MIT" homepage="https://github.com/nvbn/thefuck" distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz" -checksum=37d8cd1b578cbf473e337490d8e050a63a0a9defa2b0cb1619ffa4198b70b435 +checksum=26ed781fd84d5992c52a1ae7b0ca5ed12c88d37cf8508c32070e74d48515c357 do_check() { # on python3 mock is unittest.mock diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template index 8dab2f65bd..955266cae7 100644 --- a/srcpkgs/thttpd/template +++ b/srcpkgs/thttpd/template @@ -1,21 +1,23 @@ # Template file for 'thttpd' pkgname=thttpd -version=2.28 +version=2.29 revision=1 build_style=gnu-configure short_desc="Tiny/turbo/throttling HTTP server" maintainer="Juan RP " -license="BSD" +license="BSD-2-Clause" homepage="http://www.acme.com/software/thttpd/" distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz" -checksum=8552f929d4ede26cb193411c1208168e169dda24ee9eb1da8f8da4f4f8e10328 +checksum=99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397 pre_configure() { sed "s,-o bin -g bin,,g" -i Makefile.in } + do_build() { make CC=$CC LD=$CC CCOPT="$CFLAGS -D_DEFAULT_SOURCE" } + do_install() { vmkdir usr/bin vmkdir usr/share/man/man1 diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index 4f8ec9506c..707cc2a747 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -1,20 +1,20 @@ # Template file for 'tor' pkgname=tor -version=0.3.2.10 -revision=3 +version=0.3.3.6 +revision=1 build_style=gnu-configure -makedepends="zlib-devel libressl-devel libevent-devel libseccomp-devel" +makedepends="libevent-devel libseccomp-devel zlib-devel" depends="ca-certificates torsocks" +short_desc="Anonymity Online" +maintainer="Juan RP " +license="BSD-3-Clause" +homepage="https://www.torproject.org/" +distfiles="https://www.torproject.org/dist/tor-$version.tar.gz" +checksum=99bc59f6dbf395894de12f3a83b3251a82dfd93dc7f6d3afcbbd80f6111433b7 conf_files="/etc/tor/torrc" system_accounts="tor" tor_homedir="/var/lib/tor" make_dirs="/var/lib/tor 0700 tor tor" -short_desc="Anonymity Online" -maintainer="Juan RP " -license="BSD" -homepage="https://www.torproject.org/" -distfiles="https://www.torproject.org/dist/tor-$version.tar.gz" -checksum=60df77c31dcf94fdd686c8ca8c34f3b70243b33a7344ecc0b719d5ca2617cbee case "$XBPS_TARGET_MACHINE" in aarch64*) configure_args="--disable-seccomp";; diff --git a/srcpkgs/udiskie/template b/srcpkgs/udiskie/template index d7b9daa151..2a31e87526 100644 --- a/srcpkgs/udiskie/template +++ b/srcpkgs/udiskie/template @@ -1,6 +1,6 @@ # Template file for 'udiskie' pkgname=udiskie -version=1.7.4 +version=1.7.5 revision=1 noarch=yes build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Matthias Fulz " license="MIT" homepage="https://github.com/coldfix/udiskie" distfiles="https://github.com/coldfix/udiskie/archive/${version}.tar.gz" -checksum=87935d00f49b3c30f214f90e683785cd3016ecf22d78116e614d891a701c6f00 +checksum=5754222ad9f0aa8bc4eb4f528caa441460ebfaef7f724ad540bdef62fb4ceb90 post_install() { vlicense COPYING diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template index 74dff633f0..7c52fbd299 100644 --- a/srcpkgs/urlwatch/template +++ b/srcpkgs/urlwatch/template @@ -1,6 +1,6 @@ # Template file for 'urlwatch' pkgname=urlwatch -version=2.10 +version=2.11 revision=1 noarch=yes build_style=python3-module @@ -14,10 +14,10 @@ maintainer="Eivind Uggedal " license="BSD-3-Clause" homepage="https://thp.io/2008/urlwatch/" distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz" -checksum=ab1fd825b87a1089c9c965c4521e1f6d243ecf3456128be8526bb86e9dd3dfc4 +checksum=18a498e7e1defdee855732c3a0606956fefcebdb95c567e4780c313cba7b2c4d do_check() { - nosetests-3.6 + nosetests3 } post_install() { diff --git a/srcpkgs/uzbl/template b/srcpkgs/uzbl/template index 749378c474..1d94f67e40 100644 --- a/srcpkgs/uzbl/template +++ b/srcpkgs/uzbl/template @@ -1,14 +1,14 @@ # Template file for 'uzbl' pkgname=uzbl version=0.9.1 -revision=3 +revision=4 pycompile_module="uzbl" hostmakedepends="pkg-config python3-setuptools" makedepends="libsoup-devel webkitgtk-devel glib-devel" depends="python3-setuptools python3-six" short_desc="Web interface tools which adhere to the unix philosophy" -maintainer="Orphaned " -license="GPL-3" +maintainer="Daniel Santana " +license="GPL-3.0-only" homepage="https://www.uzbl.org/" distfiles="https://github.com/uzbl/uzbl/archive/v${version}.tar.gz" checksum=9721873db3fd859707f703a101b4f2d0538f92e9678f8ad437a7203078f9abbe diff --git a/srcpkgs/v8/template b/srcpkgs/v8/template index 502270e024..4df453f9cb 100644 --- a/srcpkgs/v8/template +++ b/srcpkgs/v8/template @@ -3,7 +3,7 @@ pkgname=v8 _sonamever=3.24 version=${_sonamever}.35.33 revision=3 -hostmakedepends="which python" +hostmakedepends="python" makedepends="readline-devel" short_desc="V8 JavaScript Engine" maintainer="Juan RP " diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index 0632a6d187..e77a90219d 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,6 +1,6 @@ # Template file for 'vala' pkgname=vala -version=0.40.4 +version=0.40.6 revision=1 build_style=gnu-configure hostmakedepends="flex libxslt pkg-config automake libtool" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://live.gnome.org/Vala" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=379354a2a2f7ee5c4d6e0f5e88b0e32620dcd5f51972baf6d90d9f18eb689198 +checksum=6da450f1a73e0f1e17506e68cce5b9e8996349e576d3f8cb6b0b73ee22e44be2 pre_configure() { autoreconf -fi diff --git a/srcpkgs/volume_key/patches/fix-crypt_get_error.patch b/srcpkgs/volume_key/patches/fix-crypt_get_error.patch deleted file mode 100644 index 0f529ec025..0000000000 --- a/srcpkgs/volume_key/patches/fix-crypt_get_error.patch +++ /dev/null @@ -1,316 +0,0 @@ -https://pagure.io/volume_key/c/ecef526a51c5a276681472fd6df239570c9ce518.patch - ---- lib/volume_luks.c -+++ lib/volume_luks.c -@@ -61,17 +61,13 @@ my_strerror (int err_no) - } - - /* Set ERROR based on libcryptsetup error state after returning RES. -- Use CODE. */ -+ Use CODE and LAST_LOG_ENTRY. */ - static void --error_from_cryptsetup (GError **error, LIBVKError code, int res) -+error_from_cryptsetup (GError **error, LIBVKError code, int res, -+ char *last_log_entry) - { -- /* It's not possible to get the error message length from libcryptsetup, just -- guess. */ -- char crypt_msg[4096]; -- -- crypt_get_error (crypt_msg, sizeof (crypt_msg)); -- if (crypt_msg[0] != '\0') -- g_set_error (error, LIBVK_ERROR, code, "%s", crypt_msg); -+ if (last_log_entry != NULL && last_log_entry[0] != '\0') -+ g_set_error (error, LIBVK_ERROR, code, "%s", last_log_entry); - else - { - char *s; -@@ -82,17 +78,33 @@ error_from_cryptsetup (GError **error, LIBVKError code, int res) - } - } - -+static void -+record_cryptsetup_log_entry (int level, const char *msg, void *usrptr) -+{ -+ char **last_log_entry = usrptr; -+ -+ if (level == CRYPT_LOG_ERROR) -+ { -+ g_free (*last_log_entry); -+ *last_log_entry = g_strdup (msg); -+ } -+} -+ - /* Open volume PATH and load its header. -+ Set up *LAST_LOG_ENTRY to be updated to the last logged message for the -+ device. The caller must g_free(*LAST_LOG_ENTRY) after closing the device. - Return the volume, or NULL on error. */ - static struct crypt_device * --open_crypt_device (const char *path, GError **error) -+open_crypt_device (const char *path, char **last_log_entry, GError **error) - { - struct crypt_device *cd; - int r; - -+ *last_log_entry = NULL; - r = crypt_init (&cd, path); - if (r < 0) - goto err; -+ crypt_set_log_callback(cd, record_cryptsetup_log_entry, last_log_entry); - r = crypt_load (cd, CRYPT_LUKS1, NULL); - if (r < 0) - goto err_cd; -@@ -101,9 +113,12 @@ open_crypt_device (const char *path, GError **error) - err_cd: - crypt_free (cd); - err: -- error_from_cryptsetup (error, LIBVK_ERROR_VOLUME_UNKNOWN_FORMAT, r); -+ error_from_cryptsetup (error, LIBVK_ERROR_VOLUME_UNKNOWN_FORMAT, r, -+ *last_log_entry); - g_prefix_error (error, _("Error getting information about volume `%s': "), - path); -+ g_free (*last_log_entry); -+ *last_log_entry = NULL; - return NULL; - } - -@@ -173,10 +188,11 @@ luks_volume_open (struct libvk_volume *vol, const char *path, GError **error) - { - struct luks_volume *luks; - struct crypt_device *cd; -+ char *last_log_entry; - const char *uuid; - - (void)vol; -- cd = open_crypt_device (path, error); -+ cd = open_crypt_device (path, &last_log_entry, error); - if (cd == NULL) - return NULL; - /* A bit of paranoia */ -@@ -187,6 +203,7 @@ luks_volume_open (struct libvk_volume *vol, const char *path, GError **error) - _("UUID mismatch between libblkid and libcryptsetup: `%s' " - "vs. `%s'"), vol->uuid, uuid); - crypt_free (cd); -+ g_free (last_log_entry); - return NULL; - } - -@@ -195,6 +212,7 @@ luks_volume_open (struct libvk_volume *vol, const char *path, GError **error) - luks->cipher_mode = g_strdup (crypt_get_cipher_mode (cd)); - luks->key_bytes = crypt_get_volume_key_size (cd); - crypt_free (cd); -+ g_free (last_log_entry); - - luks->key = NULL; - luks->passphrase = NULL; -@@ -256,7 +274,7 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type, - const struct libvk_ui *ui, GError **error) - { - struct crypt_device *cd; -- char *passphrase; -+ char *last_log_entry, *passphrase; - void *key; - size_t key_length; - int slot; -@@ -276,7 +294,7 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type, - _("Encryption information type unsupported in LUKS")); - goto err; - } -- cd = open_crypt_device (vol->path, error); -+ cd = open_crypt_device (vol->path, &last_log_entry, error); - if (cd == NULL) - goto err; - key_length = crypt_get_volume_key_size (cd); -@@ -303,7 +321,7 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type, - g_free_passphrase (passphrase); - if (r != -EPERM) - { -- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r); -+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r, last_log_entry); - g_prefix_error (error, _("Error getting LUKS data encryption key: ")); - goto err_prompt; - } -@@ -322,12 +340,14 @@ luks_get_secret (struct libvk_volume *vol, enum libvk_secret secret_type, - vol->v.luks->passphrase_slot = slot; - g_free (prompt); - crypt_free (cd); -+ g_free (last_log_entry); - return 0; - - err_prompt: - g_free (prompt); - g_free_key (key, key_length); - crypt_free (cd); -+ g_free (last_log_entry); - err: - return -1; - } -@@ -383,11 +403,12 @@ luks_load_packet (struct libvk_volume *vol, const struct libvk_volume *packet, - if (packet->v.luks->key != NULL) - { - struct crypt_device *cd; -+ char *last_log_entry; - int r; - - g_return_val_if_fail (vol->v.luks->key_bytes == packet->v.luks->key_bytes, - -1); -- cd = open_crypt_device (vol->path, error); -+ cd = open_crypt_device (vol->path, &last_log_entry, error); - if (cd == NULL) - return -1; - r = crypt_volume_key_verify (cd, packet->v.luks->key, -@@ -395,21 +416,25 @@ luks_load_packet (struct libvk_volume *vol, const struct libvk_volume *packet, - crypt_free (cd); - if (r < 0) - { -- error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r); -+ error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r, -+ last_log_entry); - g_prefix_error (error, _("LUKS data encryption key in packet is " - "invalid: ")); -+ g_free (last_log_entry); - return -1; - } -+ g_free (last_log_entry); - luks_replace_key (vol, packet->v.luks->key); - } - if (packet->v.luks->passphrase != NULL) - { - struct crypt_device *cd; -+ char *last_log_entry; - void *key; - size_t key_size; - int r; - -- cd = open_crypt_device (vol->path, error); -+ cd = open_crypt_device (vol->path, &last_log_entry, error); - if (cd == NULL) - return -1; - key_size = crypt_get_volume_key_size (cd); -@@ -420,10 +445,13 @@ luks_load_packet (struct libvk_volume *vol, const struct libvk_volume *packet, - crypt_free (cd); - if (r < 0) - { -- error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r); -+ error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r, -+ last_log_entry); - g_prefix_error (error, _("LUKS passphrase in packet is invalid: ")); -+ g_free (last_log_entry); - return -1; - } -+ g_free (last_log_entry); - luks_replace_passphrase (vol, packet->v.luks->passphrase); - vol->v.luks->passphrase_slot = r; - if (packet->v.luks->key == NULL) -@@ -446,7 +474,7 @@ luks_apply_secret (struct libvk_volume *vol, const struct libvk_volume *packet, - GError **error) - { - struct crypt_device *cd; -- char *prompt, *prompt2, *error_prompt, *passphrase; -+ char *last_log_entry, *prompt, *prompt2, *error_prompt, *passphrase; - unsigned failed; - int res; - -@@ -498,7 +526,7 @@ luks_apply_secret (struct libvk_volume *vol, const struct libvk_volume *packet, - goto err_prompts; - - got_passphrase: -- cd = open_crypt_device (vol->path, error); -+ cd = open_crypt_device (vol->path, &last_log_entry, error); - if (cd == NULL) - goto err_passphrase; - res = crypt_keyslot_add_by_volume_key (cd, CRYPT_ANY_SLOT, -@@ -508,10 +536,12 @@ luks_apply_secret (struct libvk_volume *vol, const struct libvk_volume *packet, - crypt_free (cd); - if (res < 0) - { -- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res); -+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res, last_log_entry); - g_prefix_error (error, _("Error adding a LUKS passphrase")); -+ g_free (last_log_entry); - goto err_passphrase; - } -+ g_free (last_log_entry); - - g_return_val_if_fail (vol->v.luks->key_bytes == packet->v.luks->key_bytes, - -1); -@@ -542,6 +572,7 @@ luks_add_secret (struct libvk_volume *vol, enum libvk_secret secret_type, - const void *secret, size_t size, GError **error) - { - struct crypt_device *cd; -+ char *last_log_entry; - int res; - - if (secret_type != LIBVK_SECRET_PASSPHRASE) -@@ -562,7 +593,7 @@ luks_add_secret (struct libvk_volume *vol, enum libvk_secret secret_type, - _("The passphrase must be a string")); - return -1; - } -- cd = open_crypt_device (vol->path, error); -+ cd = open_crypt_device (vol->path, &last_log_entry, error); - if (cd == NULL) - return -1; - res = crypt_keyslot_add_by_volume_key (cd, CRYPT_ANY_SLOT, vol->v.luks->key, -@@ -570,10 +601,12 @@ luks_add_secret (struct libvk_volume *vol, enum libvk_secret secret_type, - crypt_free (cd); - if (res < 0) - { -- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res); -+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res, last_log_entry); - g_prefix_error (error, _("Error adding a LUKS passphrase")); -+ g_free (last_log_entry); - return -1; - } -+ g_free (last_log_entry); - - luks_replace_passphrase (vol, secret); - vol->v.luks->passphrase_slot = res; -@@ -823,12 +856,13 @@ luks_open_with_packet (struct libvk_volume *vol, - GError **error) - { - struct crypt_device *cd; -+ char *last_log_entry; - void *to_free; - const void *key; - int r; - size_t key_size; - -- cd = open_crypt_device (vol->path, error); -+ cd = open_crypt_device (vol->path, &last_log_entry, error); - if (cd == NULL) - goto err; - if (packet->v.luks->key != NULL) -@@ -846,7 +880,7 @@ luks_open_with_packet (struct libvk_volume *vol, - strlen (packet->v.luks->passphrase)); - if (r < 0) - { -- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r); -+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r, last_log_entry); - g_prefix_error (error, _("Error getting LUKS data encryption key: ")); - goto err_to_free; - } -@@ -862,7 +896,7 @@ luks_open_with_packet (struct libvk_volume *vol, - r = crypt_activate_by_volume_key (cd, name, key, key_size, 0); - if (r < 0) - { -- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r); -+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r, last_log_entry); - g_prefix_error (error, _("Error opening LUKS volume: ")); - goto err_to_free; - } -@@ -870,6 +904,7 @@ luks_open_with_packet (struct libvk_volume *vol, - if (to_free != NULL) - g_free_key (to_free, key_size); - crypt_free (cd); -+ g_free (last_log_entry); - return 0; - - err_to_free: -@@ -877,6 +912,7 @@ luks_open_with_packet (struct libvk_volume *vol, - g_free_key (to_free, key_size); - err_cd: - crypt_free (cd); -+ g_free (last_log_entry); - err: - return -1; - } diff --git a/srcpkgs/volume_key/patches/fix-devel.patch b/srcpkgs/volume_key/patches/fix-devel.patch deleted file mode 100644 index 9149475c04..0000000000 --- a/srcpkgs/volume_key/patches/fix-devel.patch +++ /dev/null @@ -1,15 +0,0 @@ -Source: Vratislav Podzimek -Upstream: unknown -Reason: Fixes compilation under musl libc. - ---- lib/libvolume_key.h -+++ lib/libvolume_key.h -@@ -18,8 +18,6 @@ Author: Miloslav Trmač */ - #ifndef LIBVOLUME_KEY_H__ - #define LIBVOLUME_KEY_H__ - --#include -- - #include - #include - diff --git a/srcpkgs/volume_key/template b/srcpkgs/volume_key/template index f9c24fbf3d..1e44919971 100644 --- a/srcpkgs/volume_key/template +++ b/srcpkgs/volume_key/template @@ -1,7 +1,7 @@ # Template file for 'volume_key' pkgname=volume_key -version=0.3.9 -revision=4 +version=0.3.10 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config python-devel" makedepends="cryptsetup-devel glib-devel gpgme-devel nss-devel python-devel" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://pagure.io/volume_key" distfiles="http://releases.pagure.org/volume_key/volume_key-${version}.tar.xz" -checksum=450a54fe9bf56acec6850c1e71371d3e4913c9ca1ef0cdc3a517b4b6910412a6 +checksum=c5729de7e33e39c8674e9aae2337d2719f9298d6499f1656d0d25a065a7e98a7 if [ -n "$CROSS_BUILD" ]; then make_build_args+=" PYTHON_CPPFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7" diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template index c7c785024b..382c847911 100644 --- a/srcpkgs/whois/template +++ b/srcpkgs/whois/template @@ -1,15 +1,15 @@ # Template file for 'whois' pkgname=whois -version=5.3.0 +version=5.3.1 revision=1 hostmakedepends="perl" makedepends="libidn-devel" short_desc="An improved whois client" maintainer="Juan RP " +license="GPL-2.0-or-later" homepage="https://www.linux.it/~md/software" -license="GPL-2" distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.tar.xz" -checksum=4d789c403bfb5833c8ae168a5f31be70e34b045bd5d95a54c82a27b0ff135723 +checksum=ef4ead31306a388d9c8c83d67f56c94ed8b4c85e94f60baea2f5b1660445893e alternatives=" whois:whois:/usr/bin/gwhois @@ -18,6 +18,7 @@ alternatives=" do_build() { make CC=$CC prefix=/usr HAVE_ICONV=1 } + do_install() { make prefix=/usr BASEDIR=${DESTDIR} install-whois mv ${DESTDIR}/usr/bin/{whois,gwhois} diff --git a/srcpkgs/whowatch/template b/srcpkgs/whowatch/template index a57305edff..eb040062cf 100644 --- a/srcpkgs/whowatch/template +++ b/srcpkgs/whowatch/template @@ -1,16 +1,22 @@ # Template file for 'whowatch' pkgname=whowatch -version=1.8.5 -revision=2 +version=1.8.6 +revision=1 +wrksrc="whowatch-whowatch-${version}" build_style=gnu-configure +hostmakedepends="automake" makedepends="ncurses-devel" -short_desc="Displays information about the users currently logged on to the machine in real time" +short_desc="Displays information about the users currently logged on in real time" maintainer="Jan S. " -license="GPL-2" +license="GPL-2.0-or-later" disable_parallel_build="yes" homepage="http://wizard.ae.krakow.pl/~mike/#whowatch" -distfiles="http://wizard.ae.krakow.pl/~mike/download/$pkgname-$version.tar.gz" -checksum=5e77107c2bd31eee5609d80caf3f07fb4b913b4b2e71c1d0e73204937ffc9c8a +distfiles="https://github.com/mtsuszycki/whowatch/archive/whowatch-${version}.tar.gz" +checksum=1b8d54e3de4d8325c47a0fb8765cbaaeee8744359b5dacd4bdb3e40b4e31797e + +pre_configure() { + autoreconf -fi +} post_configure() { echo "#define RETURN_TV_IN_SELECT 1" >> src/config.h diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 53d3f0aac5..baef9b4b91 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=3.8 +version=3.9 revision=1 build_style=gnu-configure configure_args="--without-gstreamer" @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${version}.tar.xz" -checksum=02b00c6c948b3bab717e1b1e2075a5406b14d138bd2e01fdb1268a93d1c20d51 +checksum=ccadc281966d5a94f1161dec22d29bf7bd6506b371b26f18f652d374e986b735 nopie_files="/usr/bin/wine" diff --git a/srcpkgs/wireguard-go/template b/srcpkgs/wireguard-go/template index 43eed2ee5f..56f4ca7e84 100644 --- a/srcpkgs/wireguard-go/template +++ b/srcpkgs/wireguard-go/template @@ -1,21 +1,20 @@ # Template file for 'wireguard-go' pkgname=wireguard-go -version=0.0.20180519 +version=0.0.20180524 revision=1 build_style=go go_import_path="git.zx2c4.com/wireguard-go" -hostmakedepends="git" +hostmakedepends="git dep" depends="wireguard-tools" short_desc="Implementation of WireGuard in Go" maintainer="lemmi " license="GPL-2" homepage="https://git.zx2c4.com/wireguard-go/about/" distfiles="https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz" -checksum=d2b0f43679b3559952cf8d244d537903d03699ed7c8a2c1e7fc37ee424e30439 +checksum=1d539f6c51dd33098a536af0285ef03c561db0ff343f23a75405207fcf48ec3e pre_build() { - # go doesn't like local imports, so we rewrite them - for localimport in ratelimiter rwcancel tai64n xchacha20poly1305; do - sed -i -e "s#\"./$localimport\"#\"git.zx2c4.com/wireguard-go/$localimport\"#" *.go - done + rm donotuseon_linux.go + cd ${GOSRCPATH} + dep ensure -vendor-only -v } diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index c36168eb2c..192ce250d2 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -1,6 +1,6 @@ # Template file for 'wireguard' pkgname=wireguard -version=0.0.20180519 +version=0.0.20180524 revision=1 wrksrc="WireGuard-${version}" build_wrksrc="src/tools" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://www.wireguard.com/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" -checksum=8846b3006c3f7e079bb38a4c985ccc2981e259f56c927b4cf47cbc1420e1c462 +checksum=57614239c1f1a99a367f2c816153acda5bffada66a3b8e3b8215f1625784abc9 triggers="dkms" dkms_modules="wireguard ${version}" diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 4ecdf8e63b..7134831596 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2018.05.18 +version=2018.05.26 revision=1 noarch=yes wrksrc="$pkgname" @@ -14,7 +14,7 @@ license="Public Domain" homepage="http://rg3.github.io/youtube-dl/" #changelog="https://raw.githubusercontent.com/rg3/youtube-dl/master/ChangeLog" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=bc548ad8ab8fad0ddfd7c7ad54fd5025ef424a727b1e302a99881784cc862087 +checksum=ddd3f5134c6cc601f0bb422a366cfe35f7cf4b368ea868b5ca5bfd697f053bad alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index c2690a230f..a9ba6ca00f 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,7 +1,7 @@ # Template file for 'z3' pkgname=z3 -version=4.6.0 -revision=3 +version=4.7.1 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure make_build_args="-C build all examples" @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/Z3Prover/z3" distfiles="https://github.com/Z3Prover/z3/archive/${pkgname}-${version}.tar.gz" -checksum=511da31d1f985cf0c79b2de05bda4e057371ba519769d1546ff71e1304fe53c9 +checksum=a353e3da00cdaffd258052cc1406efc854606855222ab4bfd5679c58af5c11c7 build_options="ocaml" desc_option_ocaml="Enable support for OCaml bindings" build_options_default="ocaml" diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template index 8d5b5966da..345de32219 100644 --- a/srcpkgs/zathura-ps/template +++ b/srcpkgs/zathura-ps/template @@ -1,12 +1,12 @@ # Template file for 'zathura-ps' pkgname=zathura-ps version=0.2.6 -revision=1 +revision=2 build_style=meson maintainer="lemmi " hostmakedepends="pkg-config" makedepends="libspectre-devel zathura-devel" -depends="zathura" +depends="zathura ghostscript" license="zlib" homepage="http://pwmt.org/projects/zathura-ps/" short_desc="PostScript support for zathura" diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template index 1a1d05794f..5cfad14604 100644 --- a/srcpkgs/zathura/template +++ b/srcpkgs/zathura/template @@ -1,6 +1,6 @@ # Template file for 'zathura' pkgname=zathura -version=0.3.9 +version=0.4.0 revision=1 build_style=meson maintainer="lemmi " @@ -10,7 +10,7 @@ license="zlib" homepage="http://pwmt.org/projects/zathura/installation/" short_desc="A highly customizable and functional document viewer" distfiles="http://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz" -checksum=2f74a5d288db1f46f1d704d69a9c7822985964e90b793636c6c80a25d29f097c +checksum=aa629259c6ac729e90abdda1b9b51854adaa6851192f08a55e63379500541ec8 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel"