diff --git a/.travis.yml b/.travis.yml index a17e00d512c..2158be8ef8e 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/Manual.md b/Manual.md index c28c55f14ab..1403393ae19 100644 --- a/Manual.md +++ b/Manual.md @@ -61,7 +61,6 @@ A simple `template` example is as follows: ``` # Template file for 'foo' - pkgname=foo version=1.0 revision=1 @@ -1043,9 +1042,8 @@ with this naming: `_package()`, i.e: ``` # Template file for 'foo' - -pkgname="foo" -version="1.0" +pkgname=foo +version=1.0 revision=1 build_style=gnu-configure short_desc="A short description max 72 chars" @@ -1061,8 +1059,8 @@ foo-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } } diff --git a/common/shlibs b/common/shlibs index 4a1bfdff462..c657388554a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -339,8 +339,8 @@ liblcms.so.1 lcms-1.18_1 libgd.so.3 gd-2.1.0_1 libcroco-0.6.so.3 libcroco-0.6.2_1 libgsf-1.so.114 libgsf-1.14.11_1 -libMagickCore-6.Q16.so.5 libmagick-6.9.9.0_1 -libMagickWand-6.Q16.so.5 libmagick-6.9.9.0_1 +libMagickCore-6.Q16.so.6 libmagick-6.9.9.44_1 +libMagickWand-6.Q16.so.6 libmagick-6.9.9.44_1 libMagick++-6.Q16.so.8 libmagick-6.9.9.0_1 libltdl.so.7 libltdl-2.2.6_1 libpoppler.so.74 poppler-0.63.0_1 @@ -529,7 +529,6 @@ libmaildir.so.5 kdepim-runtime-17.12.3_1 libfolderarchivesettings.so.5 kdepim-runtime-17.12.3_1 libbabl-0.1.so.0 babl-0.1.10_1 libbamf3.so.2 bamf-0.5.1_1 -libgegl-0.2.so.0 gegl-0.2.0_1 libicuio.so.59 icu-libs-59.1_1 libicui18n.so.59 icu-libs-59.1_1 libicudata.so.59 icu-libs-59.1_1 @@ -551,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 @@ -573,6 +572,7 @@ libecpg_compat.so.3 postgresql-libs-8.4.2_1 libecpg.so.6 postgresql-libs-8.4.2_1 libpgtypes.so.3 postgresql-libs-8.4.2_1 libpq.so.5 postgresql-libs-8.4.2_1 +libmypaint-1.3.so.0 libmypaint-1.3.0_1 libmysqlclient_r.so.18 libmysqlclient-5.5.27_1 libmysqlclient.so.18 libmysqlclient-5.5.27_1 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1 @@ -1706,8 +1706,7 @@ libBulletCollision.so.2.87 bullet-2.87_1 libLinearMath.so.2.87 bullet-2.87_1 libBulletSoftBody.so.2.87 bullet-2.87_1 libinotifytools.so.0 libinotify-tools-3.14_2 -libopensc.so.5 libopensc-0.17.0_1 -libsmm-local.so.5 libopensc-0.17.0_1 +libopensc.so.6 libopensc-0.18.0_1 libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1 librtlsdr.so.0 librtlsdr-0.5.3_1 libSDL2_mixer-2.0.so.0 SDL2_mixer-2.0.0_1 @@ -1943,7 +1942,7 @@ libQt5EglFsKmsSupport.so.5 qt5-5.7.1_1 libQt5WebKit.so.5 qt5-webkit-5.6.0_1 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1 libQt5TextToSpeech.so.5 qt5-speech-5.8.0_1 -libx265.so.151 x265-2.7_1 +libx265.so.160 x265-2.8_1 libQt5Xdg.so.3 libqtxdg-3.1.0_1 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1 libqwt.so.6 qwt-6.1.3_1 @@ -2158,6 +2157,10 @@ libgsound.so.0 gsound-1.0.1_1 libgegl-0.3.so.0 gegl3-0.3.0_1 libgegl-npd-0.3.so gegl3-0.3.0_1 libgegl-sc-0.3.so gegl3-0.3.0_1 +libprocps.so.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 @@ -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 @@ -3343,3 +3348,4 @@ libkid3-core.so.3.6.0 kid3-3.6.0_1 libkid3-gui.so.3.6.0 kid3-3.6.0_1 libcfitsio.so.3 cfitsio-3.450_1 libapparmor.so.1 libapparmor-2.12.0_1 +libcue.so.2 libcue-2.2.0_1 \ No newline at end of file diff --git a/common/travis/build.sh b/common/travis/build.sh index 782e2facd7e..bf5b437367e 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 89f0c2104c1..fcc99a6ae28 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 ab866ae492e..25b43014ec9 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 f5adc1d6fa0..a19f7e77e01 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/CopyQ/template b/srcpkgs/CopyQ/template index 51817a2f8e6..250913bf739 100644 --- a/srcpkgs/CopyQ/template +++ b/srcpkgs/CopyQ/template @@ -1,13 +1,14 @@ # Template file for 'CopyQ' pkgname=CopyQ -version=3.3.1 +version=3.4.0 revision=1 build_style=cmake hostmakedepends="qt5-tools-devel" -makedepends="libXtst-devel qt5-script-devel qt5-svg-devel qt5-tools-devel" +makedepends="libXtst-devel qt5-script-devel qt5-svg-devel qt5-tools-devel qt5-x11extras-devel" short_desc="Clipboard manager with searchable and editable history" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://hluk.github.io/CopyQ/" +#changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES" distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz" -checksum=504ca31e8da47c67463d779348c46ff97369138694bc4fbe5adf08b9b38b68bd +checksum=2e9b5975310a46bfe39873392a1b27ef36be96783608440317885a8c140ab280 diff --git a/srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch b/srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch deleted file mode 100644 index 4683e5a19e0..00000000000 --- a/srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/jangernert/FeedReader/issues/410 - ---- Constants.vala.in.orig -+++ Constants.vala.in -@@ -43,11 +43,11 @@ namespace FeedReader { - } - - public class MediaButton : GLib.Object { -- public const string PLAY = N_("Play"); -- public const string PAUSE = N_("Pause"); -- public const string MUTE = N_("Mute"); -- public const string UNMUTE = N_("Unmute"); -- public const string CLOSE = N_("Close"); -+ public const string PLAY = "Play"; -+ public const string PAUSE = "Pause"; -+ public const string MUTE = "Mute"; -+ public const string UNMUTE = "Unmute"; -+ public const string CLOSE = "Close"; - } - - public class Constants : GLib.Object { diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template index 8004c3c2df1..76656973c4a 100644 --- a/srcpkgs/FeedReader/template +++ b/srcpkgs/FeedReader/template @@ -1,21 +1,18 @@ # Template file for 'FeedReader' pkgname=FeedReader -version=2.0.2 -revision=2 -build_style=cmake -hostmakedepends="pkg-config intltool itstool glib-devel vala - $(vopt_if gir gobject-introspection)" -makedepends="gtk+3-devel vala-devel json-glib-devel libgee08-devel libsoup-devel - sqlite-devel libsecret-devel libnotify-devel libxml2-devel rest-devel - webkit2gtk-devel libpeas-devel libcurl-devel gnome-online-accounts-devel - gst-plugins-base1-devel" +version=2.2 +revision=1 +build_style=meson +hostmakedepends="glib-devel intltool itstool pkg-config vala" +makedepends="gnome-online-accounts-devel gst-plugins-base1-devel json-glib-devel + libcurl-devel libgee08-devel libnotify-devel libpeas-devel libsecret-devel + rest-devel vala-devel webkit2gtk-devel" short_desc="Modern desktop RSS desktop client" maintainer="Enno Boland " -license="GPL-3" +license="GPL-3.0-only" homepage="https://jangernert.github.io/FeedReader/" distfiles="https://github.com/jangernert/$pkgname/archive/v$version.tar.gz" -checksum=949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261 -make_build_args="VERBOSE=1" +checksum=621b0fc544e37101b5a0486618144e83e4fd961020a3f67e80703c18a47d704f case "$XBPS_TARGET_MACHINE" in x86_64-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/2615/steps/shell_3/logs/stdio";; diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template index 19e2ee58b32..4338c5769b5 100644 --- a/srcpkgs/GraphicsMagick/template +++ b/srcpkgs/GraphicsMagick/template @@ -1,6 +1,6 @@ # Template file for 'GraphicsMagick' pkgname=GraphicsMagick -version=1.3.28 +version=1.3.29 revision=1 keep_libtool_archives=yes build_style=gnu-configure @@ -12,19 +12,19 @@ makedepends="perl libjpeg-turbo-devel libpng-devel tiff-devel libXt-devel libltdl-devel libxml2-devel libwmf-devel liblzma-devel libgomp-devel ghostscript-devel" depends="ghostscript" -maintainer="Juan RP " -homepage="http://www.graphicsmagick.org/" -license="MIT" short_desc="GraphicsMagick Image Processing System" +maintainer="Juan RP " +license="MIT" +homepage="http://www.graphicsmagick.org/" distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz" -checksum=4b06840d7ce3aee90fde811b42ba2c3594df8cf30bf4620b48c42c8b35d93580 +checksum=de820cd10597205941a7e9d02c2e679231e92e8e769c204ef09034d2279ad453 post_install() { vlicense Copyright.txt LICENSE } libgraphicsmagick_package() { - short_desc="GraphicsMagick low-level image manipulation libraries" + short_desc="GraphicsMagick image manipulation libraries" pkg_install() { vmove "usr/lib/libGraphicsMagick*.so.*" vmove "usr/lib/GraphicsMagick*" @@ -32,7 +32,7 @@ libgraphicsmagick_package() { } } libgraphicsmagick-devel_package() { - short_desc="GraphicsMagick low-level image manipulation libraries - development files" + short_desc="GraphicsMagick image manipulation libraries - development files" depends="libgraphicsmagick>=${version}_${revision}" pkg_install() { vmove usr/include diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 5ec704ecef7..8ab9aaf2a06 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,10 +1,10 @@ # Template file for 'ImageMagick' pkgname=ImageMagick _majorver=6.9.9 -_patchver=40 -version=${_majorver}.${_patchver} +_patchver=45 +version="${_majorver}.${_patchver}" revision=1 -wrksrc=${pkgname}-${_majorver}-${_patchver} +wrksrc="${pkgname}-${_majorver}-${_patchver}" build_style=gnu-configure configure_args="--without-autotrace --with-wmf=yes --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes @@ -13,10 +13,10 @@ configure_args="--without-autotrace --with-wmf=yes --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static" short_desc="Package for display and interactive manipulation of images" maintainer="Juan RP " -homepage="https://www.imagemagick.org/" license="ImageMagick" +homepage="https://www.imagemagick.org/" distfiles="https://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz" -checksum=62f25d46bfbcffe00b84e167994d593868a9a47d4defc489a429cae1d6aab9f7 +checksum=e182a4e7a22d248f88869850765ff5fcd6ac9c9a28e55502b180d483aaabf8ab subpackages="libmagick libmagick-devel" diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template index 7fff830a70a..4ae89c43950 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 a3b41ba9cb5..811a0bd6fed 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/PopCorn/files/pqueryd/conf b/srcpkgs/PopCorn/files/pqueryd/conf new file mode 100644 index 00000000000..0f04bde90be --- /dev/null +++ b/srcpkgs/PopCorn/files/pqueryd/conf @@ -0,0 +1,2 @@ +PORT=8002 +DATA_DIR=/srv/www/popcorn/ diff --git a/srcpkgs/PopCorn/files/pqueryd/run b/srcpkgs/PopCorn/files/pqueryd/run new file mode 100644 index 00000000000..876bd1b8064 --- /dev/null +++ b/srcpkgs/PopCorn/files/pqueryd/run @@ -0,0 +1,5 @@ +#!/bin/sh + +[ -r ./conf ] && . ./conf + +exec chpst -u _popcorn:_popcorn pqueryd --checkpoint_enabled=false --port $PORT --data_dir $DATA_DIR diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template index 928fac3b8a8..7b7f7617867 100644 --- a/srcpkgs/PopCorn/template +++ b/srcpkgs/PopCorn/template @@ -1,10 +1,13 @@ # Template file for 'PopCorn' pkgname=PopCorn -version=0.2.1 -revision=2 +version=0.3 +revision=1 build_style=go go_import_path="github.com/the-maldridge/popcorn" -go_package="${go_import_path}/cmd/popcorn ${go_import_path}/cmd/popcornctl ${go_import_path}/cmd/statrepo" +go_package="${go_import_path}/cmd/popcorn + ${go_import_path}/cmd/popcornctl + ${go_import_path}/cmd/statrepo + ${go_import_path}/cmd/pqueryd" hostmakedepends="dep" depends="snooze" short_desc="Package statistics system" @@ -12,7 +15,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="https://github.com/the-maldridge/PopCorn" distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz" -checksum=9ce2ade5ebae5bb31443423b41ab5d6355a2ac3d65cba1d36c3a5616f323a4a9 +checksum=5e61970c3ba5fd83f6b5b86c30264213461f4a5af8aacd2ba1757333ece05260 system_accounts="_popcorn" _popcorn_homedir="/var/lib/popcorn" @@ -30,16 +33,20 @@ post_install() { vlicense LICENSE vsv popcorn vsv statrepo + vsv pqueryd } PopCorn-Server_package() { short_desc+=" - Server" depends="${sourcepkg}>=${version}_${revision}" - conf_files="/etc/sv/statrepo/conf" + conf_files="/etc/sv/statrepo/conf + /etc/sv/pqueryd/conf" pkg_install() { vmove usr/bin/statrepo vmove usr/bin/popcornctl + vmove usr/bin/pqueryd vmove etc/sv/statrepo + vmove etc/sv/pqueryd } } diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template index d4b2e94b193..d72faea08d1 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/SDL2/template b/srcpkgs/SDL2/template index 8ccffac107e..d7fbe33bd63 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,7 +1,7 @@ # Template file for 'SDL2' pkgname=SDL2 version=2.0.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared @@ -22,6 +22,9 @@ case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) build_options_default="opengl pulseaudio x11" ;; + aarch64*) + build_options_default="gles opengl pulseaudio x11" + ;; arm*) # Enable OpenGL/ES on rpi platforms build_options_default="gles" diff --git a/srcpkgs/SoapyAirspy/update b/srcpkgs/SoapyAirspy/update new file mode 100644 index 00000000000..19f2127d894 --- /dev/null +++ b/srcpkgs/SoapyAirspy/update @@ -0,0 +1 @@ +pkgname="soapy-airspy" diff --git a/srcpkgs/SoapyHackRF/template b/srcpkgs/SoapyHackRF/template index 58010122b92..2527e997058 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/SoapyHackRF/update b/srcpkgs/SoapyHackRF/update new file mode 100644 index 00000000000..36c6d5eb7f5 --- /dev/null +++ b/srcpkgs/SoapyHackRF/update @@ -0,0 +1 @@ +pkgname="soapy-hackrf" diff --git a/srcpkgs/SoapyRTLSDR/template b/srcpkgs/SoapyRTLSDR/template index 5e86952c8bf..fa021eb56bd 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/SoapyRTLSDR/update b/srcpkgs/SoapyRTLSDR/update new file mode 100644 index 00000000000..7c31d661990 --- /dev/null +++ b/srcpkgs/SoapyRTLSDR/update @@ -0,0 +1 @@ +pkgname="soapy-rtlsdr" diff --git a/srcpkgs/SoapySDR/update b/srcpkgs/SoapySDR/update new file mode 100644 index 00000000000..ae3f6d86d24 --- /dev/null +++ b/srcpkgs/SoapySDR/update @@ -0,0 +1 @@ +pkgname="soapy-sdr" diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template index 978b1bde15f..b1b0fb3867a 100644 --- a/srcpkgs/Uranium/template +++ b/srcpkgs/Uranium/template @@ -1,15 +1,16 @@ # Template file for 'Uranium' pkgname=Uranium version=3.3.0 -revision=1 -python_version=3 +revision=2 +noarch=yes build_style=cmake -hostmakedepends="python3-setuptools" -makedepends="python3-devel" +pycompile_module="UM" +pycompile_dirs="usr/lib/uranium/plugins" +hostmakedepends="python3" depends="libArcus-python3 python3-PyQt5-opengl python3-PyQt5-quick python3-PyQt5-svg python3-numpy-stl python3-scipy qt5-quickcontrols qt5-quickcontrols2" -short_desc="A Python framework for building Desktop applications" +short_desc="Python framework for building Desktop applications" maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/Uranium" diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index dded7cf9b41..88ea74ceff9 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/abi-compliance-checker/template b/srcpkgs/abi-compliance-checker/template index 85bf759ea4b..fdd8f6d2961 100644 --- a/srcpkgs/abi-compliance-checker/template +++ b/srcpkgs/abi-compliance-checker/template @@ -1,16 +1,21 @@ # Template file for 'abi-compliance-checker' pkgname=abi-compliance-checker -version=2.2 +version=2.3 revision=1 +noarch=yes hostmakedepends="perl" -depends="perl binutils ctags" +depends="binutils ctags perl" +checkdepends="binutils ctags" short_desc="A tool for checking backward API/ABI compat of a C/C++ library" maintainer="maxice8 " -license="GPL-3" +license="LGPL-2.1-or-later" homepage="https://github.com/lvc/abi-compliance-checker" distfiles="https://github.com/lvc/abi-compliance-checker/archive/${version}.tar.gz" -checksum=9fb7b17e33d49e301d02a6374fbd2596feb53ecc77194879a4e1c2d1e24b4ddb -noarch=yes +checksum=b1e32a484211ec05d7f265ab4d2c1c52dcdb610708cb3f74d8aaeb7fe9685d64 + +do_check() { + perl abi-compliance-checker.pl -test +} do_install() { vmkdir usr diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template index beca0636890..9331c0a626f 100644 --- a/srcpkgs/acpica-utils/template +++ b/srcpkgs/acpica-utils/template @@ -1,6 +1,6 @@ # Template file for 'acpica-utils' pkgname=acpica-utils -version=20180427 +version=20180508 revision=1 wrksrc="acpica-unix-${version}" hostmakedepends="flex" @@ -9,7 +9,7 @@ license="GPL-2.0-only, BSD-3-Clause" maintainer="Juan RP " homepage="https://www.acpica.org/" distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz" -checksum=ae01b2d9e06192dca8fec9ccba327f766454e10935f98f608ec7de2690fd0c16 +checksum=2b81e45cb9cc5116e9bbb39f8822ff90ec44f9f2bf6fa87243e2cd7376c5f4d8 only_for_archs="i686 i686-musl x86_64 x86_64-musl" do_build() { diff --git a/srcpkgs/acr/template b/srcpkgs/acr/template index 1e05b1aa8d8..11fab37b8b4 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/aircrack-ng/template b/srcpkgs/aircrack-ng/template index 5f45cd3549e..91b997f9ccb 100644 --- a/srcpkgs/aircrack-ng/template +++ b/srcpkgs/aircrack-ng/template @@ -1,28 +1,26 @@ -# Template build file for 'aircrack-ng' +# Template file for 'aircrack-ng' pkgname=aircrack-ng -_aircrack_ver=1.2 -_aircrack_rc=rc4 -version="${_aircrack_ver}${_aircrack_rc}" -revision=7 -wrksrc="${pkgname}-${_aircrack_ver}-${_aircrack_rc}" -hostmakedepends="pkg-config" -makedepends="zlib-devel libressl-devel sqlite-devel libnl3-devel" -short_desc="A key cracker for the 802.11 WEP and WPA-PSK protocols" -homepage="http://www.aircrack-ng.org/" +version=1.2 +revision=1 +build_style=gnu-configure +hostmakedepends="automake libtool pkg-config" +makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel" +short_desc="Complete suite of tools to assess WiFi network security" maintainer="Juan RP " -license="GPL-2" -distfiles="http://download.aircrack-ng.org/${pkgname}-${_aircrack_ver}-${_aircrack_rc}.tar.gz" -checksum=d93ac16aade5b4d37ab8cdf6ce4b855835096ccf83deb65ffdeff6d666eaff36 +license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL" +homepage="http://www.aircrack-ng.org/" +distfiles="https://download.aircrack-ng.org/${pkgname}-${version}.tar.gz" +checksum=794ffed5400f35cb78f3466eabb47546f050e0ac35287c174acce60763a0fa7c -post_extract() { - # detect our cross compilers - sed -i 's,\(mips-\* | arm-\*\),\1 | arm???-* | aarch64-* ,' autocfg +case "$XBPS_TARGET_MACHINE" in + armv6*) broken="https://travis-ci.org/voidlinux/void-packages/jobs/377975294#L1206";; + armv7*) broken="https://travis-ci.org/voidlinux/void-packages/jobs/377975296#L1091";; +esac + +pre_configure() { + NOCONFIGURE=1 ./autogen.sh } -do_build() { - make CC=$CC CXX=$CXX sqlite=true libnl=true ${makejobs} -} - -do_install() { - make prefix=/usr sbindir=/usr/bin DESTDIR=${DESTDIR} sqlite=true libnl=true install +post_install() { + vlicense LICENSE.OpenSSL } diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template index f71bae7a23e..36e164fc1bc 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/albert/template b/srcpkgs/albert/template index bfbcfcfdba8..a5170002e35 100644 --- a/srcpkgs/albert/template +++ b/srcpkgs/albert/template @@ -1,9 +1,9 @@ # Template file for 'albert' pkgname=albert -version=0.14.18 +version=0.14.19 revision=1 -_plugins_hash=c59061f179032974c4a1b46dc045bdbb57614255 -_pybind_version=2.2.2 +_plugins_hash=d71c4676c4c94e1760112a8a3850594b6ba3a1db +_pybind_version=2.2.3 build_style=cmake configure_args="-DBUILD_VIRTUALBOX=OFF" makedepends="libqalculate-devel muparser-devel python-devel qt5-declarative-devel @@ -12,20 +12,24 @@ makedepends="libqalculate-devel muparser-devel python-devel qt5-declarative-deve depends="qt5-plugin-sqlite" short_desc="Lightweight desktop environment agnostic launcher" maintainer="Nemh " -license="GPL-3" +license="GPL-3.0-or-later, BSD-3-Clause" homepage="https://github.com/albertlauncher/albert" distfiles="https://github.com/albertlauncher/albert/archive/v${version}.tar.gz https://github.com/albertlauncher/plugins/archive/${_plugins_hash}.tar.gz https://github.com/pybind/pybind11/archive/v${_pybind_version}.tar.gz" -checksum="074b8dc50032edc8fbeb6efc9743b39cb8aa0619f9c8ae9441b9074eac14bd8c - 8cae60c57e694a47ee1060340ab19c2b29cccbaf1ec8309f1053ccf16161ae70 - b639a2b2cbf1c467849660801c4665ffc1a4d0a9e153ae1996ed6f21c492064e" +checksum="ec0f4f344c25a87b7ccaaa2feefac9b7e67185fb978b6369cb4f34b16975d1b9 + ec0519de807a9f4f18e4ad5736ffc1d40fff668499b19c5463d58b6f4f727a08 + 3a3b7b651afab1c5ba557f4c37d785a522b8030dfc765da26adc2ecd1de940ea" if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" fi post_extract() { - cp -rup ${wrksrc}/../plugins-*/* ${wrksrc}/plugins - cp -rup ${wrksrc}/../pybind11-*/* ${wrksrc}/plugins/python/pybind11 + cp -rup ../plugins-${_plugins_hash}/* plugins + cp -rup ../pybind11-${_pybind_version}/* plugins/python/pybind11 +} + +post_install() { + vlicense ../pybind11-${_pybind_version}/LICENSE } diff --git a/srcpkgs/android-studio/files/android-studio.desktop b/srcpkgs/android-studio/files/android-studio.desktop new file mode 100644 index 00000000000..e0d611a8591 --- /dev/null +++ b/srcpkgs/android-studio/files/android-studio.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Android Studio +Exec=android-studio +Icon=/opt/android-studio/bin/studio.png +Terminal=false +Categories=Development diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template index aa58a0c6b13..16c68caaff4 100644 --- a/srcpkgs/android-studio/template +++ b/srcpkgs/android-studio/template @@ -1,10 +1,10 @@ # Template file for 'android-studio' pkgname=android-studio -version=3.0.1 -revision=2 +version=3.1.2 +revision=1 # _studio_build and _studio_rev are for downloading the zip from dl.google.com # https://developer.android.com/studio/index.html#resources as of 2017-07-04 -_studio_build=171.4443003 +_studio_build=173.4720617 _studio_rev=0 # changlelog="https://developer.android.com/studio/releases/index.html" create_wrksrc=yes @@ -16,7 +16,7 @@ maintainer="Jordyn Carattini " repository=nonfree only_for_archs="x86_64 i686" distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.zip" -checksum=ad7110ed2ffc662b7a13efa5064390c8e8e74815d8c688351bd8829331852acf +checksum=13f290279790df570bb6592f72a979a495f7591960a378abea7876ece7252ec1 license="Apache-2.0" homepage="http://tools.android.com/" nopie=yes @@ -39,5 +39,6 @@ do_install() { vcopy android-studio/plugins opt/${pkgname}/ vmkdir usr/bin ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio + vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/ chmod -R ugo+rX ${DESTDIR}/opt } diff --git a/srcpkgs/android-studio/update b/srcpkgs/android-studio/update new file mode 100644 index 00000000000..6f77c9f1b2b --- /dev/null +++ b/srcpkgs/android-studio/update @@ -0,0 +1,2 @@ +site="https://developer.android.com/studio/releases/index.html" +pattern=">\K[\d.]+(?= \(\w+ \d+\)" license="AGPL-3" homepage="http://ankisrs.net" distfiles="http://ankisrs.net/downloads/current/${pkgname}-${version}-source.tgz" -checksum=fbb5356d642a94a2cb2fb7f949e6db7c8acbe322f38a18c0603ff88f5bd4eb18 +checksum=37b2c601762ea8bfc7b9fc3e3067b82b0ad48c27b58076f6fd636f52930b1816 do_install() { vmkdir usr/share/anki @@ -31,4 +31,6 @@ do_install() { vinstall anki.desktop 644 usr/share/applications vbin runanki anki vman anki.1 + + vlicense LICENSE } diff --git a/srcpkgs/annie/template b/srcpkgs/annie/template index 9c55514b19b..9da84e693d4 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/ansible/template b/srcpkgs/ansible/template index fde61101ccb..2ddde4adcd9 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=2.5.2 +version=2.5.3 revision=1 noarch=yes build_style=python2-module @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://www.ansible.com/" distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz" -checksum=a95483f3b33e0f97d03badaad073392ed03a2b2f526bec4ddf598edfc1c03ae5 +checksum=0b34126dad0a77fce220d264ba5179221bbff82af5fda5de197dffb96171749c post_install() { for f in examples/*; do diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template index 1ea6806b4b0..58a5ee7891c 100644 --- a/srcpkgs/antibody/template +++ b/srcpkgs/antibody/template @@ -1,7 +1,7 @@ # Template file for 'antibody' pkgname=antibody -version=3.4.5 -revision=2 +version=3.4.6 +revision=1 build_style=go go_import_path="github.com/getantibody/antibody" hostmakedepends="git" @@ -10,7 +10,7 @@ maintainer="SolitudeSF " license="MIT" homepage="https://getantibody.github.io/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=affd74144426ee11a8605427a387a6a704ad5a28a11c08b17007a16f78a221de +checksum=985875bd8ffc8dc8ae421c4f3becfd55cd147ca3a3e30513158ef7048fae8a6d post_install() { vlicense LICENSE.md diff --git a/srcpkgs/apulse/template b/srcpkgs/apulse/template index e4ce8be7172..7d4706ca6d4 100644 --- a/srcpkgs/apulse/template +++ b/srcpkgs/apulse/template @@ -1,6 +1,6 @@ # Template file for 'apulse' pkgname=apulse -version=0.1.11 +version=0.1.12 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller " license="MIT" homepage="http://github.com/i-rinat/apulse" distfiles="https://codeload.github.com/i-rinat/${pkgname}/tar.gz/v${version}>${pkgname}-${version}.tar.gz" -checksum=23197df38d1b7c997c9431395878c9464a59204cdb1e4ccd043f88250ead5e9d +checksum=cfcadfe971abd785ed3ca24e576fcbaade185525c1eda76daf32dbf298e52892 post_install() { vlicense LICENSE.MIT diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index dca8c00f4ec..7c6bba348a3 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,17 +1,20 @@ # Template file for 'aria2' pkgname=aria2 -version=1.33.1 -revision=3 +version=1.34.0 +revision=1 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-bashcompletiondir=/usr/share/bash-completion/completions" hostmakedepends="pkg-config" -makedepends="zlib-devel gmp-devel expat-devel libressl-devel sqlite-devel c-ares-devel" +makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel + zlib-devel" depends="ca-certificates" +checkdepends="libcppunit-devel" short_desc="Lightweight multi-protocol/multi-source command-line download utility" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://aria2.github.io/" -distfiles="https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${pkgname}-${version}.tar.xz" -checksum=2539e4844f55a1f1f5c46ad42744335266053a69162e964d9a2d80a362c75e1b +#changelog="https://raw.githubusercontent.com/aria2/aria2/master/NEWS" +distfiles="https://github.com/aria2/aria2/releases/download/release-${version}/aria2-${version}.tar.xz" +checksum=3a44a802631606e138a9e172a3e9f5bcbaac43ce2895c1d8e2b46f30487e77a3 diff --git a/srcpkgs/autotrace/template b/srcpkgs/autotrace/template index 3653b7f1311..4d5a2b25ded 100644 --- a/srcpkgs/autotrace/template +++ b/srcpkgs/autotrace/template @@ -1,10 +1,10 @@ # Template file for 'autotrace' pkgname=autotrace version=0.31.1 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config libtool automake" -makedepends="libmagick-devel libpng-devel" +makedepends="libmagick-devel libpng-devel libxml2-devel libXext-devel" short_desc="Converts bitmap image data into vector graphics" maintainer="Christian Neukirchen " license="GPL-3" diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template index 2006ddc174c..963995ffb7b 100644 --- a/srcpkgs/avidemux/template +++ b/srcpkgs/avidemux/template @@ -1,7 +1,7 @@ # Template file for 'avidemux' pkgname=avidemux version=2.7.0 -revision=4 +revision=5 wrksrc="${pkgname}_${version}" hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel yasm" makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-devel diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template index 0da8e5ba648..be51be0171e 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 ff35d8e58c5..25e1a2fa2c0 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 00000000000..cea14745a48 --- /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 00000000000..f57a57edaf3 --- /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 00000000000..c59b48edf94 --- /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 00000000000..fe5704552f7 --- /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 00000000000..d165a70516b --- /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 adbf6f9aeb5..b85137515e7 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/bfs/template b/srcpkgs/bfs/template index 398af2cb344..5455c120ae1 100644 --- a/srcpkgs/bfs/template +++ b/srcpkgs/bfs/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-makefile short_desc="Breadth-first version of the UNIX find command" maintainer="maxice8 " -license="BSD" +license="0BSD" homepage="https://github.com/tavianator/bfs" distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz" checksum=e3e7fb7d8d7508b0b9e789b32c492d962b5726f9b6b7951cf3359c97d47b2f82 diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index 5fdbb48189e..eccb2e6d1fb 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -1,6 +1,6 @@ # Template file for 'bijiben' pkgname=bijiben -version=3.28.1 +version=3.28.2 revision=1 build_style=meson hostmakedepends="automake gobject-introspection intltool itstool pkg-config" @@ -10,6 +10,7 @@ depends="desktop-file-utils tracker zeitgeist" short_desc="Intuitive note editor with strong GNOME desktop integration" maintainer="Juan RP " license="GPL-3.0-or-later" -homepage="http://live.gnome.org/Apps/Bijiben" +#changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS" +homepage="https://live.gnome.org/Apps/Bijiben" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=2778dea2b6e02d12d62823bbc7e12e48e0c1d3a706d8b5eec70a9f77171c7d47 +checksum=5a6ed663d0cc54725f6fb9c8e7626f12ccd34740f99eadfc11d5fb2bafc62dfc diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index f64a75261c1..d3594e1d70d 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,14 +1,14 @@ # Template file for 'bmake' pkgname=bmake -version=20180222 +version=20180512 revision=1 create_wrksrc=yes short_desc="Portable version of the NetBSD make build tool" maintainer="Juan RP " -license="BSD" +license="BSD-3-Clause" homepage="http://www.crufty.net/help/sjg/bmake.html" distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=6069ea5e72943fe3f7fb4ac43a189b99a90fd830bf6c84572f631f3aa7f507f9 +checksum=ac3cd262065fcc20c1dec7c95f06306c8138b3e17025b949343a06a8980a5508 do_configure() { cd bmake @@ -23,6 +23,7 @@ do_configure() { cp linux*-*/bmake . fi } + do_build() { mkdir -p bmake/bmake-build cd bmake/bmake-build diff --git a/srcpkgs/buku/template b/srcpkgs/buku/template index 8d3bb98c3e9..bad50406fb3 100644 --- a/srcpkgs/buku/template +++ b/srcpkgs/buku/template @@ -1,24 +1,21 @@ # Template file for 'buku' pkgname=buku -version=3.7 -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" +version=3.8 +revision=2 +noarch=yes +wrksrc="Buku-${version}" +checkdepends="python3-BeautifulSoup4 python3-cryptography python3-hypothesis + python3-pytest python3-urllib3 python3-yaml" +depends="python3-urllib3" +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/bum/template b/srcpkgs/bum/template index 100c48805a5..52985af607a 100644 --- a/srcpkgs/bum/template +++ b/srcpkgs/bum/template @@ -1,12 +1,12 @@ # Template file for 'bum' pkgname=bum version=0.1.3 -revision=1 +revision=2 noarch=yes build_style=python3-module pycompile_modules="bum" hostmakedepends="python3-setuptools" -depends="python3-mpd2 python3-musicbrainzngs python3-mpv" +depends="python3-setuptools python3-mpd2 python3-musicbrainzngs python3-mpv" short_desc="Daemon that downloads and displays album arts via MPD events" maintainer="maxice8 " license="MIT" diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template index 5c792a37466..e83e73042d6 100644 --- a/srcpkgs/bumblebee-status/template +++ b/srcpkgs/bumblebee-status/template @@ -1,21 +1,20 @@ # Template file for 'bumblebee-status' pkgname=bumblebee-status -version=1.4.4 +version=1.6.1 revision=1 -depends="python python-requests python-psutil python-netifaces" noarch=yes -short_desc="A modular, theme-able status line generator for the i3 window manager. " +depends="python-netifaces python-psutil python-requests" +pycompile_dirs="usr/share/${pkgname}/bumblebee" +short_desc="Modular, theme-able status line generator for the i3 window manager. " maintainer="ibrokemypie " license="MIT" homepage="https://github.com/tobi-wan-kenobi/bumblebee-status" distfiles="https://github.com/tobi-wan-kenobi/bumblebee-status/archive/v${version}.tar.gz" -checksum=4a414205b081c58765a465a3612619b659476247bdb74c72361fde64fe059b9c +checksum=61fd3977d52b4caad08f79aa736a073091bc010e903b03d8aa8e781087562f23 do_install() { vmkdir usr/share/${pkgname} - vcopy bumblebee usr/share/${pkgname}/ - vcopy themes usr/share/${pkgname}/ - vcopy bumblebee-status usr/share/${pkgname}/ + vcopy "bumblebee themes bumblebee-status" usr/share/${pkgname} vbin "${FILESDIR}/bumblebee-status" vdoc README.md vlicense LICENSE diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index bce73c61873..bd9acdde2e8 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 74e1e239945..34031c72689 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 0b5e22424e0..5dcf54d4ab5 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/ca-certificates/template b/srcpkgs/ca-certificates/template index e5c99bcef13..f5e4c768afe 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -1,7 +1,8 @@ # Template file for 'ca-certificates' pkgname=ca-certificates -version=20180409 -revision=1 +reverts=20180409_1 +version=20170717 +revision=3 wrksrc="${pkgname}" bootstrap=yes noarch="yes" @@ -13,7 +14,7 @@ maintainer="Juan RP " homepage="https://tracker.debian.org/pkg/ca-certificates" license="GPL-2, MPL-2.0" distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.xz" -checksum=7af6f5bfc619fd29cbf0258c1d95107c38ce840ad6274e343e1e0d971fc72b51 +checksum=e487639b641fa75445174734dd6e9d600373e3248b3d86a7e3c6d0f6977decd2 post_extract() { $BUILD_CC $BUILD_CFLAGS ${FILESDIR}/certdata2pem.c -o ${wrksrc}/mozilla/certdata2pem diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template index 3751d059b4f..0ee7586ee0a 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 140a2bce660..29e963015c9 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 549dfa02ca5..f22a60b0a12 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/cava-gui/template b/srcpkgs/cava-gui/template index 82ee20d431a..ab254098466 100644 --- a/srcpkgs/cava-gui/template +++ b/srcpkgs/cava-gui/template @@ -1,18 +1,17 @@ # Template file for 'cava-gui' pkgname=cava-gui -version=0.6.0.2 -revision=1 +version=0.6.1 +revision=2 wrksrc="cava-${version}" build_style=gnu-configure hostmakedepends="automake libtool" -makedepends="alsa-lib-devel pulseaudio-devel fftw-devel ncurses-devel - iniparser-devel SDL2-devel libX11-devel glu-devel" +makedepends="SDL2-devel iniparser-devel ncurses-devel sndio-devel portaudio-devel" short_desc="Console-based Audio Visualizer for ALSA (GUI branch)" maintainer="nik123 " -homepage="https://github.com/nikp123/cava" license="MIT" +homepage="https://github.com/nikp123/cava" distfiles="https://github.com/nikp123/cava/archive/${version}.tar.gz" -checksum=18d49702bf63b73d933e9a069323d4f5b94f527fe47647361fd403e3c0907b9d +checksum=e639c55521e18786d15ac348c5130ca41637c10b0ef0a7aa340da1c62b9387f9 conflicts=cava pre_configure() { @@ -21,4 +20,6 @@ pre_configure() { post_install() { vlicense LICENSE + vmkdir usr/share/examples + vcopy example_files usr/share/examples/cava } diff --git a/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch b/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch deleted file mode 100644 index e1089f94a02..00000000000 --- a/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- utils/toc2mp3.cc -+++ utils/toc2mp3.cc -@@ -143,8 +143,8 @@ - - message(0, "LAME encoder version: %s", get_lame_version()); - message(0, "Supported bit rates: "); -- for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { -- message(0, "%d ", bitrate_table[1][i]); -+ for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) { -+ message(0, "%d ", lame_get_bitrate(1, i)); - } - message(0, ""); - } -@@ -238,8 +238,8 @@ - lame_global_flags *lf; - int bitrateOk = 0; - -- for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { -- if (bitrate == bitrate_table[1][i]) -+ for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) { -+ if (bitrate == lame_get_bitrate(1, i)) - bitrateOk = 1; - } - diff --git a/srcpkgs/cdrdao/patches/fix-narrowing.patch b/srcpkgs/cdrdao/patches/fix-narrowing.patch deleted file mode 100644 index df55322463a..00000000000 --- a/srcpkgs/cdrdao/patches/fix-narrowing.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- dao/CdrDriver.cc 2009-09-12 18:21:25.000000000 +0200 -+++ dao/CdrDriver.cc 2016-09-13 09:21:23.465964372 +0200 -@@ -495,7 +495,7 @@ - 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0 - }; - --char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; -+unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; - - - /* Maps a string to the corresponding driver option value ---- dao/CdrDriver.h 2009-02-21 11:27:31.000000000 +0100 -+++ dao/CdrDriver.h 2016-09-13 09:21:41.068972901 +0200 -@@ -440,7 +440,7 @@ - bool fullBurn_; - - static unsigned char syncPattern[12]; -- static char REMOTE_MSG_SYNC_[4]; -+ static unsigned char REMOTE_MSG_SYNC_[4]; - - static int speed2Mult(int); - static int mult2Speed(int); diff --git a/srcpkgs/cdrdao/patches/fix-stat-includes.patch b/srcpkgs/cdrdao/patches/fix-stat-includes.patch deleted file mode 100644 index c6470dd447f..00000000000 --- a/srcpkgs/cdrdao/patches/fix-stat-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- dao/ScsiIf-linux.cc.orig 2016-04-30 11:38:51.281429655 +0200 -+++ dao/ScsiIf-linux.cc 2016-04-30 11:39:19.146429156 +0200 -@@ -19,6 +19,9 @@ - - #include - -+#include -+#include -+ - #include - #include - #include diff --git a/srcpkgs/cdrdao/template b/srcpkgs/cdrdao/template index df9be733e34..3684d20bb0b 100644 --- a/srcpkgs/cdrdao/template +++ b/srcpkgs/cdrdao/template @@ -1,16 +1,16 @@ # Template file for 'cdrdao' pkgname=cdrdao -version=1.2.3 -revision=3 +version=1.2.4 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="lame-devel libmad-devel libvorbis-devel libao-devel" +makedepends="lame-devel libao-devel libmad-devel libvorbis-devel" short_desc="Records audio or data CD-Rs in disk-at-once (DAO) mode" maintainer="Orphaned " -license="GPL-2" +license="GPL-2..0-or-later" homepage="http://cdrdao.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/cdrdao/cdrdao/1.2.3/cdrdao-1.2.3.tar.bz2" -checksum=8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e +distfiles="${SOURCEFORGE_SITE}/cdrdao/${version}/cdrdao-${version}.tar.bz2" +checksum=358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4 pre_build() { local f diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template index 183d8c31ed4..bd1190d4b27 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 f744579ba35..0cb01d1f8db 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 +version=0.4.0 +revision=1 build_style=go hostmakedepends="git" go_import_path="github.com/alecthomas/${pkgname}" @@ -10,8 +10,8 @@ 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}" -checksum=c48ce658a25f3422b4c493d769b823b2eb5ce9c19748ccff304bad4099ee54f3 +homepage="https://github.com/alecthomas/chroma" +checksum=dac48b59829eedda44185820d5fc0aedba55b984a34d54919d558781f7f22ba7 post_install() { vlicense COPYING diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template index a7e352cdb30..66be7086dd0 100644 --- a/srcpkgs/chronograf/template +++ b/srcpkgs/chronograf/template @@ -1,7 +1,7 @@ # Template file for 'chronograf' pkgname=chronograf -version=1.3.10.0 -revision=6 +version=1.4.4.2 +revision=1 build_style=go go_import_path="github.com/influxdata/${pkgname}" go_package="${go_import_path}/cmd/chronograf" @@ -15,7 +15,7 @@ maintainer="Michael Aldridge " license="AGPL-3.0" homepage="https://www.influxdata.com/time-series-platform/chronograf/" distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz" -checksum=73a82a1a9ae4c3f734f0469f2ccab1066fef526c5574c0d38d67c2afa7889811 +checksum=5bedf8f51eac859d762994d7c45fdfef45da5cd5b1d7f36e442f7eebde37c057 pre_build() { cd $GOSRCPATH diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index cfa6f4d1c27..9c3656aaa8f 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 4b2774824d4..1eb4610c3aa 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/colord/template b/srcpkgs/colord/template index 89c1c9f770e..7e16197d7fa 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -1,13 +1,13 @@ # Template file for 'colord' pkgname=colord version=1.3.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-udevrulesdir=/usr/lib/udev/rules.d --with-daemon-user=colord --enable-polkit $(vopt_enable gusb) --enable-udev --enable-sane --disable-argyllcms-sensor $(vopt_enable gir introspection) - --disable-systemd-login --enable-vala" + --disable-systemd-login --disable-vala" conf_files="/etc/dbus-1/system.d/org.freedesktop.ColorManager.conf" system_accounts="colord" colord_homedir="/var/lib/colord" @@ -23,7 +23,7 @@ checksum=2daa8ffd2a532d7094927cd1a4af595b8310cea66f7707edcf6ab743460feed2 hostmakedepends="docbook2x gobject-introspection intltool pkg-config" makedepends="bash-completion lcms2-devel libgudev-devel polkit-devel sane-devel - sqlite-devel vala-devel $(vopt_if gusb 'libusb-devel libgusb-devel')" + sqlite-devel $(vopt_if gusb 'libusb-devel libgusb-devel')" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake libtool gettext-devel glib-devel gtk-doc colord" @@ -65,7 +65,6 @@ colord-devel_package() { vmove "usr/lib/*.so" if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 - vmove usr/share/vala fi } } diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template index 679e4977652..bde3cbc5b7e 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/crash/template b/srcpkgs/crash/template index 851976d34ad..d35581662db 100644 --- a/srcpkgs/crash/template +++ b/srcpkgs/crash/template @@ -1,16 +1,17 @@ # Template file for 'crash' pkgname=crash -version=7.2.1 +version=7.2.3 revision=1 build_style=gnu-makefile hostmakedepends="flex" -makedepends="ncurses-devel zlib-devel lzo-devel" +makedepends="lzo-devel ncurses-devel zlib-devel" short_desc="Kernel crash dump debugger and live inspector" maintainer="Leah Neukirchen " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://people.redhat.com/anderson/" +#changelog="https://people.redhat.com/anderson/crash.changelog.html" distfiles="http://people.redhat.com/anderson/${pkgname}-${version}.tar.gz" -checksum=6510da25db7ad2f49fd2a8bce7b5939ecb561152767423deaa22873e242413a3 +checksum=d34d4e3962bd8ef786e6fa4933105ae9049f052aaa2afce45492e2bd78a66112 only_for_archs="i686 x86_64" # broken on musl nocross=yes LDFLAGS=-llzo2 @@ -25,6 +26,7 @@ post_extract() { sed -i 's|/boot/efi/redhat|/usr/lib/debug/boot/|g' filesys.c sed -i '/^LDFLAGS=/d' Makefile } + do_build() { make gdb_unzip sed -i 's|sys/debugreg.h|asm/debugreg.h|g' gdb-7.6/gdb/amd64-linux-nat.c @@ -33,6 +35,7 @@ do_build() { make ${makejobs} lzo make ${makejobs} extensions } + do_install() { vbin crash vman crash.8 diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template index 100c56ada41..87dddba1b79 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 07de4f599f6..f4ae6a77b11 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/cura-engine/template b/srcpkgs/cura-engine/template index fedf24142a9..8ff820c5940 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -4,7 +4,7 @@ version=3.3.0 revision=1 wrksrc="CuraEngine-${version}" build_style=cmake -configure_args="-DCURA_ENGINE_VERSION:STRING=${version}" +configure_args="-DCURA_ENGINE_VERSION=${version}" hostmakedepends="protobuf" makedepends="libArcus-devel libgomp-devel protobuf-devel" short_desc="Engine for processing 3D models into GCode" @@ -14,8 +14,6 @@ homepage="https://github.com/Ultimaker/CuraEngine" distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz" checksum=a8fd7deb505771d2e7cf3a2c2d7e78479f59e001a990374ed505030804dc71fc -CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1 -D_GLIBCXX_USE_C99_STDLIB=1" - post_install() { vlicense LICENSE } diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template index c5d9ff8e508..58e837f179d 100644 --- a/srcpkgs/cura-fdm-materials/template +++ b/srcpkgs/cura-fdm-materials/template @@ -1,9 +1,10 @@ # Template file for 'cura-fdm-materials' pkgname=cura-fdm-materials version=3.3.0 -revision=1 -wrksrc="fdm_materials-${version}" +revision=2 +noarch=yes build_style=cmake +wrksrc="fdm_materials-${version}" short_desc="FDM Material database" maintainer="Karl Nilsson " license="CC0-1.0" diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template index a81591b3d29..258b394939f 100644 --- a/srcpkgs/cura/template +++ b/srcpkgs/cura/template @@ -1,14 +1,15 @@ # Template file for 'cura' pkgname=cura version=3.3.1 -revision=1 -python_version=3 +revision=2 +noarch=yes wrksrc="Cura-${version}" build_style=cmake -configure_args="-DCURA_VERSION:STRING=${version}" +configure_args="-DCURA_VERSION=${version}" +pycompile_module="cura" +pycompile_dirs="usr/lib/cura/plugins" makedepends="Uranium libArcus-devel" -depends="Uranium cura-engine cura-fdm-materials python3-pyserial - python3-zeroconf" +depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf" short_desc="3D printer / slicing GUI" maintainer="Karl Nilsson " license="LGPL-3.0-or-later" diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index e438d871c7a..e9c35b5e0ad 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,27 +1,26 @@ -# Template build file for 'curl'. +# Template build file for 'curl' pkgname=curl -version=7.59.0 -revision=2 +version=7.60.0 +revision=1 build_style=gnu-configure -configure_args="ac_cv_sizeof_off_t=8 - --enable-threaded-resolver --enable-ipv6 $(vopt_with rtmp) - $(vopt_with gssapi) - $(vopt_enable ldap) $(vopt_enable ldap ldaps) - $(vopt_with ssh ssh2) $(vopt_with ssl) $(vopt_with gnutls) +configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 + $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnuts) + $(vopt_enable ldap ldaps) $(vopt_with ssh ssh2) $(vopt_with ssl) --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2" -hostmakedepends="pkg-config perl groff" -makedepends="zlib-devel nghttp2-devel - $(vopt_if gssapi mit-krb5-devel) - $(vopt_if rtmp librtmp-devel) - $(vopt_if ldap libldap-devel) $(vopt_if ssh libssh2-devel) - $(vopt_if ssl libressl-devel) $(vopt_if gnutls gnutls-devel)" +hostmakedepends="groff perl pkg-config" +makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel') + $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel') + $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel') + $(vopt_if ssl 'libressl-devel')" depends="ca-certificates" +checkdepends="python" short_desc="Client that groks URLs" maintainer="Juan RP " license="MIT" homepage="https://curl.haxx.se" +#changelog="https://curl.haxx.se/changes.html#${version//./_}" distfiles="$homepage/download/$pkgname-$version.tar.bz2" -checksum=b5920ffd6a8c95585fb95070e0ced38322790cb335c39d0dab852d12e157b5a0 +checksum=897dfb2204bd99be328279f88f55b7c61592216b0542fcbe995c60aa92871e9b build_options="gnutls gssapi ldap rtmp ssh ssl" build_options_default="ssh ssl" vopt_conflict ssl gnutls diff --git a/srcpkgs/dash/patches/noblock-sigchld.diff b/srcpkgs/dash/patches/noblock-sigchld.diff deleted file mode 100644 index 7501d0d1028..00000000000 --- a/srcpkgs/dash/patches/noblock-sigchld.diff +++ /dev/null @@ -1,64 +0,0 @@ -Subject: [PATCH v3] jobs - Do not block when waiting on SIGCHLD -Message-ID: <20180506164034.s6y4n7yt2gianh63@gondor.apana.org.au> - -diff --git a/src/eval.c b/src/eval.c -index a27d657..39c4e41 100644 ---- src/eval.c -+++ src/eval.c -@@ -859,10 +859,8 @@ bail: - if (!(flags & EV_EXIT) || have_traps()) { - INTOFF; - jp = makejob(cmd, 1); -- if (forkshell(jp, cmd, FORK_FG) != 0) { -- INTON; -+ if (forkshell(jp, cmd, FORK_FG) != 0) - break; -- } - FORCEINTON; - } - listsetvar(varlist.list, VEXPORT|VSTACK); -@@ -875,11 +873,8 @@ bail: - if (execcmd && argc > 1) - listsetvar(varlist.list, VEXPORT); - } -- if (evalbltin(cmdentry.u.cmd, argc, argv, flags)) { -- if (exception == EXERROR && spclbltin <= 0) { -- FORCEINTON; -- break; -- } -+ if (evalbltin(cmdentry.u.cmd, argc, argv, flags) && -+ !(exception == EXERROR && spclbltin <= 0)) { - raise: - longjmp(handler->loc, 1); - } -@@ -892,6 +887,7 @@ raise: - } - - status = waitforjob(jp); -+ FORCEINTON; - - out: - if (cmd->ncmd.redirect) ---- src/jobs.c -+++ src/jobs.c -@@ -975,10 +975,17 @@ waitforjob(struct job *jp) - int st; - - TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0)); -- while ((jp && jp->state == JOBRUNNING) || gotsigchld) -- dowait(DOWAIT_BLOCK, jp); -- if (!jp) -+ if (!jp) { -+ int pid = gotsigchld; -+ -+ while (pid > 0) -+ pid = dowait(DOWAIT_NORMAL, NULL); -+ - return exitstatus; -+ } -+ -+ while (jp->state == JOBRUNNING) -+ dowait(DOWAIT_BLOCK, jp); - st = getstatus(jp); - #if JOBS - if (jp->jobctl) { diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template index 923c0d22291..7ca366e05e0 100644 --- a/srcpkgs/dash/template +++ b/srcpkgs/dash/template @@ -1,7 +1,7 @@ # Template file for 'dash' pkgname=dash -version=0.5.10 -revision=3 +version=0.5.10.2 +revision=1 build_style=gnu-configure hostmakedepends="bison" register_shell="/bin/sh /bin/dash" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="BSD-3-Clause" homepage="http://gondor.apana.org.au/~herbert/dash/" distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz" -checksum=ad70e0cc3116b424931c392912b3ebdb8053b21f3fd968c782f0b19fd8ae31ab +checksum=3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071 alternatives=" sh:sh:/usr/bin/dash diff --git a/srcpkgs/db/patches/gcc-atomic_compare_exchange.patch b/srcpkgs/db/patches/gcc-atomic_compare_exchange.patch new file mode 100644 index 00000000000..d80837fc60e --- /dev/null +++ b/srcpkgs/db/patches/gcc-atomic_compare_exchange.patch @@ -0,0 +1,20 @@ +--- src/dbinc/atomic.h 2013-06-03 21:04:07.000000000 +0200 ++++ src/dbinc/atomic.h 2013-06-03 21:10:53.000000000 +0200 +@@ -144,7 +144,7 @@ + #define atomic_inc(env, p) __atomic_inc(p) + #define atomic_dec(env, p) __atomic_dec(p) + #define atomic_compare_exchange(env, p, o, n) \ +- __atomic_compare_exchange((p), (o), (n)) ++ __atomic_compare_exchange_db((p), (o), (n)) + static inline int __atomic_inc(db_atomic_t *p) + { + int temp; +@@ -176,7 +176,7 @@ + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * which configure could be changed to use. + */ +-static inline int __atomic_compare_exchange( ++static inline int __atomic_compare_exchange_db( + db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) + { + atomic_value_t was; diff --git a/srcpkgs/db/template b/srcpkgs/db/template index 827356a0260..f55f537b83d 100644 --- a/srcpkgs/db/template +++ b/srcpkgs/db/template @@ -1,7 +1,7 @@ # Template file for 'db' pkgname=db version=5.3.28 -revision=6 +revision=7 wrksrc="db-${version}" build_wrksrc="build_unix" build_style=gnu-configure diff --git a/srcpkgs/ddrescue/template b/srcpkgs/ddrescue/template index de63f1e1031..432e93c297c 100644 --- a/srcpkgs/ddrescue/template +++ b/srcpkgs/ddrescue/template @@ -1,12 +1,12 @@ # Template file for 'ddrescue' pkgname=ddrescue version=1.23 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="lzip" short_desc="Data recovery tool" maintainer="Juan RP " -license="GPL-3" +license="GPL-2.0-or-later" homepage="http://www.gnu.org/software/ddrescue/ddrescue.html" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.lz" checksum=a9ae2dd44592bf386c9c156a5dacaeeb901573c9867ada3608f887d401338d8d diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index 3055234078b..7e8c6c1043d 100644 --- a/srcpkgs/debootstrap/template +++ b/srcpkgs/debootstrap/template @@ -1,6 +1,6 @@ # Template file for 'debootstrap' pkgname=debootstrap -version=1.0.98 +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="56cba560a646e21a74a835a088b74561a88ff70258171ad3c10791cc3dc47c21 +checksum="d988404ebd562a30d6b11303bca8921eb2f9a407a6425a65200f9afe852fbe1c 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0" do_install() { diff --git a/srcpkgs/desktop-file-utils/template b/srcpkgs/desktop-file-utils/template index f65bad5cfd7..183600878f5 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 f812188009c..702620b5a0a 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/dmtx-utils/template b/srcpkgs/dmtx-utils/template index e8b1b0c3c3d..fd52f787622 100644 --- a/srcpkgs/dmtx-utils/template +++ b/srcpkgs/dmtx-utils/template @@ -1,7 +1,7 @@ # Template file for 'dmtx-utils' pkgname=dmtx-utils version=0.7.4 -revision=7 +revision=8 build_style=gnu-configure maintainer="Orphaned " hostmakedepends="automake libtool pkg-config" diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template index 65a92320178..bb2f02503d6 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.12 +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=cd608949ea7f9e760626e4c6a70b5edcbd0452d0715342e07799dff2f85d5dfe +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 41db30aeeb6..31ef8a8d305 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/docker/template b/srcpkgs/docker/template index 0653041c88f..8bb756f4f69 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,7 +1,7 @@ # Template file for 'docker' pkgname=docker -version=18.02.0 -revision=2 +version=18.05.0 +revision=1 _subversion='-ce' _version="$version$_subversion" wrksrc="$pkgname$_subversion-$_version" @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://www.docker.io" distfiles="https://github.com/docker/docker-ce/archive/v$_version.tar.gz" -checksum=fb2b9db5ec1a7e9eb80913fb7790377bbbb0fe5aad033f498d09bcd15a51a5c2 +checksum=cc29408b382774b9f5967ee33851e97bcb7463aa7358d60004f28b836a70ba75 # These are required at run-time. depends="iptables xz git" @@ -23,6 +23,8 @@ nocross=yes only_for_archs="x86_64 x86_64-musl" system_groups="docker" +_docker_components="runc containerd tini proxy dockercli" + do_build() { AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ hack/make.sh dynbinary @@ -30,14 +32,11 @@ do_build() { pre_build() { vmkdir usr/bin - sed -i "s|/usr/local|$DESTDIR/usr|g; s|apparmor ||g" hack/dockerfile/install-binaries.sh - AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ - hack/dockerfile/install-binaries.sh \ - runc-dynamic \ - containerd-dynamic \ - tini \ - proxy-dynamic \ - dockercli + sed -i "s|/usr/local|$DESTDIR/usr|g; s|apparmor ||g" hack/dockerfile/install/install.sh + for COMPONENT in $_docker_components; do + AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ + hack/dockerfile/install/install.sh $COMPONENT + done } do_install() { diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 8944c15f222..9a485476b1e 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -3,7 +3,7 @@ only_for_archs="x86_64 x86_64-musl" pkgname=dolphin-emu version=5.0 -revision=10 +revision=11 wrksrc="dolphin-${version}" build_style=cmake nopie=yes diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch new file mode 100644 index 00000000000..fe770eda69b --- /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 eabe4618cce..6854e9df64b 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/duperemove/patches/musl.patch b/srcpkgs/duperemove/patches/musl.patch deleted file mode 100644 index c88ba0fad95..00000000000 --- a/srcpkgs/duperemove/patches/musl.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- util.c.orig 2016-04-25 08:52:55.441658244 +0200 -+++ util.c 2016-04-25 08:53:56.314297430 +0200 -@@ -24,7 +24,9 @@ - #include - #include - #include -+#ifdef __GLIBC__ - #include -+#endif - #include - - #include "debug.h" -@@ -125,12 +127,14 @@ void print_stack_trace(void) - char **messages = (char **)NULL; - int i, trace_size = 0; - -+#ifdef __GLIBC__ - trace_size = backtrace(trace, 16); - messages = backtrace_symbols(trace, trace_size); - printf("[stack trace follows]\n"); - for (i=0; i < trace_size; i++) - printf("%s\n", messages[i]); - free(messages); -+#endif - } - - void record_start(struct elapsed_time *e, const char *name) ---- util.h.orig 2016-04-25 08:56:23.538843339 +0200 -+++ util.h 2016-04-25 08:56:38.194997238 +0200 -@@ -2,6 +2,7 @@ - #define __UTIL_H__ - - #include -+#include - - /* controlled by user options, turns pretty print on if true. */ - extern int human_readable; diff --git a/srcpkgs/duperemove/template b/srcpkgs/duperemove/template index ffa06582bb6..00ecf71a4ef 100644 --- a/srcpkgs/duperemove/template +++ b/srcpkgs/duperemove/template @@ -1,15 +1,15 @@ # Template file for 'duperemove' pkgname=duperemove -version=0.10 -revision=2 +version=0.11 +revision=1 +hostmakedepends="pkg-config" +makedepends="sqlite-devel libglib-devel libgcrypt-devel libatomic-devel" short_desc="Tools for deduping file systems" maintainer="Enno Boland " -hostmakedepends="pkg-config" -makedepends="sqlite-devel libglib-devel libgcrypt-devel" license="GPL-2" homepage="https://github.com/markfasheh/duperemove" distfiles="https://github.com/markfasheh/duperemove/archive/v$version.tar.gz" -checksum=1ef855c4d0a85efc8757edcac5ea7189d896d2f2abad0e572c47f6568cf050aa +checksum=854735ae5e47527afbe5e07712753b498fd93966615c6d645189632f08ac5566 do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index d926cb84403..8efc4a51452 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -1,32 +1,33 @@ # Template file for 'e2fsprogs' pkgname=e2fsprogs -version=1.44.1 +version=1.44.2 revision=1 -short_desc="Ext2/3/4 Filesystem Utilities" -maintainer="Juan RP " -license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="http://e2fsprogs.sourceforge.net/" -distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz" -checksum=0ca164c1c87724df904c918b2d7051ef989b51de725db66c67514dbe6dd2b9ef - build_style=gnu-configure configure_args="--enable-elf-shlibs --disable-fsck --enable-e2initrd-helper --disable-rpath --with-root-prefix=/usr --disable-uuidd --disable-libuuid --disable-libblkid --enable-symlink-build --enable-symlink-install --enable-relative-symlinks --sbindir=/usr/bin --libdir=/usr/lib e2fsprogs_cv_struct_st_flags=no" -make_install_args="install-libs" hostmakedepends="automake gettext-devel libtool pkg-config" makedepends="libuuid-devel libblkid-devel" +short_desc="Ext2/3/4 Filesystem Utilities" +maintainer="Juan RP " +license="GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="http://e2fsprogs.sourceforge.net/" +distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz" +checksum=8324cf0b6e81805a741d94087b00e99f7e16144f1ee5a413709a1fa6948b126c +make_install_args="install-libs" conf_files="/etc/mke2fs.conf" pre_configure() { autoreconf -fi } + do_check() { ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib make LD_LIBRARY_PATH=/tools/lib check } + post_install() { # Remove stuff belonging to libblkid or libuuid pkgs. find ${DESTDIR} -name \*blkid\* -o -name \*findfs\* \ diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template index f4c3ef0bee3..adf54f2c14d 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/enchant/template b/srcpkgs/enchant/template index c80f24973d2..801bc20051d 100644 --- a/srcpkgs/enchant/template +++ b/srcpkgs/enchant/template @@ -1,7 +1,7 @@ # Template file for 'enchant' pkgname=enchant version=1.6.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--disable-zemberek --disable-ispell --disable-aspell --with-myspell-dir=/usr/share/hunspell" diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template index 7c256aee115..24a5d9debb4 100644 --- a/srcpkgs/enchant2/template +++ b/srcpkgs/enchant2/template @@ -1,7 +1,7 @@ # Template file for 'enchant2' pkgname=enchant2 version=2.2.3 -revision=1 +revision=2 wrksrc="enchant-${version}" build_style=gnu-configure hostmakedepends="pkg-config" @@ -12,6 +12,8 @@ maintainer="maxice8 " homepage="https://abiword.github.io/enchant/" distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz" checksum=abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d +make_build_args="pkgdatadir=/usr/share/enchant-2" +make_install_args="$make_build_args" enchant2-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index ffae90dc65a..1687770ad9a 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 6b8deea5fa7..c1dd11cb77f 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/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 092da398af2..2ab33acb5f2 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,6 +1,6 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.28.1 +version=3.28.2 revision=1 build_style=cmake configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF @@ -11,11 +11,12 @@ makedepends="libgdata-devel $(vopt_if gir libgweather-devel) libical-devel libse mit-krb5-devel $(vopt_if gir 'vala-devel') webkit2gtk-devel" depends="$(vopt_if gir libgweather) libsoup-gnome" short_desc="Centralized access to appointments and contacts" -license="LGPL-2.1-only" maintainer="Enno Boland " +license="LGPL-2.1-only" +#changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-28/NEWS" homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=6b04fc1adaba0541546267a77f1bc5aa549fe85eb9933492fdf994c69fa36989 +checksum=531a790182dc6b6b2d0421feb34489c7ddf5cc807e9cffbb87461d13e047f3ab build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 5d9f0a5f208..0dcc10715f7 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,14 +1,15 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.28.1 +version=3.28.2 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" -hostmakedepends="pkg-config libmspack intltool cmake gettext glib-devel" -makedepends="evolution-data-server-devel evolution-devel enchant-devel webkit2gtk-devel libmspack-devel" +hostmakedepends="cmake glib-devel intltool libmspack pkg-config" +makedepends="enchant-devel evolution-devel libmspack-devel webkit2gtk-devel" short_desc="MS Exchange integration through Exchange Web Services" maintainer="Peter Kuchar " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" +#changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-28/NEWS" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=9641cadfd3e19da1de9532c72a7717f91a3584498141a4c0c9dd1ca75cf1ee90 +checksum=8b495b9b077ba523943377847b6ab670cfe5d3f3d79e9c476c5462c82920b51a diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index d4d92f5434e..5e13d06ea16 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.28.1 +version=3.28.2 revision=1 build_style=cmake configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF @@ -16,14 +16,15 @@ short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" +#changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-28/NEWS" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=144967e51a1781626e542f7abc360a926059146ae957af3271e5d32d1e2dbb69 +checksum=e444a22d0bdca348b76edb59c7d15935dfa46bf731bf840060dcbada6555a953 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so" build_options="gir" if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" + build_options_default="gir" else hostmakedepends+=" glib-devel" configure_args+=" -D_correct_iconv_EXITCODE=0" diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 0575e019049..8f36b6c0b56 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=10.96 +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=21a68b13aaba2cd83b2f189bfd6939d3655f4c9ecfb6fed225dc8b9e5909a349 +checksum=127ab7f3e5cbbdb8cfa4955f8a44a2bac6a9ea67fac32cfa2dc9e65a89ca0b49 diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template index ea98c959607..064ace4a559 100644 --- a/srcpkgs/fail2ban/template +++ b/srcpkgs/fail2ban/template @@ -1,7 +1,7 @@ # Template file for 'fail2ban' pkgname=fail2ban version=0.10.3.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="pkg-config python3" depends="python3" @@ -19,6 +19,9 @@ conf_files=" /etc/fail2ban/action.d/*.conf /etc/fail2ban/filter.d/*.conf" +pre_build() { + ./fail2ban-2to3 +} post_install() { vsv fail2ban } diff --git a/srcpkgs/falkon/INSTALL.msg b/srcpkgs/falkon/INSTALL.msg deleted file mode 100644 index 42a7e9c2c76..00000000000 --- a/srcpkgs/falkon/INSTALL.msg +++ /dev/null @@ -1,4 +0,0 @@ -If you were using QupZilla previously and want to keep using your -profiles in Falkon, you can manually migrate your profiles by moving -or copying the config directory which usually is in ~/.config/qupzilla -to ~/.config/falkon. There is no automatic migration. diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index 4cfb23eb9e1..1e9e3947d2f 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -1,18 +1,18 @@ # Template file for 'falkon' pkgname=falkon -version=3.0.0 -revision=2 +version=3.0.1 +revision=3 build_style=cmake -hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools" +hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools python3" makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-declarative-devel qt5-webchannel-devel qt5-webengine-devel qt5-location-devel qt5-x11extras-devel qt5-tools-devel - python3-devel kwallet-devel" + kwallet-devel" short_desc="Cross-platform Qt Web Browser" maintainer="Helmut Pozimski " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/KDE/falkon" -distfiles="https://download.kde.org/stable/falkon/3.0/src/falkon-${version}.tar.xz" -checksum=4e42a091e6ae434d7c3146adb876a8a5dc29d9354560087a905a0bd7fb58d7a6 +distfiles="${KDE_SITE}/falkon/${version}/falkon-${version}.tar.xz" +checksum=7b6ed54986543dd5462602943fb824df12f15d2061996310c4c4b891433f1a83 -LDFLAGS+=" -Wl,--no-fatal-warnings" +LDFLAGS="-Wl,--no-fatal-warnings" diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index 5fef6896ac3..c3318ad80b6 100644 --- a/srcpkgs/feh/template +++ b/srcpkgs/feh/template @@ -1,6 +1,6 @@ # Template file for 'feh' pkgname=feh -version=2.26.2 +version=2.26.3 revision=1 hostmakedepends="pkg-config" makedepends="giblib-devel libXinerama-devel libXt-devel libcurl-devel @@ -12,7 +12,7 @@ license="MIT-feh" homepage="https://feh.finalrewind.org/" #changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog" distfiles="${homepage}/feh-${version}.tar.bz2" -checksum=6352fff798a29a731006be08e1321468202d03547434b1b0b958cb504b2b161e +checksum=3ff3e64db0811e2ff14add77d1aab4ae6d16616f5f78fe54649b49f5aa7f4a21 do_build() { make ${makejobs} CC=$CC PREFIX=/usr exif=1 help=1 stat64=1 diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 83390ca2f6d..30b4314c04b 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,7 +1,7 @@ # Template file for 'ffmpeg' pkgname=ffmpeg version=3.4.2 -revision=4 +revision=5 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/filelight/patches/musl.patch b/srcpkgs/filelight/patches/musl.patch new file mode 100644 index 00000000000..7c0252b6498 --- /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 760c792b2a8..946c8c28f49 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/filezilla/template b/srcpkgs/filezilla/template index fe0a0e7fed8..9c0b6522054 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,6 +1,6 @@ # Template file for 'filezilla' pkgname=filezilla -version=3.31.0 +version=3.33.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck" @@ -10,10 +10,10 @@ makedepends="gnutls-devel pugixml-devel dbus-devel libidn-devel sqlite-devel depends="xdg-utils hicolor-icon-theme desktop-file-utils" short_desc="Fast and reliable FTP, FTPS and SFTP client" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://filezilla-project.org/" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/FileZilla_${version}_src.tar.bz2" -checksum=14c568b7e3331b8ae6d2371aeb4f4b43fbf97f057c0af9d75165d0d8d0d2dee5 +distfiles="https://dl3.cdn.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2" +checksum=f4ab6d4368c0b0c89dd938f823a20164e1ed738fd7389775a899939232570ec1 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-devel xdg-utils" diff --git a/srcpkgs/filezilla/update b/srcpkgs/filezilla/update index 6f021572700..806f59df492 100644 --- a/srcpkgs/filezilla/update +++ b/srcpkgs/filezilla/update @@ -1 +1,2 @@ +site="https://filezilla-project.org/download.php?show_all=1" pattern="FileZilla_\K[\d.]+(?=_src)" diff --git a/srcpkgs/firebird/template b/srcpkgs/firebird/template index 4f757cba1b7..7342877dd6c 100644 --- a/srcpkgs/firebird/template +++ b/srcpkgs/firebird/template @@ -1,7 +1,7 @@ # Template file for 'firebird' pkgname=firebird version=2.5.8.27089 -revision=1 +revision=2 _build=0 _uver=${version//./_} wrksrc="${pkgname^}-${version}-${_build}" diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index 0a1157477ca..9cd4cc954f5 100644 --- a/srcpkgs/firefox-esr-i18n/template +++ b/srcpkgs/firefox-esr-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-esr-i18n' pkgname=firefox-esr-i18n -version=52.7.3 +version=52.8.0 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -135,95 +135,95 @@ _pkgtmpl() { } checksum=" -03e52e597f0e04425d0ffa44681ca824742f4967e2043042f5dc904e785df2b0 -34b66db16e269c1837a0cad13980163c16e86a408c8c02197c68dc98986fa1fe -9baa44ccd7f080afdbeb3cc82176dda0188d404a63da4a7c29eae1a4d2b3c9bc -c27ef252c49c33ef4231e32d6093605f7b206b4282609e4e789d7e3a79a0fc69 -f1770f3f31f68159ca2d350de34f15c2e8aa7940b32ca77fd137c56035144866 -cdc997192d4a0bb24a182d24405e59191e262fdff4edbe9f0b74b065bab6c87c -28cabf15e445e3bc169a07748622ec2560c24729158c25ed8a492423888b29dc -e241a5caf34682d9a5d5f1d8965f6050139a946ca724f2ad899f0d77a8e71ade -065578e6433c2a178f70f392a63d02c08e9589bcb5cb0c5220af1d15a810ab88 -a44e8e0c256c0a2b252ccd950d3757f1deaf57f1ebfa3d03484bff5ffd7329a2 -28bc0a4aadf4392c6bc93030c3c596fc0f7089bd4cf27b8b1accfa5b91fba857 -1d0405c2bdadb3afb21bc876df8a0964fcad517b5e52733324dbb9bbb11de5bc -621f013798a94a78c1c91916fd1bae306f9822c71df291838d8ca249c6c6671f -a23203ee1c4f7c3a2416333f32cac3b0e0bde76a9311461f6c0162e10c812620 -7b8dea5cc6dd99af8b263ae44d4f9456036200f665d76f8f2f263f2e51aa0c8b -48f5e6ff034d712614b763d7da1a884a8ebaaf9c3ccc4b8e82b61ce316823ada -5433fdae88096b18912201a0808f1e3138359a0f3c07478e0746167bcdc8d955 -6ba2abe14a8b2506967f0ef44290ef37929ec964c821f9b4b35b4bf9ef944d17 -f91c51dc01faad2eba3b9da13a139309961d5b32c93f2e018864caf70a606acc -51e1644dd51bb05f289096a476d9b1f67d5bbec937ae6555bcc8d3c47cb8b270 -8cb4fce391249e1716f721def592776e6cccc47eaaeb254342b263683ff9b8a6 -533768d0438df810a0da9688ea1ad665f5e19ee9ea903c9f71e2451535d74e70 -3d09b0c0d2a3194f6485ef6e6f678f8950a7882ae8074b196777ba85154ba8fc -5a806a6a8031ede966ef3f6c500a8ad2d03b7188d6add425beb50336ba62bd57 -e8cd8732d9aaacc4aa1aa3f85f4941fca3ffcb4a9ca008007f8700b3867ad8b6 -866d7fc1ce0966345904039a6e48687bca327328fb0a136cabbf203287bc6984 -515ba6d10a0b6f4cf569cf62d981f54f332b10fc493ae27d4f5d74921ab2a835 -a99a1f6acc048ea851b536ebd8798e6010af13c12cb29b8f4b8fabe4ba05e005 -ae36e5eaccc28a51b359db234e6480359ae4d26c704427d27d7254b2ea00a93f -5a575446586f0d652d201f9bf97b80cb9441fdd3f7be0f25fa7f6ff6798ebe65 -b844fc2056fac3b25d45fc15d6b170a173e498a5a07b2cdb59d897819e40a699 -28ea0a58a799d5009c2e52f21ac819b34f624fe3db75666d42c8216bd49288ff -490738101d4040c8afd214a3736e94a49936b0c184e9c65cdfd6599d1fdc38bb -1b90567da9b863378f791d01777373df8aa7bb51118f9557b6bc2f9aca33de4c -1349c445ca630a4e816198203b985dc0add0d8d9be7e8041e4aa7c70c2eb7a4e -f7a0e1fb273ad4a9c924bafb4ffe23ad4346d7399cd9060488478523df952747 -b852712ea859a6f919c6e562739347c2cca4f561efed755d7281509b09d73a60 -9769f32bc6a043cc578d941f3feb29ebc190510715b32b7a960e7b53f1956235 -b1b9776b82c1074ab2c5993321727cd665d8577ba7efd166cb7231d96848f7c3 -61d306921db5f89c86566fd75efa375fcb872fbca52cd4dd97715278018939be -0dd8a3e7785ddf2c9a983281b8305213b16962ce89ab1d5f26bf07ac5a854347 -8fd435ee44ff29e97f91e5cad9e558453c94618b43651c0c1bf60940fad388c8 -be72a711fc4c6621499ae00e16e9c9110857c47f81fa44f8ef1ba33673ec02cd -03c092ebff9ca36eab846da53bc9eba8ecf0e6c56a32c4f45e4cd8d82221bd5e -8535bf49b85c322237d1008c432e025b325364e022236ec6741b9ed6494611ed -fc8b5afa2690624e72a3c8c9d8331f563d9bb16c3cad83fa9ae3636dacd20a8e -424d91d3f4d2baced287c39680f8a3520691dd845bfecae9676273ce45ec8a3a -739da889c80ef06f83ef2783002adeb719e44a41855d9c81c45ec6d35ecd6254 -9f322295725078d153f660c6d1a28cf869a12c79f9a80f9b53f66ac59b53e7fa -80e832c64933cc0f0cc0d3ac00ebb3bfc395a2837d3d98b190e007990a0f4179 -c077b0c70a6f6e9b6dabdb8a4defa00e8be4ad36d14b4827cbf5fe899f1b3036 -3352fab9d84f34a20cefdb2cdb58e1aa281c102546f9cb92fe46ff571e27aa9b -7d4c0a1eabe19b3e0beb6b3a7e0bddf079767b0bb0eeb26f2ea82efc31a50e8b -433db2b6c69a45dd487c11757c34e3149cd3b353946c896d034956313e8fde3d -dd829fdaa689a9a4805aa5e1ef457bb08ebc765ff5396ff21cbe91b3fdeb19cf -b319fc11354f35ba42d1bb8c96e9fa706238c05f520ee44159f7ebdfaf67bf2a -9426ded8fec255e3177a44a88e85d3aa4a635db013298600b3b3468823ece77a -1763a916bb9ad644ca9541a04a858e913a807428113f4ca7190eec31b16b1826 -f7f2a89c10c8e2d751aac3a80fe8834b6fc3036a9e86d3cbea6b678dc13208c3 -6d7a068ad510e96b034e6ceb4448ced6e7480d823d6f29454075c58a038df447 -4a341ccb1e270e844907b531cebbeefef7fe62bc3b5456d69b9481af0b76e561 -fdf98a10ad5eafc52a6b71167dffdcc1af2fe89a1d966786d477f48d62a0cacf -1c292fe497913c34a188a5c8a3be1ed509b74f948a00450ac990cd8c160bb4b1 -07e75a85757f215c97167e7f0a0c64681a57c0a930753c58c1ae57ed0ab7ce1c -140726232fa50aa2aaa43f0937b76e2c12b07e222285a613560cfbc579859396 -282cc71b5516b0a90e34c4a741ee16292afea4d65b538f161c1fde00b77977e0 -33286c214ca1ac03236b41e6ff67c58b2500dafd25ec2ca82ec35df0f3cdeacc -f4d528d0c9dfb3846ea2b24b9404dc23f3b4e1e174ff9796325da7b2b334d9e3 -ac31b10bcfa8d11d70fd0fb6fe159c39eef2f6c9c56fec54634e028184747749 -169e70aae7b89c50747d4a13a96802b1597ec3e0199d886025e528fd88e2b86b -4fd2e1f7a0d81c62f0cf6ea0adcc4a73af536002efdf8632d106c7257014792e -4c40bb78681f7a5e859508b4dcc7419df29bd645b355d954916b109d68d15ce5 -455964c20957ffc4cabc43226c7216362163f716cc8e3d2632f832fc0c770da2 -1e8764c7c48c50a0adb58c894b654204e0b95041164f659f82ef5b36def60ca1 -99216563bb5b6f6d8c7bd069481c2f69d5537d22538f9ed909667e632a780ad9 -31eb9f0a2e1deb871d87d2d90cb6e809e2067b4a07dff1108088e4cb77a44943 -a2e07054aee2805a553dcb9f0ab225839875df021f054a5d120fec7490a8551e -a76e954b212330d2af494ed61da7f97779db9d3ea1753e82ee5eb04eea9c74d6 -ab69572df3e393f21fcbbb320db1866b180ef0db7e44cf777de19ff32ad5071c -d0f665797352d92b431921fe45ae3dcf1cbf7f7e5d3253853b6aa673507e4218 -75ccf2fad4fd0400ce77fb178307069e54ed28f078c596ffbb3fc11b1dade405 -33c79fcf432a8be5b5f77bb07313cdb07514270bad90b6de31e4d21c4891ae81 -22dccd4f47a072cfe349ace26423bf7b95492ef731fa50a11f989d2c537aac3e -04c4c39bce8ac4798e9af14794dced620eca16dc448310f6ec860124243af1f6 -c732f15acd0fa3bce4ae0d8b34012d5b482616f37247c867ac9fbac24303b43a -26cb6be326e4768a6c12fb647cf3b7ca50a6e553249dc8c36d847e1ad3734cad -58869f0c6951bc01a02c66f9d1caf939e0577f21de1e13d978c708026ec68c45 -e8cbc524b0bcf503eb64286345658aa89a3162398b9b9f24c8fd12c2d11df772 -14ea9434595808c5ddf135fc56719e1e37e030836bd320067a8726d020afcc43 -3b8d3c645bbf11b61bbec17142de7cd6c36f8ac72858cce30f1b1189cabe449c -f63d65c74ec1b39731dbb0d7d7afe6d957fc347b11417953a5d850d52d75ffea -40a520df44255079539d94302ed607b952b192cdc742fa5d3611b3bf81f39360" +0c069738a285dfbc4d5754086cdd108ae36ca89e5ac08cecbcc42e972a5d275d +d7645158223413e16473bb56a44c7c04ab8ef7b3ff7da6cf02f4ece06ac9d454 +06907c301e1cbcba62d31661b64f1744f7df8827722b21252277749642de4857 +c96116a11b70fe005284aacc6b9c5758902667c5e412a658665390ac505b7857 +c998b908c3999c096560ec00ec9abc4e179c2399e4b4c12e67f4db80388a0a71 +b30101831b319b655e75fa54a6805c9ccfa62918906b1fb1c5057fb3317c1a61 +e33318ccee8f9d51af79939a8ff0bb8aede9c82113ff28bf67bf53b9db6acce3 +bc8f076c26966fb7267d4d83dd8aa42cec8afee83e4fb9f9179bae6900c3724b +8b0beccda82b82ae4ae3c6ec8aaa8f5650848a069d7dbd6a9ae9332e9131bc26 +119e447221572186d0bd390767e25214f157a8dfdeba461c2ddbf76e5fa3b8e4 +cc3ce8d3c3c54d5418e5c911ba7e94dea503c62b969f7effd26790ab100aadc2 +5ae3a134fc1c14bc8547532d1848ba483f1e0d4faa7119d6615c35f0656caa7d +8c8f8c8ffc64e435b29f9ed8751c6006fe9a665e754e1a656d78a06b9f989b0b +2fd0fdfc2785365f78277c9fe4fc9a3c3a8494448f94c302379cc71af0afd9f3 +d902653a500d41d157148c7812a16118b65d321a5d5c9edacfd4a3e6276f3142 +a66f32cef38343a78f7f38990861cce9de29a8bb2b3237c52841d3c9336fb4dd +2818096eea89b3fbd8a77a23e587d8770ec0f5175f1bf7838c2db8bb7456ae1c +f70b4b250a9ca85640fba8467293a0b52f2882d53694edd80abc96b13df13d69 +71b9e71ca4545ea55f13245b90600d0114d3ae72d16ad2db25db3f034592ec7f +94ee8b852a012f3a0a9997fd263ff9f88405d6bbe427ffa33fc37bff567df0bf +e5b5a6ff2e3d9f483b9afb425f5a89a25a3333db06260a2623faf2d7847a014b +e5487e67c1789fa15d3a37f5316f9204a9c871868720205c81d9b5c6bb2a4f9e +0d6e4fcca8b7160a4c262229d06e61b116e3bfa8f164097d32e37ae53bb0a06f +24ea6ff03bed39895d0c3f6cc4432fba6d58bd42814efd2dacfc12021090a2d7 +e9830ef15fe651c794e8c912fdbe6deb9b611cca49f02c31b847a56e5def71e0 +fe09b523998ec03878a6198b0ecd93145340ee9fad37b0a891e252754af12fab +c45f4ca91ccee666079790ce377f474c7992d410c88c16ce4551867711467a30 +2f4b8e0e9377a85fb85a891cbbf1cd2007456dfa22c7ed78462d39fc6ad0c558 +a59a78a08c5116b103304952f4abcaa347bb9992d49ac0e6251d32258b24fcf3 +34147575109ddb584dcb64d79d0e52f3fb923816269e9322c967a78b93c7825c +734508a2d7997969c0cfa2f46751830e0e29b5522548994b385f7010449a05c9 +4bc09e0c823a44eff73d3a6e8500254f3e4296099428545c8fe8018a89013ecc +00bdbade3619e757805e043cf210bc20bc9ef67e7c5a7d2d5d87a921b782ad4e +0797c241bfc4b15becab480c8eb7ed68797f9f745a116511a55a92aea68c0577 +006dd61c7bb4582355fc5d50363152348a51b47ced2b81e0cc34a27c2a28f746 +311c222f54accb81014384cfda644c9d718a09baf4935056016307324cadf83a +1672e7edba46bfb551628e65066b7246270b19159fbae0fabb988ddb21b74ad3 +6ba049f809536745ba87e2ef459781f1c8ff99edbe08330edea157f4cf7056aa +2bb3a7347135675dd29bb72658c523428eb6af15380d52457a7f1aac1d381b7c +fbb71bf898b556476ddef5396c93daab30fb613229323c4ccedec789361e5db3 +86917c56b4e7563db92a36d9facb9e41777d5751ea3357688946bd157f1c629e +452c73e8962c3ed2858a95e69caf8afaa432e6c3a0f6b3c04b1d758e8b0aadf3 +2298fd3b2ff6260fe27a41f46efe98b5c4e17b33f8f21f5a6d74caea31ca8fce +4bf3aa58d2c8d0659da6027d85fc5c516921cc87d70fedf092621c2ff27f8d4a +35b2ac640ec58bda58073d45d3a0cff6d278e251fa11a98596151943961ec0ce +5347069b88b0020bf2bebcbf7fbc6e397088ac74e046458e4aaba9c837c211aa +dad28e6b93f574d2995455eac8dccaa537eb3d8a3366807932161a12eafd97fb +c4c3296f24996c35c9e18db7bbbcd4025c0a3a774d7af570b8edb6096fd5e1d1 +608ecc2e914ac17979ec28bd4c18532d4ea7e274b001326e082e2f642737f597 +ac443368d345d2401f1e994f1f1698d5eea19af07b3fb7cf7d50b1d9662c13e1 +8b0d1d355dde3d69d5f926a7a40b9f2a35c9de6c62b09c05f034f553908cdfbe +b1c074e5f191bf464911fbfcf7b77bb6b7207a70f058afe9660ff2b877b95c71 +e78680221cc5d0e726a1ac8362df672a70aa4d0f3e0c08c47c9f3fac7eab0211 +d6311f10d091e66902947db4a71fa4951876beed37b4c03e02cbffb63049eff8 +fd95160dad8787ed8803bc8e98f2ef7c3e57df5e03a05013acb038753f82baa6 +ca78841e987df549a641e078e355c3ca025cdcf7c65124b610f0844ac07a6015 +4864ae85dd728391e3144b48771b26bdf60a6c226924ef3dac3583b57635f2d8 +116b6981342e442f448c98289fd6439068128d2a0362076d9522095dea6f7320 +dca41d4e38dbb5bae255108f7ee853579346ecfe50b0572a2c7c7a04b969913b +8141c6320d0e52a82f5a6574be227f193fa3491a3db4eddb0a6a39ac83f56793 +1ce5170def238a5eb32f0f55c99f010f255902212c416b055520748f7a873de6 +2023a29c5725ea458ebade2874e49c48e4fd83931f110a4d172ef238f0a4635f +7b8b4f669e445aac69fc7b5d6159c2459a97b65af06d8db9cd8acc60f82abb0a +5c8df679a379c443a5ac3416e0d3b21fd2ed5ef955addc7d0b09acd26085b285 +0a222ca1fda65aa5c291d08bdc50807d674d05bb52ce77683c063bd768391b05 +9da67e7a18168ccf4b3b805945c2dffd75f7d1574b05bb384049bfc3e29c37f3 +a98bf22c3ecc3225ebfbb310c84324e545ce85627461c1bff22008aa29f504d6 +6ab0259bf3666112a6171b0ac11b9ae74341930aa5158f154a2eeebd5a33eeb4 +10dffc15f93c9347a6ce6c2ca53877057fc758a8c3a3e7777ab5858839072f9c +ebc90628adaf91bff4a2dbfa3bedb0bdb363cab180dea7b341d048f6a494c739 +d73047b8c868acdd502498fa0731d672f4e8e50e55fab6661ad1e8b68e03d522 +d3692c2cdc86a60b5ab872d3ae70805c7623636831adba34759c99fe4760451a +dbad8461140a9bcc5677b64af330adc48da4a5c2a140e10b1fced2f8229b526f +fa81c4bd21272c894d35b273658218a51c2f17e0f6149fcfc6e07c94217a1377 +b2eff18982c8464b34455dd375b888d76f3b13b488c9ad1cd0c6e5075616bb6b +03c7d40c2df94c8d1a1e838b22aa974d86ee50c5f61d735da8802b1a5ae04d85 +8ee0ca43a6f4600891ee2258879d575aa4fa475421bdd53aac5b66462d9ba34a +e03149721297f487b6b8d395add7594f72d6c506ec1be0eb229cf36dcf256824 +16906b5639d0331c96a89e443dc173ff50136c3a9663c769d81cc450a0f8f70d +f9d6bb89af80e355ac77b59bd0d7d9088fb0e400fc59402ddf83bf6337fc7f1e +5ea9289e509f62ac2315db1d332741a31d935cc02b9ce3af36898b082f293d9f +7967be14966c44205fb1319350210667bdea3772cc59309c67cff972bbd19fe8 +2b009ceb488018ac7473e3a3f6fea9e9218644be4fef53e6b88dc27ec4290bca +9907eef05e38743e66758248a7bf52edf2d4e9d22c82b437ba7deb920e5da9c0 +94942825b0d1a0cfe49fa64e1789635c527064ce5c599740d96590ffd4a86231 +b023c5398ff903a2f276802a11e5acda7d591b0a25f54ad1f857d71ccd3dcf05 +ae9002bac9accfc3037322208e19ab98258ad796e1696cb74ffd17359ac41843 +f729000a17f6770423895af7d123fb0cde0f5fbe854d692a474a26a4991f6f2e +324ff5d2900d58d7c44b05381ac4d280d94586392d786aa7ae3b68f11a5bc4b0 +f2abe016111ec875c19d76e7265d40c3bcbb264fbb3c5aee71835326a8231a03 +a1bdc0ad4365fedf3cd9cb87a58dafcc08333a79e0383cdf97a20e91e5a4f1b4 +a837d5724e77fc8a7983caa7cd913dcb52588c807f21d27f502d426430059acf" diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 3561e56f69f..30464a6e19d 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/firefox-i18n/template b/srcpkgs/firefox-i18n/template index d8e035a1b68..32304f861ea 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=60.0 +version=60.0.1 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -136,97 +136,97 @@ _pkgtmpl() { } } -checksum="53d7cc8122d01405ff1e81cd59b99c534416c1a1e1740dd0536bbb608699bd48 - 3c78e0128289c2a3ecefddbbb5488cb6324828606ef46ce083d3f9a39b9ad10e - 6ccafad26ff3dcb004eaa409d74b4edfe1a25d9802c7e195990ee23f2af780a4 - 00349c780c191d8155af51dc725ea85a6288bc8a873d1d868e26a59c7491673f - c54a2447f53163d087e7b30f4fd602efcbb77c3ef91a4102539f5df9cae4fcc8 - 88d92a5714da612d52ff0b27165f285ba46ce384ddbdb835c0f6bf3bf939dd96 - 4112937fafee628dc80007aba16b1173bc57d9a01155a5efe1fb0fadc7db79d7 - 746627277957930f0a8053c2efc742390fae80d8f087d47b213f188dd2264e09 - b415ea936d517c061d0ebcf42e000ed13943c78ae188c20dc5d65c297670b7cd - 179a1e8909f34bce3907d11140b467743e2c69a33374a7ef4f9db8dd36979520 - acea49db1052b5342929bb9f36131315820c1e94f9f9e0a4051644796d215bd9 - c5e18d9645a9f665a736c43ac4faa828728a145f3353b92b23949998d4fc2576 - 67a2a2f68c8e9a6291750e0732c9532c314f8281777432372016b0d0fc3a90bd - bef4db01eb89d19a9e39a878d63c40346ce1eca72d4b4d47494ded1218842a3b - 8cd1a8564d4198c5827e04da24cdb684501818e62a610adfcb9001aa345934c6 - 356b5cf598d3cd435f891d1c734ff69477bb1a1260f6875b7127b55186c4cc0a - c4c9fc4017deb822cec90d20f214d6266e535e8f2e176dde95adb9e5541e2e50 - be63221fc0247b234b13ae5f6d56ceab4bda666fc51d45ecca7f56a5827387b3 - 9ce175158ab0bcf2595d23558806e1ebe2e61d7e5794fa86c2e8e55b6fce0d59 - b9a8979417bafa03b161840e85b28f320fe2bc05d9a39243c67fcabc9588390e - b91bf759b261a3ae93f1fa12b46e429297b59e77975b1a0e023336540efbde51 - 0e95284c878250498a1655136e39b5080aa0860b2784b2e9062222cda4922607 - 303cb12f5dd7f14381050082d4408ee8354dd17c85ede7c8ecb9d86302230f8b - f04e1036bb18a910fb6eb82235c55919975405982829af81bf55a28b80a3a3d7 - 2186dc82ada5a005af9f32c3804d27f430120f90c85aa81ab1fff62ef2f5ee19 - f8937590a4970febf434643f88b0c3b8dde9c8b487537e22be36fac85b82bfb9 - 72c7ff06f70d9c91e674ff4c5d5d5516d6bf94e6f537251360eae95b6031288d - 773edf9dd30c54aa7c635a061aecf4293397ee0bfe4a4ccd5456a7e848e11b2d - 15979a5de10cd774f9f0a3f2bd75120fcba0ddcdcee0e6a16827c4951b3de7c9 - 486f6e09edf17a28592cca6cc1023ab6df0851a3579ad269158de9ea1736f798 - aaa5de02e9f28d90638cf777986f240252d5573a4823630eb53b7f98e50b1520 - f1755e375399918d1ae5f96615ec35acf3e724706885f94807d1091072f98d94 - a948f479a0d09c6b8cd2315f4ce96a8e9039aae5d560eaf6e23a547426796867 - 341c660264866ee2dfd9f51e702aaf47752345747dd886b827c1fdb4dac88731 - 6a10513550ca1a215db66180b8de1901d12a9294d123c49ed3dffb671642f8a6 - f5d1819926c65bef009d9f733bedc59fd611637b57625fb36d5578980d311a07 - d48d35bae701f7751da67f62c06e66fe7fb88e50f9a53058f1dacdeb93243f41 - cf0e1ad45addf7385ae8b06588774b97c24f13c19bd6ab8a0ac092ad446eebed - b3d5f733d8b0054117c6699b869af92364c0635894ccceb1fd10a56bf88dec76 - 79049bd1ad1352d4821b56a21f8c938dc3f949a247f22ebd0be6238dedac8d16 - d8867ddf68b99170e91bfc2a5d95822f72dd628227304d197e9c8b5594510c9f - efe697d5cc2489773084126fd9a09a1a326045c4d0bfb6dab879bf3f440bbb03 - cdde1b852744e0584b66aacf193c09b49891093147daa459ded7c586a9ae9216 - e58a06aef947fef842813be2ad931ef02c57348e7f3fd405d73ebd05ac0ec4c7 - 35efa8fe9d6a89a6fcc3178154c7912aa7b2b2be02cd9b926008c04f9e1b40fa - 95e0ed5ea210dae542ebfdc9387d9bae4fde53c38f1be1d052e81bcd1afb043b - 8e7b6ae85cb24a5a116d79b62282affaa9caad20284d2c784b7c0bf9ff54c257 - 9ca9220d62f26530af4c5bdca44d0a5691130f77a6cefb3f8c5cb8ffce8f07c6 - 7ecdab2c648c439e93dacbe5aa37b25a4d42122dd62ff1784323c2a56edce473 - 4bdf67ee507fcf3c1e8cd16a22b7cf7c8bd2c7b9ab169b881588ccf7ebcd381b - cea38dd41f439d52aebbb7133c83c655e5a7cda7b9244ca697605f5fb6e75bfd - d2d92cf67836a2d42cad40e08ec8093882085112f8e8c21f74241448bedf4155 - bbfb9a2a5b9375df9d82509a5b064c499013d1f02ea464dddb3b553bb776ec5a - c5c54c15910c2254180d72c10fa8ff1429c43625cbaaca0ab42e266ec850acbe - 3506f2c645ad501fa133df2ca8af5e84458e641860e490ab297f3d3d2335b312 - 0b084c1ad201d15851d8a6acc40b9bac020119175ec1edc390d39a7535abab13 - d450910b7e256a8599e4432ac49f758d7dd7b7b7ab74a1b0e1cd0c9717d79d1f - 7d47c90c77289f09f8356b5f42746f75dbd7a52efbacb056f832f980b7331083 - d614b06a18a7e59683733a21781a851879c31e46b0d345ec6efd49b774210a7d - 8f68a8ac9d8f7f7d1edcf1d59c8da5254efd1074ddb1e2038424bddb5a413e5d - 8331bda59001d53abeaf86dfbe649799077963ab4955a66b5caef11fb75894d5 - 81db9c67e886c57cc2d807bf977686ef4d03cabd4ac8e57eadbe7c68c683434b - 1a570596e6d9eebfd1b8e03d3d59ef300e977ac204fe707e333b0e389d3ba9cc - a1d26997a43b90384c97315f86aa8f1ef4af5c126fe6ba02310a21aa399fcfcc - 522bd4cf7016c2fe181f2a04a5661fd174152973e12a29447bb5d29054a76e16 - 6e61fcd5a98e827db607622d185642ca34e81f84aa83c31508931681899d09a8 - 1f66db8430715fc22690ca5f002f5c60878725dc716131e9ab31bc2e90db0109 - 3e7b4623d9390f6bac75368750561adc2599cf19c6a904c764947997bd161f53 - 06fb56a442e7e1b0907e28617e98401ff88112d6af204a2af779e784ea81f079 - 8537d758630c17f66a3af3d4959e15a864eb34bf9988da6f2f0ffc8526712966 - 246cf5f518f27404e0eb71e4956c098ffd8f5c7cb0797d0be0510a4cda32f69a - 5b191c59e194d40b2ff9e373fee2031d117c05e5ea95b5f3bb113b7bf971edc1 - cd8bdb0b980942000164e9a5fc6a8774ce0976621f04e4500522789292b4186c - 3795f1b2f5507f2509a2039ab826cc0c8e96218be5a31ef4017b11f2a9fbed22 - 6a2dfac8512656a10ad4cad870a8ec54f6c3edcb5812cb421498ca06155bd8ab - 30164759886d12cac01539ee433272d217b4e227cab16a3466d6ef47ba6f2418 - b91ea5ab5bc12b81c366f5b797ce922753d956e75488f8ae071b3a19fa0006fb - 5c3dc73d7f3d10f039208ad3e5e480c28b0d6e168b4467771d06c024310b53c0 - 170e764c2d7842ace3ea10a37a28403ab30092cd010b673053c1366b9d566e2b - fb819360b31a983242564c49e0398f13f7faecb0f037a8c643e46912b7cfce63 - f7c55f44f07c88e3cde1fed96144185f81554f430632e730d45527ab602c6c51 - 73a47afd344801f2b1af6db49ffe10a99576914416d30e2f69ef4c84345f6224 - cb3ccfd9a3a8c8256fec8a91dbcca334e2e64b6b36d1c49b3d76ee9133af8bd8 - 2e5f2209f4263b4defb52edf93c81c45b142dc4f85d4eef5ef7a5df0dfb4a81c - 6acdcf05d2a55fd7803fb5674b5abada51f89811192d66af1b24bd006d195241 - 8dcc7ed11b9c096904810797153115d507395a8ef01025bc3fb2c53098f02fc4 - 3edcbbc2364ecaa1eff5fecee810a201d86bf3dbd81d0916b7b8a94e31aeaa3e - 1cdb5564ec294ffd7d85a8eeb50b749f9d6bce19a585cfb29098cf8e091d5247 - 2318e5a4bc46540633aa7ea71e3c4da7e0d006fafa8292adaf1ac0baa3927129 - fa358c25b4ee8036d1a10916349b4608d669323d3973fed93e93f2ccc5eae344 - f34a3c5924999c54e7f79b8237346b6482a745141d9fd2c2d07325c156c8fb34 - d9cc10826a4bc1e554d81813bdefb7d19ea67d0ba8ce1cccceadae0ea12f4a6c - c3fff9c7562cd4e76526a2546cbe1ffc75404ff1ab5f8bfb8f871b4bf6118dc2 - fc807d2d6d2db96229d34f5c0594cd97e948508448ea205f6afc1a1f9b615f23" +checksum="9f2c6f2d1b27ee90446c5b583ceb95c47ad6be65c17011f90d7187c129cc3ebe + 2a2f394a16282de72cb80bcdcfddb8b9eb098094bc12093753634e3198015ccc + 482af3329153e5a207191c0f5ddd7fa6dabbb63060bcca7f08a512e411e23627 + 647e6bf7407f2c34bf1de9709df3ed220abc5ad010e1e3a87a0f77596df35f08 + c84b760bb9245465c61eb0e90a3fd1c8ac4b6f519599c07b8427af84808ea6e4 + 58e15d4b11e2cd031a0eff7d55b5ef9b32f2f3d308079b374ebd45a3d2367788 + bdf804c72b67343a0a55db1c35abb635c59c352ea4283bd69ea961af65666443 + 290f9dd93d9ef59a6429140c544933415558fca996bbafd31d585326781e7c6e + 2223f37aacdc12eef02122a6dd8c54b99909f95344075d05dfdc28335736da54 + 2b4e9781d3bca1c094872d6148c9106d14531fd5446bbd3ba991614ad4ceda19 + e941441bbc58d5a6d29a75eadafe99073404c6c12f8de6b26e4ff7b14174a5ae + f6610922e0f3ac92a5a873e761c347747050a9d8978d200483cd26edbd92085f + 057da7330714f6e89c12890cad670ef5bc03f20950fda1d5e408a47e78d1a3ff + c1fcd9892f63f7a6fa91f049484077196d58cccd4fd4968842f4b476b1e6d8ac + e2b41274cdfa4b61df75e4253fd55e8a4e33acd9695e9486ef3977b247209a86 + 3659e380259d4945fa64a6ba0a98c5b6d7f46fb28ec2645c106472a7f05a38bd + 7e15ac8a2355191b69f6c3053c6552b4dcf96fb24612ee253b9cede182b6fc10 + d7b511aceebcc368436cdfe77aabccb5fcba182a8d02973cb2729e0a1359e428 + bfe7510cf77085ad28c894241af5bcef535dacf96f6206c866a03f2926cd2e4c + 42138b4a07de44cb27b44fd2eeaa61f3eaf4aeeeba86f36a7c4531a3c70eb99b + 69527b9f6c52dad90be4c1ea81ad35c14b1c2885871b61b74887021ee3fd8ca3 + a3e3a41fdf1d6ad25db011d58e89aa36b2d0906d4d7b1db26155825508bf9151 + 32dfd22ef99404837e6ba0b67ac34d26229f3d2b40844e8499aaeb5801c3ac00 + d81cbe48fa673d8869389ee2f7f0e52fdcc83382f49c03026b46a78ad8ffefe2 + fa0afaba0b1f23eeeb1ceb67215d2c246c75c2cf61f7ebc2afefe17d4314421a + c60c8798199f6908c87955026e29fea2545481ccb80c28a958a93223a99d184d + df52b591b8e528235cb2ca61b075f7c44b1a40f949024328a74a71a56e14a9c8 + e2d8dd7efa699707a5ab4264247a28d722a55bbd2ecc90d3c3a04777ab5f8055 + 096c45ba243f82f0cc91e0fb28e6eef88291795123d906d0b77c4ae455d726e9 + 809f3f363669aad573f019bd8a2bfe3f12b6363de510701c827f3b2bd4e41a18 + 70cf5cde3cfb2a91ea30dac79f3001bd039aa4e882f9b3f921ce8120429b79dd + b48059fe0a235dc0df1f6f7acc1f72bbb691842e742df94b034779e9980c4bb7 + fb8b2ebbe19ff794b45ead1fab2b50e77a2d89dc55f6160c7342ff2fa9d1e3a6 + d79350afa1badd3c0afae5080c56cb9b197958a1ea1cb22e2d5607f4e3ddd7cf + e204eb2d93082be7c4c325f2ebd8f15e6942c245bb692a5a9b48746ae9fe3459 + 702915d5a991059d915bd6d51417c8c89de92f44a182ed2a951a6f3f2af3a26e + ce654b3dc192b0ee795badf83ee4d3e3fe43e9cdf241e036cd8310bead7feb1a + 911f6bd57ac08d651e0d2dbebb8fa5c9dc1920c9399b7cde569c0f8c41060b54 + afea12b7291ce528c2e461dd603a8880b3034c155517c55e94d7aa602762fd68 + 43210cf6586debf7d0946582ae3c421b04a9acbff1245e04dd2f82ead7c54528 + 99633747e77d3ccf2b70fb93f3ea0c0d3fe2f4bb12a96da8b43ffa3cc8dd0ea8 + bfd8775a3f53a30d3f213deba8b40c31afb90f79cae2072b5abd552a7550b513 + 05771b81434832f5df8276c1f633c5d9da17beddcedce054a144eb672f58637d + 461b7d0947095cddd96fd38755683abd4da3361cde629790ddd1a4c5f50a7905 + a3664259042d39aa8d103c2697bfd8dec36b204d4cfaa39b94ffab0610f80dde + eb08e4e062a15d2570e73753ba64eee950103f81fb7a3c13f8fabdb9db4bb8a8 + a9cf353ef6875918aa10ac3db90e71e9cda866be9f2241f0129dd2d8166c60ad + 6f82420dac7da25658d558d622c145279e7b6c9e024e7c4f6c9248ade53289fd + 0b5107c7bcb0cfc5c7330acc81e29a10cab19d17dc29b35628489d34674965d3 + 143478665cfcec9737a799016e00b65e9ff7fb649d82d5c562fd2bc86bf871e8 + 3baf02081f34ec5e44a9f52d14117561b39307557eb945cea694d07ce8802bbe + 38dab4b4367ef37d07ccde165c7fda9b5578ecfc30c5e1cacb2f559062ac55d2 + f28fab89f8a8ce81be3ee517b1ff2b93142d8e157e4e951bd403d6a756347a2f + 2162170912aaa6df11d2d73536a58e84f4e2f8a0260c922f710a02b4a2ebfb2c + b8885aff79fa2c783ac036fc2b64a7aae0c9e14267582e9cbb361b7619cf22ff + bc50ce2b586a1bf7c194d3d55742c282ce9cab10a210d027e11166ecc5d71782 + 7706fb846466b87776a1c96035275dc443678b854ffba6e17c1401ad1c7b0a0a + 4bb7fede9dbfc0e632a651d7805aa21bff1cf00e2c7ca2f42fe0941560814b33 + 91496fbf1c46acc5cddc993f5fb698d6cb3b18418134119637b03fc698aed3dd + 5a81cb391be617b680b17c60f3bf9832c5dba05fe88cac719d1c56fe2b7e563e + be1d8eb967400c99e2bd0b89134321582322414df36bf7396258552ec54dc752 + dfd03cef0dc9c1ebca8de19ac22219636483c58c47c62369bb454adf6e708884 + 23449ff57a2a24a8f7c8e1188c5a0a01c8a8913ccfcb64941775a8a13accd634 + 0c5714598f7b6a9a9e373d3bf833f0e01374ba8f94cef78635d0ea313a5db31d + 098e2e7b91f65c020e6157a847a56c3124450920a3d58a82dc051530fe259d95 + fa088a5c16a4b2e3ad9054526d673226f6668c7e21cb15be03d8236daebba7e4 + 320f6df8fcd78440845f16c28cf476d2c790127502f868faa2909255707439c1 + cfc6abda0af18af86b8183235e88a2acfb00051a1d98f57313ed14a8788b6d71 + c43b8b9ee749101b7776a0f2df9235fc579c1287417f307a28a86aa5bdd92b79 + 964e6d6765a31f54a6c5b7ee2a9ba9407d2836af571dda0fd0b64db05a0f2744 + 687b2faeb5c7108fc3bb9f6a059b24f695caffd19473b6325ba7555ebe75144d + 68b9f1792dca8a18d8d9ac54cbfe9d44cd6e2f69235d944c7cf3223ba73244af + 2b76aea47ce17fb9364a2ea3774e03f8d564da49e9a1c48965a262659438d4f7 + d3029b50c49afcd0ff0f6e8561bbbee6bd29138febe424953ad33d3d5f0ce5b9 + ac557afd2c0ddca6f9f7b2fdb770828b68e4c3897e1130b5921c08d5c1a7388d + 8a95aad047ecd3669fb9898eaa08a04dd738b950233556a1e6b3a8f77f7ee849 + 37665f3f0da975fadedd3dbff233b9da8f209ed91e17df687d77a2f4d7912368 + 1ecd05e4af7ae3ec953a5125b18491f13b3fabb426a0bce8e92160797c22921c + 690b8daef68519a709950d38a6dc6e3e08585bdeb6ca9c4307ba4143abd581ab + 129355aff86475d619998539ee4691bd6630800f28acd8b145cf793360375dec + 19ace977dfc039940c6551d012bda76cf367adc55bee35f20daa1c2a8f6ca49a + 79f87e86506a5c0b708b3e03afb676ca7ec691524b25ea87b121f3fe1844995b + 463b3ce225bb89d1575d80d76bcc38cb1563a14e6fe1205c6e85af01aa82d048 + fa57f981946c1fefaf0b60a89916c138248ebe6cff5c1beff0b7563af650f827 + a44b9c554a9a28e8deaeaa339072fb59b1b83d5ac21b9217c7a4c45991151a66 + a4a967985ff28eb2016ca1ffeda616417fa582e9b7d80ee3558ef6d3209234cf + ed6161441a846694e92e2599ed5ed3ee101c5a5614c879e75c84774c67a66e5c + b00a7592cc031b3fb303a5f0401526d66e17816b9784f9665a985ffadac7e167 + 8982bfa40fcf626cf5c8b03c5d56b39481a9de5aa79235cc51a35c93becb8262 + 279fbb7731565381d092cdb64c805b4a913e34fde2f5c1bf3beb5b39008334bf + cecaed7dabd4f6c854686c0e6b51a374aca14f6c4d410299c385b4760b89722b + 67faed09d6f6fbd8b6992916db46d48ae3f9e72c9d87619dd3babd0b0392b2aa + 8f59eec11b816f160b5f767a0d6ed8afe0d61f161c01fbe6d13bd6b94e847de2 + 0dddb9ea7edd64784458381c3002a1c62a6c26ad9fefb3a8be0836d2a5a748e4" diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 91aced20996..1d9d6474a2d 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,14 +3,14 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=60.0 -revision=2 +version=60.0.1 +revision=1 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=4bc4fd997e6239f53e16a70b04f197791e5c5d09367e2916bcfe4a427999f842 +checksum=c8e621c7dfccbef14cce41a6847b83bee15b5276cd0c35771c3874e464e6a662 only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes diff --git a/srcpkgs/firejail/patches/0001-add-missing-limits_h.patch b/srcpkgs/firejail/patches/0001-add-missing-limits_h.patch deleted file mode 100644 index 41938f2d982..00000000000 --- a/srcpkgs/firejail/patches/0001-add-missing-limits_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/libtrace/libtrace.c -+++ src/libtrace/libtrace.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template index c0d109c9845..a1ff8fcc28c 100644 --- a/srcpkgs/firejail/template +++ b/srcpkgs/firejail/template @@ -1,21 +1,17 @@ # Template file for 'firejail' pkgname=firejail -version=0.9.52 -revision=2 +version=0.9.54 +revision=1 build_style=gnu-configure -hostmakedepends="automake" -conf_files="/etc/firejail/*" short_desc="SUID security sandbox program" maintainer="Duncaen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://firejail.wordpress.com" +#changelog="https://raw.githubusercontent.com/netblue30/firejail/master/RELNOTES" distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz" -checksum=e9e63ec8a740b0021eea8ff5b7c95d34605b439d7d2afa7699f3767745ac2ba4 +checksum=a487f6a1420337f07157cdf0dd8a8bdf08a922b9aef591e7c9a6b8bad4662bcf +conf_files="/etc/firejail/*" if [ -n "$CROSS_BUILD" ]; then configure_args+=" --disable-seccomp" fi - -pre_configure() { - autoreconf -fi -} diff --git a/srcpkgs/fmit/template b/srcpkgs/fmit/template index 24a621be10f..4805706550e 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 775d45dcc33..7da5f577377 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 00000000000..05a274a3507 --- /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/font-iosevka/template b/srcpkgs/font-iosevka/template index 36ff5186092..65de1a8372c 100644 --- a/srcpkgs/font-iosevka/template +++ b/srcpkgs/font-iosevka/template @@ -1,9 +1,9 @@ # Template file for 'font-iosevka' pkgname=font-iosevka -version=1.14.2 +version=1.14.3 revision=1 +noarch=yes create_wrksrc=yes -noarch="yes" font_dirs="/usr/share/fonts/TTF" hostmakedepends="unzip" depends="font-util xbps-triggers" @@ -12,7 +12,7 @@ maintainer="Diogo Leal " license="OFL-1.1" homepage="https://be5invis.github.io/Iosevka/" distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip" -checksum=50521c7fa9707f6e03493b7362c65eba94e29f1c738d2605d3d58758e32942f4 +checksum=01f3e5d4f8c87dadd1a4fb50d63d59aeaa27e7f7fcf6cb23bcc99e1419d77345 do_install() { vmkdir usr/share/fonts/TTF diff --git a/srcpkgs/font-vollkorn-ttf/template b/srcpkgs/font-vollkorn-ttf/template index ee87b7762c4..9720414dc1e 100644 --- a/srcpkgs/font-vollkorn-ttf/template +++ b/srcpkgs/font-vollkorn-ttf/template @@ -1,28 +1,20 @@ # Template file for 'font-vollkorn-ttf' pkgname=font-vollkorn-ttf -version=4.015 +version=4.105 revision=1 create_wrksrc=yes -noarch="yes" +noarch=yes font_dirs="/usr/share/fonts/TTF" hostmakedepends="unzip" -depends="font-util xbps-triggers" +depends="font-util" short_desc="The free and healthy typeface" maintainer="ivierlin " -license="OFL" +license="OFL-1.1" homepage="http://vollkorn-typeface.com" -distfiles="${homepage}/download/vollkorn-${version/./-}.zip" -checksum=b5cb2bb11e9a9f19f6af09bba84f905f22c5c19619ee4424742dc73caa09dce5 +distfiles="http://vollkorn-typeface.com/download/vollkorn-${version/./-}.zip" +checksum=e650ea9d967c2af1e9b8d34e1118721728bcd73ccfd3220da4264661301e8af5 do_install() { - vmkdir usr/share/fonts/TTF - vinstall TTF/Vollkorn-BlackItalic.ttf 644 usr/share/fonts/TTF - vinstall TTF/Vollkorn-Black.ttf 644 usr/share/fonts/TTF - vinstall TTF/Vollkorn-BoldItalic.ttf 644 usr/share/fonts/TTF - vinstall TTF/Vollkorn-Bold.ttf 644 usr/share/fonts/TTF - vinstall TTF/Vollkorn-Italic.ttf 644 usr/share/fonts/TTF - vinstall TTF/Vollkorn-Regular.ttf 644 usr/share/fonts/TTF - vinstall TTF/Vollkorn-SemiboldItalic.ttf 644 usr/share/fonts/TTF - vinstall TTF/Vollkorn-Semibold.ttf 644 usr/share/fonts/TTF + install -Dm644 TTF/Vollkorn*.ttf -t ${DESTDIR}/usr/share/fonts/TTF vlicense OFL.txt } diff --git a/srcpkgs/freeipmi/template b/srcpkgs/freeipmi/template index 09a477602ce..41743f7ae71 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/freerdp/patches/libressl.patch b/srcpkgs/freerdp/patches/libressl.patch deleted file mode 100644 index 1f2b2dc59bc..00000000000 --- a/srcpkgs/freerdp/patches/libressl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- winpr/libwinpr/utils/ssl.c.orig 2017-11-28 15:26:30.000000000 +0100 -+++ winpr/libwinpr/utils/ssl.c 2018-01-10 10:28:17.187304871 +0100 -@@ -279,7 +279,7 @@ - - if (flags & WINPR_SSL_INIT_ENABLE_FIPS) - { --#if (OPENSSL_VERSION_NUMBER < 0x10001000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) - WLog_ERR(TAG, "Openssl fips mode ENable not available on openssl versions less than 1.0.1!"); - #else - WLog_DBG(TAG, "Ensuring openssl fips mode is ENabled"); -@@ -348,7 +348,7 @@ - - BOOL winpr_FIPSMode(void) - { --#if (OPENSSL_VERSION_NUMBER < 0x10001000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10001000L) || defined(LIBRESSL_VERSION_NUMBER) - return FALSE; - #else - return (FIPS_mode() == 1); diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index eaa3a118ab7..cba687a8598 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,24 +1,24 @@ # Template file for 'freerdp' pkgname=freerdp -version=2.0.0rc1 -revision=3 +version=2.0.0rc2 +revision=1 wrksrc="FreeRDP-${version/r/-r}" build_style=cmake -configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON - -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XV=ON - -DWITH_XKBFILE=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_ALSA=ON - -DWITH_CUPS=OFF -DWITH_PCSC=OFF -DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF" +configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON + -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON + -DWITH_LIBSYSTEMD=OFF -DWITH_PCSC=OFF -DWITH_PULSE=ON -DWITH_WAYLAND=OFF + -DWITH_XCURSOR=ON -DWITH_XEXT=ON -DWITH_XI=ON -DWITH_XINERAMA=ON + -DWITH_XKBFILE=ON -DWITH_XRENDER=ON -DWITH_XV=ON" hostmakedepends="pkg-config xmlto" -makedepends=" - alsa-lib-devel libjpeg-turbo-devel pulseaudio-devel libXinerama-devel - libXext-devel libXcursor-devel libXi-devel libXrandr-devel libXv-devel - libxkbfile-devel ffmpeg-devel glib-devel libressl-devel zlib-devel" +makedepends="alsa-lib-devel ffmpeg-devel glib-devel + libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel + libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel" short_desc="Free RDP (Remote Desktop Protocol) client" maintainer="Juan RP " license="Apache-2.0" homepage="http://www.freerdp.com/" distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version/r/-r}.tar.gz" -checksum=a2c1c83072489d56da78bbe76c29729022f5c35a3ec3a1ce26cea8823de043c2 +checksum=a09e338b996fada44bf1277f423240d0fa82289799e2e5dea9d9c63201554de1 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";; diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template index 73844339cf6..9f32bba11df 100644 --- a/srcpkgs/fribidi/template +++ b/srcpkgs/fribidi/template @@ -1,16 +1,16 @@ # Template file for 'fribidi' pkgname=fribidi -version=1.0.2 +version=1.0.3 revision=1 configure_args="--disable-docs" build_style=gnu-configure hostmakedepends="automake libtool pkg-config" short_desc="Free Implementation of the Unicode Bidirectional Algorithm" -homepage="http://fribidi.org/" -license="LGPL-2.1-or-later" maintainer="Juan RP " +license="LGPL-2.1-or-later" +homepage="https://github.com/fribidi/fribidi/" distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz" -checksum=1609083ac93fd60078c60ecdd60b61aff86855eb33e09acced579f110e41b04d +checksum=30edb331cfb94584328acece90ed723bd9655778fed29caa8a66f1a380d09a6b disable_parallel_build=yes pre_configure() { @@ -33,5 +33,6 @@ fribidi-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" + vmove usr/share/man/man3 } } diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template index 52240f1f1c8..ab38ff617e7 100644 --- a/srcpkgs/gajim/template +++ b/srcpkgs/gajim/template @@ -1,7 +1,8 @@ # Template file for 'gajim' pkgname=gajim -version=1.0.2 +version=1.0.3 revision=1 +noarch=yes build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools" @@ -10,6 +11,6 @@ short_desc="Full featured Jabber/XMPP client" maintainer="Juan RP " license="GPL-3.0-only" homepage="https://www.gajim.org" +#changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog" distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.bz2" -checksum=bc49d82001e11646e83521c2f1367a4cc5e3be54d6a9a5732f6a9e99f9f0de73 -noarch=yes +checksum=cb3ab63b06fa4c074a6af43947143ef197fe108cdef084884a48deec38ce4437 diff --git a/srcpkgs/garden/template b/srcpkgs/garden/template index c94f38ac8e1..80fd94cab54 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/gcompris-qt/template b/srcpkgs/gcompris-qt/template index 7672e524d43..b8dc0221f0e 100644 --- a/srcpkgs/gcompris-qt/template +++ b/srcpkgs/gcompris-qt/template @@ -1,24 +1,24 @@ # Template file for 'gcompris-qt' pkgname=gcompris-qt -version=0.90 +version=0.91 revision=1 build_style=cmake configure_args="-DQML_BOX2D_LIBRARY=/usr/lib/qt5/qml/Box2D.2.0" -hostmakedepends="extra-cmake-modules" -makedepends="kdoctools-devel qml-box2d qt5-declarative-devel +hostmakedepends="extra-cmake-modules kdoctools" +makedepends="qml-box2d qt5-declarative-devel qt5-multimedia-devel qt5-sensors-devel qt5-svg-devel qt5-tools-devel qt5-xmlpatterns-devel" depends="desktop-file-utils hicolor-icon-theme qt5-graphicaleffects qt5-multimedia qt5-quickcontrols qt5-svg" short_desc="High quality educational software suite for children aged 2 to 10" maintainer="cr6git " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://gcompris.net" distfiles="http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz" -checksum=eaab8805ae8c1e4fa04ba6cdfe437fca6082f2d9848dc83b4e04bd086d6faac4 +checksum=6fcf6451f5214ccacf6df51b4caa53ab996c2dc597dda0e8b7301d9c384a0026 if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake" + hostmakedepends+=" qt5-host-tools qt5-qmake" post_extract() { sed -i -e "/set(CMAKE_PREFIX_PATH/d" CMakeLists.txt } diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template index 552b34f2e04..cd1a451e104 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 ba6c36feb40..988d66bf12d 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 108322008d4..57fb9e815f4 100644 --- a/srcpkgs/gegl/template +++ b/srcpkgs/gegl/template @@ -1,21 +1,20 @@ # Template build file for 'gegl'. pkgname=gegl -version=0.2.0 -revision=9 +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 " -license="GPL-3, LGPL-3" -homepage="http://www.gimp.org" +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}" @@ -23,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 00000000000..f34a5484036 --- /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 7fdfac0ac78..04bb83d92f3 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 +version=2.10.2 revision=2 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 glib-networking" +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,11 +53,12 @@ gimp-devel_package() { vmove "usr/lib/*.so" } } + gimp-python_package() { lib32disabled=yes depends="pygtk" pycompile_dirs="usr/lib/gimp/2.0" - short_desc+=" - python bindings" + short_desc+=" - Python2 bindings" pkg_install() { vmove usr/lib/gimp/2.0/python vmove "usr/lib/gimp/2.0/plug-ins/*.py" diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template index 83b68d59f54..5c0e33cbaa3 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/git-cola/template b/srcpkgs/git-cola/template index 1914ac7e162..74d63d38bde 100644 --- a/srcpkgs/git-cola/template +++ b/srcpkgs/git-cola/template @@ -1,15 +1,15 @@ # Template file for 'git-cola' pkgname=git-cola version=3.1 -revision=2 -build_style=python2-module +revision=3 noarch=yes -hostmakedepends="python" -depends="git python-PyQt5" +build_style=python3-module +pycompile_dirs="usr/share/git-cola/lib" +hostmakedepends="python3" +depends="git python3-PyQt5 qt5-svg" short_desc="Highly caffeinated Git GUI" maintainer="Andrea Brancaleoni " license="GPL-2" -homepage="https://github.com/$pkgname/$pkgname" -distfiles="$homepage/archive/v$version.tar.gz" -pycompile_dirs="usr/share/git-cola/lib/cola" +homepage="https://git-cola.github.io/" +distfiles="https://github.com/git-cola/git-cola/archive/v${version}.tar.gz" checksum=a7a083f84697a56ee7c910ccfc680d36c5c447c6b5a3522e01bff9de91474f57 diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 249fe01d740..a92dec9ac07 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,6 +1,6 @@ # Template file for 'gjs' pkgname=gjs -version=1.52.2 +version=1.52.3 revision=1 configure_args="--without-dbus-tests" build_style=gnu-configure @@ -9,9 +9,10 @@ makedepends="dbus-glib-devel libgirepository-devel mozjs52-devel readline-devel" short_desc="Mozilla-based javascript bindings for the GNOME platform" maintainer="Enno Boland " license="MIT, LGPL-2.0-or-later" +#changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-28/NEWS" homepage="https://wiki.gnome.org/action/show/Projects/Gjs" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=28bd9c9afabf934f43c55d97fa693a2f207c866c70eeba089a2306d3af47a003 +checksum=ce21d8a83f6077b011b8834c4936281be65b2b62387f0745c3eb9adf780996fc case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" --disable-profiler" # https://gitlab.gnome.org/GNOME/gjs/issues/132 diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index efcc13ad658..949abc594b6 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 8502e24ec25..ec92a8ed32b 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 4c691ef4f45..4865c8bcc71 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 c9661264582..b3037849711 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-calendar/template b/srcpkgs/gnome-calendar/template index 3ba0e29ebf8..9aa36ca6767 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,6 +1,6 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=3.28.1 +version=3.28.2 revision=1 build_style=meson hostmakedepends="glib-devel intltool itstool pkg-config @@ -11,9 +11,10 @@ makedepends="evolution-data-server-devel geoclue2-devel short_desc="Calendar application designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" +#changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/gnome-3-28/NEWS" homepage="https://wiki.gnome.org/Apps/Calendar" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=06e7d5d47194dea9f4121f9b9859201e3406a680b35cf6f77fb2502cadfd4cc9 +checksum=dcf72dd7850a8a29dd16ebd2594acd83ac9c35b83f9f6ee87a7c3ae49eeddc74 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 6f1b52a43f5..c442b242c2b 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 fa9eb1afa20..5058b4fc918 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 8dd35dce276..2797514e214 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 bf4800dcc57..78ed74107fd 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 005fd823b13..0e3e154a65f 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 1ac6d5bcb09..f660ace158b 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/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template index 577a5a89b80..2eb2b645fca 100644 --- a/srcpkgs/gnome-tweaks/template +++ b/srcpkgs/gnome-tweaks/template @@ -1,8 +1,9 @@ # Template file for 'gnome-tweaks' pkgname=gnome-tweaks version=3.28.1 -revision=1 +revision=2 noarch=yes +replaces="gnome-tweak-tool>=0" build_style=meson pycompile_module="gtweak" hostmakedepends="intltool pkg-config" @@ -17,8 +18,8 @@ checksum=d719af9376db6109b6d5d3d1ba7fbbb18668945d7b3703131ae42b0872f3bddc nocross=yes gnome-tweak-tool_package() { - build_style=meta noarch=yes - depends="gnome-tweaks-${version}_${revision}" - short_desc+=" - transitional dummy package" + build_style=meta + depends="gnome-tweaks>=${version}_${revision}" + short_desc+=" (transitional dummy package)" } diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index 8571f531b21..26d808ca6c4 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,19 +1,19 @@ # Template file for 'gns3-gui' pkgname=gns3-gui -version=2.1.5 +version=2.1.6 revision=1 noarch=yes build_style=python3-module pycompile_module="gns3" hostmakedepends="python3-setuptools" depends="python3-setuptools python3-psutil python3-jsonschema python3-raven - python3-PyQt5-svg xterm inetutils-telnet gns3-net-converter" + python3-PyQt5-svg xterm inetutils-telnet gns3-net-converter python3-PyQt5-websockets" short_desc="Graphical Network Simulator 3 - GUI" maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="https://gns3.com" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=032faac3febc0032167bbbfaa9d73a9f7aee9811174b99044d52028eb30c2d24 +checksum=e467f8907d3f2e3a3a9192b03bffbf210a87bcf1fbf1574925f15b24df136acd post_install() { vinstall gns3-gui.desktop 644 usr/share/applications diff --git a/srcpkgs/gns3-server/patches/async-timeout.patch b/srcpkgs/gns3-server/patches/async-timeout.patch new file mode 100644 index 00000000000..ed33974988d --- /dev/null +++ b/srcpkgs/gns3-server/patches/async-timeout.patch @@ -0,0 +1,9 @@ +--- requirements.txt 2018-05-22 14:11:48.000000000 +0200 ++++ - 2018-05-27 14:37:55.136872861 +0200 +@@ -8,4 +8,4 @@ + zipstream>=1.1.4 + typing>=3.5.3.0 # Otherwise yarl fails with python 3.4 + prompt-toolkit +-async-timeout<3.0.0 # pyup: ignore; 3.0 drops support for python 3.4 +\ No newline at end of file ++async-timeout diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index 7d9a75d4780..b565f3ea2cf 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,11 +1,11 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=2.1.5 +version=2.1.6 revision=1 build_style=python3-module pycompile_module="gns3server" hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl +depends="python3-setuptools python3-jsonschema python3-aiohttp-cors2 python3-yarl python3-Jinja2 python3-raven python3-psutil python3-zipstream python3-prompt_toolkit dynamips" short_desc="Graphical Network Simulator 3 - Server" @@ -13,9 +13,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="https://gns3.com" distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz" -checksum=73ce2528dfbdc5478fc8bd6f5687f4c9bf30043ce6554d822a1f79b51dfd7381 - -broken="aiohttp 2.2.x or 2.3.x is required to run the GNS3 server" +checksum=a292be8f0a4ea970e43ea980383f046b2417e7412ff00e171a44453bde8f3463 pre_build() { # relax requirements @@ -33,4 +31,8 @@ post_install() { # modules that are used to drive additional virtualization backends # for gns3. For more information, see this ticket: # https://github.com/GNS3/gns3-server/issues/970 -only_for_archs="x86_64" +# only_for_archs="x86_64" + +case "$XBPS_TARGET_ARCH" in + i686*) broken="https://travis-ci.org/voidlinux/void-packages/jobs/384402938" +esac diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index c3af7819cb0..fb8a93edac4 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,5 +1,5 @@ # Template file for 'google-chrome' -_chromeVersion=66.0.3359.117 +_chromeVersion=66.0.3359.181 _chromeRevision=1 _channel=stable @@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64. _chromeUrl="${_baseUrl}/${_filename}" distfiles="${_chromeUrl}" -checksum=affd1443f9756240a30fac61bc7a06666cd5d9532204e1b09f499d89afc18ef9 +checksum=229b35f0d41bbb6edd98ce4ab8305994a0f5cd1ac4d9817571f07365b2d1ad80 do_extract() { mkdir -p ${DESTDIR} diff --git a/srcpkgs/googler/template b/srcpkgs/googler/template index 33c2fe066c4..1f7b0f03aff 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 4e81e014405..3406051c978 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 655477750dd..0299a507c31 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 46427674579..830a899626f 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 ad86cdd7843..57888bed6b4 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 634c49dd335..e50ef981da1 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 97ebd36e8b5..bd459379716 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=3 +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 74cb0811f65..21eeb8baecc 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 91e888cd6b2..e2411320ea7 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 1d85a6ea16f..174dc9828cd 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 74635c5f866..a2e7bf89c56 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 44a4cc6f04a..1b3b4f32739 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 a31d440a850..64eadbf4322 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 bf21aeec97c..bc402edc4d8 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 fa507bb4a55..1cb4915d47d 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/handbrake/template b/srcpkgs/handbrake/template index f2beeca45e5..f049c89b13e 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -3,7 +3,7 @@ only_for_archs="i686 i686-musl x86_64 x86_64-musl" pkgname=handbrake version=1.0.7 -revision=5 +revision=6 wrksrc="HandBrake-${version}" build_options="fdk_aac" hostmakedepends="automake libtool cmake pkg-config intltool diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template index 504e83316b6..af330dee9f3 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/hcloud/template b/srcpkgs/hcloud/template index 79693ff5edc..d32818015e2 100644 --- a/srcpkgs/hcloud/template +++ b/srcpkgs/hcloud/template @@ -1,7 +1,7 @@ # Template file for 'hcloud' pkgname=hcloud -version=1.4.0 -revision=2 +version=1.5.0 +revision=1 wrksrc="cli-${version}" build_style=go go_import_path="github.com/hetznercloud/cli" @@ -12,7 +12,7 @@ maintainer="Michael Gehring " license="MIT" homepage="https://github.com/hetznercloud/cli" distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz" -checksum=a09c07c2d081ab7493bc402246bd09d486f9fa5241a67e31e00564506c410507 +checksum=cc09f03c6a776a086ee9219e9ee70749e2ef5cda6171dd042cb1c623cccd6dfa post_install() { vlicense LICENSE diff --git a/srcpkgs/hdf5/template b/srcpkgs/hdf5/template index 39883b2f6df..936da63eb41 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 c0221ff0a9b..3f8206c54df 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 00000000000..937d41b2a7a --- /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 2945f43e95f..352a47e2494 100644 --- a/srcpkgs/hopper/template +++ b/srcpkgs/hopper/template @@ -1,6 +1,6 @@ # Template file for 'hopper' pkgname=hopper -version=4.3.21 +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=c3d4c96ac06f23729f7df8d6b990e4458af8c5300f1b3e541ba6c103082e63d0 +checksum=7fec505b744d06adc19d55a6e03a00bd661f55324d65ee33d32c8a1425920332 only_for_archs="x86_64" restricted=yes diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template index 62cef7ef6f4..ff18525fae5 100644 --- a/srcpkgs/hstr/template +++ b/srcpkgs/hstr/template @@ -1,16 +1,17 @@ # Template file for 'hstr' pkgname=hstr -version=1.24 +version=1.25 revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config" -makedepends="ncurses-devel readline-devel" +makedepends="readline-devel" short_desc="Easily view, navigate, search and manage your command history" maintainer="Diogo Leal " -license="Apache" +license="Apache-2.0" +#changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog" homepage="https://github.com/dvorka/hstr" distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz" -checksum=6c130afd8ca570ee1988a0c7d6a96efeeabd21be7e05ce1f3144bb3c86c74441 +checksum=9d50e46d2eefc667f4d2b9cd41856be6ffb33a897ab1b036886573d61cadb27f pre_configure() { sed -i -e "s###g" src/include/hstr_curses.h diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index a8679e45f41..0a25e432fa5 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 197f23ab1e2..ab54fb5e1fa 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/hwids/template b/srcpkgs/hwids/template index 084867f4032..8219d8b2b85 100644 --- a/srcpkgs/hwids/template +++ b/srcpkgs/hwids/template @@ -1,15 +1,15 @@ # Template file for 'hwids' pkgname=hwids -version=20180315 +version=20180518 revision=1 noarch=yes wrksrc="hwids-hwids-${version}" short_desc="Hardware Identification Databases" maintainer="Juan RP " -homepage="https://github.com/gentoo/hwids" license="GPL-2.0-or-later" +homepage="https://github.com/gentoo/hwids" distfiles="https://github.com/gentoo/hwids/archive/hwids-${version}.tar.gz" -checksum=07e7f9fca342dcd6f4ae8bf2f0285a68d9c170d19a62d7aad3b62dd05c54f47a +checksum=a54d88b1abedf97b209db44d459bd3c6f995e0f30f7873a738808acf27065977 do_install() { vmkdir usr/share/hwdata diff --git a/srcpkgs/ifupdown/template b/srcpkgs/ifupdown/template index 2ac98289091..a4abe4b52b5 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 00000000000..2ea8e2a002b --- /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 00000000000..a72de44e28a --- /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/inkscape/template b/srcpkgs/inkscape/template index f0dd79b9ac8..9589a547551 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape'. pkgname=inkscape version=0.92.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-lcms --enable-poppler-cairo --without-gnome-vfs --disable-static" diff --git a/srcpkgs/intel-gpu-tools/patches/disable-docs.patch b/srcpkgs/intel-gpu-tools/patches/disable-docs.patch new file mode 100644 index 00000000000..17a7fa8a911 --- /dev/null +++ b/srcpkgs/intel-gpu-tools/patches/disable-docs.patch @@ -0,0 +1,34 @@ +Source: maxice8 +Upstream: not upstreamable +Reason: Fixes building of package. + +ERROR: +Error in gtkdoc helper script: +ERROR: 'gtkdoc-mkhtml' failed with status 1 +Traceback (most recent call last): + File "/usr/bin/gtkdoc-mkhtml", line 51, in + sys.exit(mkhtml.run(options)) + File "/usr/share/gtk-doc/python/gtkdoc/mkhtml.py", line 93, in run + quiet] + remaining_args + [gtkdocdir + '/gtk-doc.xsl', document]) + File "/usr/share/gtk-doc/python/gtkdoc/mkhtml.py", line 42, in run_xsltproc + return subprocess.call(command + args) + File "/usr/lib/python2.7/subprocess.py", line 172, in call + return Popen(*popenargs, **kwargs).wait() + File "/usr/lib/python2.7/subprocess.py", line 394, in __init__ + errread, errwrite) + File "/usr/lib/python2.7/subprocess.py", line 1047, in _execute_child + raise child_exception +OSError: [Errno 2] No such file or directory + +--- meson.build ++++ meson.build +@@ -144,6 +144,6 @@ if libdrm_intel.found() + endif + subdir('man') + # has_exe_wrapper() is undefined if building natively +-if not meson.is_cross_build() or not meson.has_exe_wrapper() +- subdir('docs') +-endif ++# if not meson.is_cross_build() or not meson.has_exe_wrapper() ++# subdir('docs') ++# endif diff --git a/srcpkgs/intel-gpu-tools/template b/srcpkgs/intel-gpu-tools/template index 0e3a2120955..e8f343254af 100644 --- a/srcpkgs/intel-gpu-tools/template +++ b/srcpkgs/intel-gpu-tools/template @@ -1,11 +1,11 @@ # Template file for 'intel-gpu-tools' pkgname=intel-gpu-tools version=1.22 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config swig flex gtk-doc" -makedepends="python3-devel libXv-devel libXrandr-devel libpciaccess-devel - libdrm-devel cairo-devel libunwind-devel libkmod-devel procps-ng-devel" +hostmakedepends="flex gtk-doc pkg-config swig" +makedepends="cairo-devel libXrandr-devel libXv-devel libkmod-devel + libunwind-devel procps-ng-devel python3-devel" short_desc="Tools for development and testing of the Intel DRM driver" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template index 697dce90883..8fadf5fc9ba 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 30bf85ed2f7..655743ebab9 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/iwd/files/iwd/run b/srcpkgs/iwd/files/iwd/run new file mode 100755 index 00000000000..b7d22b7f9e4 --- /dev/null +++ b/srcpkgs/iwd/files/iwd/run @@ -0,0 +1,4 @@ +#!/bin/sh +[ -r ./conf ] && . ./conf +exec 2>&1 +exec /usr/libexec/iwd ${OPTS} diff --git a/srcpkgs/iwd/patches/fix-musl.patch b/srcpkgs/iwd/patches/fix-musl.patch new file mode 100644 index 00000000000..a4959ced9bd --- /dev/null +++ b/srcpkgs/iwd/patches/fix-musl.patch @@ -0,0 +1,79 @@ +Source: John +Upstream: Unknown +Reason: Fixes compilation with musl libc + +--- ell/dhcp-transport.c ++++ ell/dhcp-transport.c +@@ -185,12 +183,12 @@ + ip->saddr = L_CPU_TO_BE32(saddr); + ip->daddr = L_CPU_TO_BE32(daddr); + +- udp->source = L_CPU_TO_BE16(sport); +- udp->dest = L_CPU_TO_BE16(dport); ++ udp->uh_sport = L_CPU_TO_BE16(sport); ++ udp->uh_dport = L_CPU_TO_BE16(dport); + +- udp->len = L_CPU_TO_BE16(len + sizeof(*udp)); ++ udp->uh_ulen = L_CPU_TO_BE16(len + sizeof(*udp)); + +- ip->check = udp->len; ++ ip->check = udp->uh_ulen; + + iov[0].iov_base = &ip->ttl; + iov[0].iov_len = sizeof(*ip) - 8; +@@ -198,7 +196,7 @@ + iov[1].iov_len = sizeof(*udp); + iov[2].iov_base = (void *) data; + iov[2].iov_len = len; +- udp->check = _dhcp_checksumv(iov, 3); ++ udp->uh_sum = _dhcp_checksumv(iov, 3); + + ip->ttl = IPDEFTTL; + ip->check = 0; +--- ell/dhcp.c ++++ ell/dhcp.c +@@ -25,9 +25,9 @@ + #endif + + #include ++#include + #include + #include +-#include + #include + #include + +--- monitor/nlmon.c ++++ monitor/nlmon.c +@@ -31,6 +31,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -38,8 +40,6 @@ + #include + #include + #include +-#include +-#include + #include + + #ifndef ARPHRD_NETLINK + +--- plugins/ofono.c ++++ plugins/ofono.c +@@ -653,7 +653,9 @@ + * has been seen to happen. + */ + l_error("modem %s already found", path); ++#if defined(__GLIBC__) + __iwd_backtrace_print(2); ++#endif + exit(1); + } + + diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template new file mode 100644 index 00000000000..66c1bf2cf03 --- /dev/null +++ b/srcpkgs/iwd/template @@ -0,0 +1,24 @@ +# Template file for 'iwd' +pkgname=iwd +version=0.2 +revision=1 +build_style=gnu-configure +configure_args="--disable-systemd-service --enable-docs" +hostmakedepends="asciidoc pkg-config" +makedepends="readline-devel dbus-devel" +depends="dbus" +short_desc="Internet Wireless Daemon by Intel that aims to replace wpa_supplicant" +maintainer="maxice8 " +license="LGPL-2.1-or-later" +homepage="https://iwd.wiki.kernel.org/" +distfiles="${KERNEL_SITE}/network/wireless/iwd-${version}.tar.xz" +checksum=25cc09cb75a707e0441dc52901d8bba9c73d9460f42116c34ffc4f0f3676ea44 +make_dirs="/var/lib/iwd 0600 root root" + +post_install() { + vmkdir etc/iwd + touch "${DESTDIR}"/etc/iwd/.empty + + vsconf doc/main.conf + vsv iwd +} diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template index 4a028e678b4..8296967be88 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/kapacitor/template b/srcpkgs/kapacitor/template index 21429d913ad..9bca3558898 100644 --- a/srcpkgs/kapacitor/template +++ b/srcpkgs/kapacitor/template @@ -1,7 +1,7 @@ # Template file for 'kapacitor' pkgname=kapacitor -version=1.4.0 -revision=5 +version=1.4.1 +revision=1 build_style="go" go_import_path="github.com/influxdata/kapacitor" go_package="${go_import_path}/cmd/kapacitor @@ -16,7 +16,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="https://www.influxdata.com/time-series-platform/kapacitor/" distfiles="https://github.com/influxdata/${pkgname}/archive/v${version}.tar.gz" -checksum=3c448eec9fb26581d9074a9fca4593d7aa7a19e4934cc392b5a345fad90edbeb +checksum=9bbcca83c408252c8b92ad00cb4dbb502b4ce1ef3b474e3285c1472fdb3e0dc9 # This package has a Gopkg.lock and a Gopkg.toml, but for build the # required files are part of the dist tarball. Thus we don't run dep diff --git a/srcpkgs/kbdd/template b/srcpkgs/kbdd/template index 539054c3dde..675c192fece 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 6476c91f6d0..a14ba20763a 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/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch b/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch new file mode 100644 index 00000000000..9ac04dc9f18 --- /dev/null +++ b/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch @@ -0,0 +1,125 @@ +diff -u -r linux-4.9.8-bak/include/uapi/linux/if_arp.h linux-4.9.8/include/uapi/linux/if_arp.h +--- include/uapi/linux/if_arp.h 2018-05-14 23:49:28.882768986 +0200 ++++ include/uapi/linux/if_arp.h 2018-05-14 23:50:03.156912981 +0200 +@@ -24,6 +24,7 @@ + #define _UAPI_LINUX_IF_ARP_H + + #include ++#include + + /* ARP protocol HARDWARE identifiers. */ + #define ARPHRD_NETROM 0 /* from KA9Q: NET/ROM pseudo */ +@@ -108,7 +109,7 @@ + #define ARPOP_InREPLY 9 /* InARP reply */ + #define ARPOP_NAK 10 /* (ATM)ARP NAK */ + +- ++#if __UAPI_DEF_ARPREQ + /* ARP ioctl request. */ + struct arpreq { + struct sockaddr arp_pa; /* protocol address */ +@@ -117,13 +118,15 @@ + struct sockaddr arp_netmask; /* netmask (only for proxy arps) */ + char arp_dev[16]; + }; +- ++#endif ++#if __UAPI_DEF_ARPREQ_OLD + struct arpreq_old { + struct sockaddr arp_pa; /* protocol address */ + struct sockaddr arp_ha; /* hardware address */ + int arp_flags; /* flags */ + struct sockaddr arp_netmask; /* netmask (only for proxy arps) */ + }; ++#endif + + /* ARP Flag values. */ + #define ATF_COM 0x02 /* completed entry (ha valid) */ +@@ -133,7 +136,7 @@ + #define ATF_NETMASK 0x20 /* want to use a netmask (only + for proxy entries) */ + #define ATF_DONTPUB 0x40 /* don't answer this addresses */ +- ++#if __UAPI_DEF_ARPHDR + /* + * This structure defines an ethernet arp header. + */ +@@ -156,6 +159,6 @@ + #endif + + }; +- ++#endif + + #endif /* _UAPI_LINUX_IF_ARP_H */ +diff -u -r linux-4.9.8-bak/include/uapi/linux/if_ether.h linux-4.9.8/include/uapi/linux/if_ether.h +--- include/uapi/linux/if_ether.h 2018-05-14 23:49:28.882768986 +0200 ++++ include/uapi/linux/if_ether.h 2018-05-14 23:50:03.155912977 +0200 +@@ -22,6 +22,7 @@ + #define _UAPI_LINUX_IF_ETHER_H + + #include ++#include + + /* + * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +@@ -137,12 +138,12 @@ + /* + * This is an Ethernet frame header. + */ +- ++#if __UAPI_DEF_ETHHDR + struct ethhdr { + unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ + unsigned char h_source[ETH_ALEN]; /* source ether addr */ + __be16 h_proto; /* packet type ID field */ + } __attribute__((packed)); +- ++#endif + + #endif /* _UAPI_LINUX_IF_ETHER_H */ +diff -u -r linux-4.9.8-bak/include/uapi/linux/libc-compat.h linux-4.9.8/include/uapi/linux/libc-compat.h +--- include/uapi/linux/libc-compat.h 2018-05-14 23:49:28.885768999 +0200 ++++ include/uapi/linux/libc-compat.h 2018-05-14 23:50:03.156912981 +0200 +@@ -51,6 +51,11 @@ + /* We have included glibc headers... */ + #if defined(__GLIBC__) + ++#define __UAPI_DEF_ETHHDR 1 ++#define __UAPI_DEF_ARPREQ 1 ++#define __UAPI_DEF_ARPREQ_OLD 1 ++#define __UAPI_DEF_ARPHDR 1 ++ + /* Coordinate with glibc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) + +@@ -73,7 +78,6 @@ + /* Linux headers included first, and we must define everything + * we need. The expectation is that glibc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ +- + #define __UAPI_DEF_IF_IFCONF 1 + #define __UAPI_DEF_IF_IFMAP 1 + #define __UAPI_DEF_IF_IFNAMSIZ 1 +@@ -256,6 +260,21 @@ + #define __UAPI_DEF_XATTR 1 + #endif + ++#ifdef _NETINET_IF_ETHER_H /* musl */ ++#define __UAPI_DEF_ETHHDR 0 ++#else ++#define __UAPI_DEF_ETHHDR 1 ++#endif ++ ++#ifdef _NET_IF_ARP_H ++#define __UAPI_DEF_ARPREQ 0 ++#define __UAPI_DEF_ARPREQ_OLD 0 ++#define __UAPI_DEF_ARPHDR 0 ++#else ++#define __UAPI_DEF_ARPREQ 1 ++#define __UAPI_DEF_ARPREQ_OLD 1 ++#define __UAPI_DEF_ARPHDR 1 ++#endif + + /* If we did not see any headers from any supported C libraries, + * or we are being included in the kernel, then define everything diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template index 8217a33112d..74fbf393651 100644 --- a/srcpkgs/kernel-libc-headers/template +++ b/srcpkgs/kernel-libc-headers/template @@ -1,7 +1,7 @@ # Template file for 'kernel-libc-headers' pkgname=kernel-libc-headers version=4.9.8 -revision=3 +revision=4 bootstrap=yes nostrip=yes noverifyrdeps=yes diff --git a/srcpkgs/kexi/template b/srcpkgs/kexi/template index 05df5f3ef26..fa6d809f795 100644 --- a/srcpkgs/kexi/template +++ b/srcpkgs/kexi/template @@ -1,8 +1,9 @@ # Template file for 'kexi' pkgname=kexi version=3.1.0 -revision=1 +revision=2 build_style=cmake +replaces="calligra-kexi>=0" hostmakedepends="extra-cmake-modules kdoctools doxygen pkg-config" makedepends="ktexteditor-devel kdb-devel kreport-devel qt5-webkit-devel breeze-icons postgresql-libs-devel libmysqlclient-devel marble5-devel" diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template index af813a4299c..68c72be66b7 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 00000000000..659fb6b426a --- /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 00000000000..9251655c1bb --- /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 00000000000..7c09927032e --- /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 00000000000..f6d7d7bf71e --- /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/konsole/template b/srcpkgs/konsole/template index ca03a2e7e91..dd22858b866 100644 --- a/srcpkgs/konsole/template +++ b/srcpkgs/konsole/template @@ -1,9 +1,9 @@ # Template file for 'konsole' pkgname=konsole version=17.12.2 -revision=1 +revision=2 build_style=cmake -replaces="konsole5>=0 Konsole5>=0" +replaces="konsole5>=0" configure_args="-DBUILD_TESTING=OFF" hostmakedepends="pkg-config extra-cmake-modules kcoreaddons qt5-devel qt5-qmake kdoctools kconfig" makedepends="qt5-devel kbookmarks-devel kinit-devel knotifyconfig-devel @@ -20,8 +20,7 @@ if [ -n "$CROSS_BUILD" ]; then fi konsole5_package() { - noarch=yes build_style=meta - short_desc="${short_desc} (transitional dummy package)" + short_desc+=" (transitional dummy package)" depends="konsole>=${version}_${revision}" } diff --git a/srcpkgs/krename/patches/0001-Use-newer-minimal-version-of-taglib.patch b/srcpkgs/krename/patches/0001-Use-newer-minimal-version-of-taglib.patch deleted file mode 100644 index 80e09272595..00000000000 --- a/srcpkgs/krename/patches/0001-Use-newer-minimal-version-of-taglib.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 517eda52bebb6a0c5df06b52ff81a19ed9b71740 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= -Date: Wed, 8 Nov 2017 12:41:22 +0100 -Subject: [PATCH] Use newer minimal version of taglib - -CMake rejects 1.11.1 as "greater" than 1.5, so let's use 1.10 as minimal -so it accepts. ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git CMakeLists.txt CMakeLists.txt -index f0fd6d5..c18e9f1 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -17,9 +17,9 @@ INCLUDE (MacroLibrary) - INCLUDE (FindGettext) - - # Find taglib --set(TAGLIB_MIN_VERSION "1.5") -+set(TAGLIB_MIN_VERSION "1.10") - macro_optional_find_package(Taglib REQUIRED) --macro_log_feature( TAGLIB_FOUND "taglib" "Read and write tags in audio files" "http://www.freshmeat.net/projects/taglib" TRUE "1.5.0" "") -+macro_log_feature( TAGLIB_FOUND "taglib" "Read and write tags in audio files" "http://www.freshmeat.net/projects/taglib" TRUE "1.10.0" "") - - IF(TAGLIB_FOUND) - ADD_DEFINITIONS( -DWITH_TAGLIB ) --- -2.15.0 - diff --git a/srcpkgs/krename/patches/krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch b/srcpkgs/krename/patches/krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch deleted file mode 100644 index 0776d0a5901..00000000000 --- a/srcpkgs/krename/patches/krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch +++ /dev/null @@ -1,16 +0,0 @@ -Source: Heiko Becker -Upstream: Submitted, https://sourceforge.net/tracker/?func=detail&aid=3256681&group_id=42805&atid=434230 -Reason: Fix FindLIBPODOFO.cmake - -diff -urB krename-4.0.7_orig/cmake/modules/FindLIBPODOFO.cmake krename-4.0.7/cmake/modules/FindLIBPODOFO.cmake ---- cmake/modules/FindLIBPODOFO.cmake 2011-02-21 23:00:30.000000000 +0100 -+++ cmake/modules/FindLIBPODOFO.cmake 2011-03-29 10:29:03.606942001 +0200 -@@ -23,7 +23,7 @@ - ENDIF(LIBPODOFO_H) - - FIND_LIBRARY(LIBPODOFO_LIB -- NAMES libpodofo-doc podofo-doc -+ NAMES libpodofo podofo libpodofo-doc podofo-doc - PATHS "${LIBPODOFO_DIR}/lib" "${LIBPODOFO_DIR}/src" "${LIBPODOFO_DIR}") - IF(LIBPODOFO_LIB) - MESSAGE("podofo lib: ${LIBPODOFO_LIB}") diff --git a/srcpkgs/krename/patches/krename-4.0.9-fix-file_delete-flags.patch b/srcpkgs/krename/patches/krename-4.0.9-fix-file_delete-flags.patch deleted file mode 100644 index b3f02da4bb0..00000000000 --- a/srcpkgs/krename/patches/krename-4.0.9-fix-file_delete-flags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up krename-4.0.9/src/batchrenamer.cpp.fix krename-4.0.9/src/batchrenamer.cpp ---- src/batchrenamer.cpp.fix 2016-12-08 15:11:53.559881534 +0100 -+++ src/batchrenamer.cpp 2016-12-08 15:14:00.345352643 +0100 -@@ -402,7 +402,7 @@ void BatchRenamer::undoFiles( ProgressDi - break; - case eRenameMode_Link: - // In case of link delete created file -- job = KIO::file_delete( dstUrl, false ); -+ job = KIO::file_delete( dstUrl, KIO::HideProgressInfo ); - break; - case eRenameMode_Copy: // no undo possible - // TODO: Maybe we should delete the created files diff --git a/srcpkgs/krename/patches/krename-4.0.9-fix-freetype-includes.patch b/srcpkgs/krename/patches/krename-4.0.9-fix-freetype-includes.patch deleted file mode 100644 index 60f68cd998c..00000000000 --- a/srcpkgs/krename/patches/krename-4.0.9-fix-freetype-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up krename-4.0.9/src/CMakeLists.txt.fix-freetype-includes krename-4.0.9/src/CMakeLists.txt ---- src/CMakeLists.txt.fix-freetype-includes 2013-03-18 08:34:07.375132971 +0100 -+++ src/CMakeLists.txt 2013-03-18 08:34:24.268578880 +0100 -@@ -18,7 +18,7 @@ IF(LIBPODOFO_FOUND) - ENDIF(LIBPODOFO_FOUND) - - IF(FREETYPE_FOUND) -- INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIR} ) -+ INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIRS} ) - ENDIF(FREETYPE_FOUND) - - ADD_DEFINITIONS(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS} ${LIBPODOFO_CFLAGS} ${KDE4_DEFINITIONS} ) diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template index ad866fab09c..b2b1af4bc94 100644 --- a/srcpkgs/krename/template +++ b/srcpkgs/krename/template @@ -1,14 +1,18 @@ # Template file for 'krename' pkgname=krename -version=4.0.9 +version=5.0.0 revision=1 build_style=cmake -hostmakedepends="automoc4 pkg-config" -makedepends="exiv2-devel freetype-devel kdelibs-devel libpodofo-devel - libressl-devel phonon-devel qt-devel taglib-devel" +hostmakedepends="extra-cmake-modules pkg-config" +makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel + taglib-devel" short_desc="Powerful batch renamer for KDE" maintainer="Piotr Wójcik " -license="GPL-2" -homepage="http://www.krename.net/" -distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/KDE4%20krename-stable/$version/${pkgname}-${version}.tar.bz2" -checksum=baf1f426360824c98ee3134a74fe2c93763ea01c15aea8801d6968d676796d85 +license="GPL-2.0-or-later" +homepage="https://userbase.kde.org/KRename" +distfiles="${KDE_SITE}/${pkgname}/$version/src/${pkgname}-${version}.tar.xz" +checksum=0a61761853787fd46b35f3a733cf87cde00de5df631728332a64c38c670bd28c + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" python qt5-host-tools qt5-qmake" +fi diff --git a/srcpkgs/kubectl b/srcpkgs/kubectl new file mode 120000 index 00000000000..581eb68ee1a --- /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 00000000000..4e22b6215e2 --- /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 ecae5613d9b..92d71879e09 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/lastpass-cli/template b/srcpkgs/lastpass-cli/template index 4d0b741a360..a05269307f9 100644 --- a/srcpkgs/lastpass-cli/template +++ b/srcpkgs/lastpass-cli/template @@ -1,17 +1,18 @@ # Template file for 'lastpass-cli' pkgname=lastpass-cli -version=1.3.0 -revision=2 +version=1.3.1 +revision=1 build_style=cmake make_install_target="install install-doc" -hostmakedepends="pkg-config asciidoc" -makedepends="libressl-devel libcurl-devel libxml2-devel bash-completion" +hostmakedepends="asciidoc pkg-config" +makedepends="bash-completion libcurl-devel libxml2-devel" short_desc="Command line interface to LastPass.com" maintainer="Michael Carlberg " license="GPL-2.0-or-later" homepage="https://lastpass.com/" +#changelog="https://raw.githubusercontent.com/lastpass/lastpass-cli/master/CHANGELOG.md" distfiles="https://github.com/lastpass/${pkgname}/archive/v${version}.tar.gz" -checksum=bbcfd673d668287e773eef44da65fbd2f292daa213a39528f31037c528dbcfe4 +checksum=25dc9a0c99a10ee70b5b3991d525448c25f312cc69fa0216d7ac70c4ae384b1b post_install() { vmkdir usr/share/examples/lpass diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index de5f5562dc9..2b38c3fae97 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -1,11 +1,11 @@ # Template file for 'ledger' pkgname=ledger version=3.1.1 -revision=6 +revision=7 build_style=cmake -maintainer="Orphaned " +maintainer="Daniel Santana " makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel" -license="BSD" +license="BSD-3-Clause" homepage="http://www.ledger-cli.org/" short_desc="A powerful, double-entry accounting system that is accessed from the UNIX command-line" distfiles="https://github.com/ledger/${pkgname}/archive/v${version}.tar.gz" @@ -20,6 +20,7 @@ post_install() { mkdir -p ${DESTDIR}/usr/share/emacs/ mv lisp ${DESTDIR}/usr/share/emacs/site-lisp rm -f ${DESTDIR}/usr/share/emacs/site-lisp/CMakeLists.txt + vlicense LICENSE.md } libledger_package() { diff --git a/srcpkgs/leptonica/template b/srcpkgs/leptonica/template index abf82c148ff..103ee145272 100644 --- a/srcpkgs/leptonica/template +++ b/srcpkgs/leptonica/template @@ -1,9 +1,10 @@ # Template file for 'leptonica' pkgname=leptonica version=1.76.0 -revision=1 +revision=2 build_style=gnu-configure -makedepends="giflib-devel libpng-devel tiff-devel" +hostmakedepends="pkg-config" +makedepends="libopenjpeg2-devel libwebp-devel" short_desc="Image processing and analysis library" maintainer="Jürgen Buchmüller " license="BSD-2-Clause" diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 2de4d680191..818eb276d7e 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,9 +1,8 @@ # Template file for 'libArcus' pkgname=libArcus version=3.3.0 -revision=1 +revision=2 build_style=cmake -python_version=3 configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" makedepends="protobuf-devel python3-devel" @@ -16,7 +15,7 @@ distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz" checksum=9416731ccc21fc51c7102431e4c9e2a01075676a7a095bdec2dc2a943359940a libArcus-devel_package() { - depends="${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -26,6 +25,7 @@ libArcus-devel_package() { } libArcus-python3_package() { + lib32disabled=yes short_desc+=" - Python3 bindings" pkg_install() { vmove "usr/lib/python3*" diff --git a/srcpkgs/libabigail/template b/srcpkgs/libabigail/template index 1e5b0c3e3d4..beefec6eb28 100644 --- a/srcpkgs/libabigail/template +++ b/srcpkgs/libabigail/template @@ -1,17 +1,17 @@ # Template file for 'libabigail' pkgname=libabigail -version=1.2 +version=1.3 revision=1 build_style=gnu-configure -hostmakedepends="automake cpio dpkg libtool pkg-config python-Sphinx rpmextract" +hostmakedepends="automake cpio dpkg libtool pkg-config python3-Sphinx" makedepends="elfutils-devel libxml2-devel" configure_args="--enable-cxx11=yes" short_desc="ABI Generic Analysis and Instrumentation Library" maintainer="Leah Neukirchen " -license="LGPL-3" +license="LGPL-3.0-or-later" homepage="https://www.sourceware.org/libabigail/" distfiles="http://mirrors.kernel.org/sourceware/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=05c695a6e8fce3fe7e867a7dd2eba0b0464760bd731a5d74835c12478f36af0f +checksum=9caf1f75ba421d4e63d2fa0cf385b7cecaa4dc3ae6c17641b7f177da9f92c77b case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" musl-fts-devel"; LDFLAGS="-lfts" ;; diff --git a/srcpkgs/libappindicator/template b/srcpkgs/libappindicator/template index 1897403ccff..c9b54fa76b1 100644 --- a/srcpkgs/libappindicator/template +++ b/srcpkgs/libappindicator/template @@ -4,7 +4,7 @@ version=12.10.0 revision=1 build_style=gnu-configure configure_args="--with-gtk=3" -hostmakedepends="pkg-config python" +hostmakedepends="pkg-config python glib-devel" makedepends="gtk+3-devel glib-devel glib-networking libdbusmenu-glib-devel libdbusmenu-gtk3-devel libindicator-devel dbus-glib-devel python-devel python-gobject2-devel pygtk-devel" @@ -15,11 +15,16 @@ homepage="https://launchpad.net/libappindicator" distfiles="https://launchpad.net/libappindicator/${version%.*}/${version}/+download/libappindicator-${version}.tar.gz" checksum=d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f -nocross="keeps trying to build python modules on the host" # since this package depends on features that have already been removed in # gtk+4, we need to ignore the depreciated problem. GTK is going away from the # idea of app indicators in taskbars. -CFLAGS="-Wno-deprecated-declarations" +CFLAGS="-Wno-deprecated-declarations -Wno-error=incompatible-pointer-types" + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure + fi +} libappindicator-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libbsd/patches/musl.patch b/srcpkgs/libbsd/patches/musl.patch index f6436c0f706..a82343d83d1 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 9045c7b3f56..c7069f8abfe 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/libbytesize/template b/srcpkgs/libbytesize/template index 25cdbe0fba4..20c0784b7ed 100644 --- a/srcpkgs/libbytesize/template +++ b/srcpkgs/libbytesize/template @@ -1,7 +1,7 @@ # Template file for 'libbytesize' pkgname=libbytesize version=1.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="python3" makedepends="mpfr-devel pcre-devel" @@ -28,8 +28,10 @@ libbytesize-devel_package() { } libbytesize-python3_package() { - depends="python3 ${sourcepkg}>=${version}_${revision}" - short_desc+=" - python3 bindings" + noarch=yes + pycompile_module="bytesize" + depends="python3-six ${sourcepkg}>=${version}_${revision}" + short_desc+=" - Python3 bindings" pkg_install() { vmove usr/lib/python3* } diff --git a/srcpkgs/libcprops/patches/musl.patch b/srcpkgs/libcprops/patches/musl.patch new file mode 100644 index 00000000000..0ff6e0fb205 --- /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 964d1b4eaa4..cb4705ca057 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/libcue-devel b/srcpkgs/libcue-devel new file mode 120000 index 00000000000..ca37a8b8905 --- /dev/null +++ b/srcpkgs/libcue-devel @@ -0,0 +1 @@ +libcue \ No newline at end of file diff --git a/srcpkgs/libcue/template b/srcpkgs/libcue/template new file mode 100644 index 00000000000..289908b9f6f --- /dev/null +++ b/srcpkgs/libcue/template @@ -0,0 +1,28 @@ +# Template file for 'libcue' +pkgname=libcue +version=2.2.1 +revision=1 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON" +hostmakedepends="bison flex" +short_desc="CUE Sheet Parser Library" +maintainer="John " +license="GPL-2.0-or-later, BSD-2-Clause" +homepage="https://github.com/lipnitsk/libcue" +distfiles="https://github.com/lipnitsk/libcue/archive/v${version}.tar.gz" +checksum=f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f1200 + +libcue-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + +post_install() { + head -22 rem.c > COPYING.BSD + vlicense COPYING.BSD +} diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 78fcffff5eb..58215bdf128 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/libdca/template b/srcpkgs/libdca/template index c14117117d7..24c47ea8915 100644 --- a/srcpkgs/libdca/template +++ b/srcpkgs/libdca/template @@ -1,23 +1,14 @@ # Template file for 'libdca' pkgname=libdca -version=0.0.5 -revision=9 +version=0.0.6 +revision=1 build_style=gnu-configure short_desc="DTS Coherent Acoustics decoder" -homepage="http://www.videolan.org/developers/libdca.html" -license="GPL-2" maintainer="Juan RP " -distfiles="http://download.videolan.org/pub/videolan/$pkgname/$version/$pkgname-$version.tar.bz2" -checksum=dba022e022109a5bacbe122d50917769ff27b64a7bba104bd38ced8de8510642 - -LDFLAGS="-lm" - -post_install() { - # Fix manpage links. - cd ${DESTDIR}/usr/share/man/man1 - ln -sf dcadec.1 dtsdec.1 - ln -sf extract_dca.1 extract_dts.1 -} +license="GPL-2.0-or-later" +homepage="https://www.videolan.org/developers/libdca.html" +distfiles="https://download.videolan.org/pub/videolan/libdca/${version}/libdca-${version}.tar.bz2" +checksum=98f98a9aa000a26b927c6facd15d18dcf664238adfc5db24f533c5932cdb1f40 libdca-devel_package() { depends="libdca>=${version}_${revision}" diff --git a/srcpkgs/libdmx/template b/srcpkgs/libdmx/template index 8bf6bfc1676..74f2e57f63a 100644 --- a/srcpkgs/libdmx/template +++ b/srcpkgs/libdmx/template @@ -1,16 +1,17 @@ # Template build file for 'libdmx'. pkgname=libdmx -version=1.1.3 -revision=3 +version=1.1.4 +revision=1 build_style=gnu-configure +configure_args="--enable-malloc0returnsnull" hostmakedepends="pkg-config" -makedepends="xorgproto libXext-devel" +makedepends="libXext-devel" short_desc="DMX Extension for X" maintainer="Juan RP " license="MIT" -homepage="${XORG_SITE}" -distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201 +homepage="https://wiki.freedesktop.org/xorg/" +distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" +checksum=253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243 post_install() { vlicense COPYING diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 820ce8a9e46..090b4b9f6bc 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,17 +1,22 @@ # Template build file for 'libdrm'. pkgname=libdrm -version=2.4.91 +version=2.4.92 revision=1 -configure_args="-Dudev=true -Dvalgrind=false" build_style=meson +configure_args="-Dudev=true -Dvalgrind=false" hostmakedepends="pkg-config" makedepends="eudev-libudev-devel libpciaccess-devel" short_desc="Userspace interface to kernel DRM services" maintainer="Juan RP " -homepage="https://dri.freedesktop.org/" license="MIT" +homepage="https://dri.freedesktop.org/" distfiles="https://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" -checksum=634a0ed0cc1eff06f48674b1da81aafa661a9f001e7a4f43dde81076886dc800 +checksum=e9e48fdb4de139dc4d9880aa1473158a16ff6aff63d14341367bd30a51ff39fa + +post_install() { + sed -n 9,25p < libsync.h > LICENSE + vlicense LICENSE +} libdrm-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template index 0a9551572a1..dfc5081d847 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 0357ad208f2..00000000000 --- 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 f4eca4b03d7..e787226ddbb 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 e4de297cc00..49dc650adc8 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 43a529ce22d..3b9e9e99c46 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/libfilezilla/template b/srcpkgs/libfilezilla/template index 5918cb197eb..07f9c201524 100644 --- a/srcpkgs/libfilezilla/template +++ b/srcpkgs/libfilezilla/template @@ -1,22 +1,22 @@ # Template file for 'libfilezilla' pkgname=libfilezilla -version=0.12.1 +version=0.12.2 revision=1 build_style=gnu-configure configure_args="--disable-static" -short_desc="A small and modern C++ library, which offers some basic functionalities" +short_desc="Small and modern C++ library, which offers some basic functionalities" maintainer="bra1nwave " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://lib.filezilla-project.org/" distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=60efc9455e022785d432f7a76390dd2d1d92101a65aef1f176a382d604a978bd +checksum=778c166fde3a87e04a0524a4bf92c3eea1f0836c20119dd0859c9cd9380c86ec libfilezilla-devel_package() { short_desc+=" - development files" depends="libfilezilla>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index cf816ec459a..7ab8f4a7322 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/libinput/template b/srcpkgs/libinput/template index 7bd8657a3bb..a21b3f16deb 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,17 +1,17 @@ # Template file for 'libinput' pkgname=libinput -version=1.10.6 +version=1.10.7 revision=1 build_style=meson -configure_args="-Dtests=false -Ddebug-gui=false -Ddocumentation=false" -hostmakedepends="pkg-config" -makedepends="libevdev-devel libwacom-devel mtdev-devel" +configure_args="-Ddebug-gui=false -Ddocumentation=false" +hostmakedepends="pkg-config valgrind" +makedepends="libevdev-devel libwacom-devel mtdev-devel check-devel" short_desc="Provides handling input devices in Wayland compositors and X" maintainer="Juan RP " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/libinput" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=4207742c96980584112b19090413f2d390c6acaaf51c4aac1df9edbbcdfb9b39 +checksum=996f27f1b12d19dbbc579d45141b2a5e5baf9832f78fe28227d724f28823d097 post_install() { vlicense COPYING diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template index 78b765ad2a8..0b51c141e87 100644 --- a/srcpkgs/libkomparediff2/template +++ b/srcpkgs/libkomparediff2/template @@ -1,16 +1,20 @@ # Template file for 'libkomparediff2' pkgname=libkomparediff2 -version=17.12.1 +version=18.04.1 revision=1 -short_desc="Library to compare files and strings" -maintainer="Norbert Vegh " -license="GPL-2+" -homepage="http://www.kde.org/" -distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=1f064f35edc409edacf87c5b61dd2d693d098c34538856acf23b142e2f00a749 build_style=cmake -hostmakedepends="extra-cmake-modules python qt5-host-tools qt5-qmake" -makedepends="kparts-devel qt5-devel" +hostmakedepends="extra-cmake-modules" +makedepends="kparts-devel" +short_desc="Library to compare files and strings" +maintainer="Piotr Wójcik " +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="https://www.kde.org/" +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=dbff5b172d29b3ef28a954d25c1a4794b0c90e8ac385746c9bb02e1720c80034 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" python qt5-host-tools qt5-qmake" +fi libkomparediff2-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libmediainfo/template b/srcpkgs/libmediainfo/template index baaf8a25122..e62cc19ece5 100644 --- a/srcpkgs/libmediainfo/template +++ b/srcpkgs/libmediainfo/template @@ -1,6 +1,6 @@ # Template file for 'libmediainfo' pkgname=libmediainfo -version=18.03.1 +version=18.05 revision=1 wrksrc="MediaInfoLib" build_wrksrc="Project/GNU/Library" @@ -9,11 +9,11 @@ configure_args="--enable-shared --disable-static --with-libcurl --with-libmms" hostmakedepends="automake libtool pkg-config" makedepends="libcurl-devel libmms-devel libzen-devel" short_desc="Shared library for mediainfo" -homepage="https://mediaarea.net/MediaInfo" maintainer="Georg Schabel " -license="BSD" +license="BSD-2-Clause" +homepage="https://mediaarea.net/MediaInfo" distfiles="https://mediaarea.net/download/source/libmediainfo/${version}/${pkgname}_${version}.tar.xz" -checksum=0243365f53299997bc04dfa065de9b3f1688b6eeb450a7f57e740504cd626fa0 +checksum=76759613ca71d5659818e6ed121be9f31c552931b04939b0db4c58bc57cd5221 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libmypaint-devel b/srcpkgs/libmypaint-devel new file mode 120000 index 00000000000..3743c1a405f --- /dev/null +++ b/srcpkgs/libmypaint-devel @@ -0,0 +1 @@ +libmypaint \ No newline at end of file diff --git a/srcpkgs/libmypaint/template b/srcpkgs/libmypaint/template new file mode 100644 index 00000000000..3b33019bde6 --- /dev/null +++ b/srcpkgs/libmypaint/template @@ -0,0 +1,33 @@ +# Template build file for 'libmypaint' +pkgname=libmypaint +version=1.3.0 +revision=1 +build_style=gnu-configure +configure_args="--disable-gegl" +hostmakedepends="intltool pkg-config $(vopt_if gir gobject-introspection)" +makedepends="json-c-devel glib-devel json-glib-devel" +short_desc="MyPaint brush engine library" +maintainer="Kartik S " +license="ISC" +homepage="https://github.com/mypaint/libmypaint" +distfiles="https://github.com/mypaint/libmypaint/releases/download/v${version}/libmypaint-${version}.tar.xz" +checksum=6a07d9d57fea60f68d218a953ce91b168975a003db24de6ac01ad69dcc94a671 + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi + +libmypaint-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 3c34e894ff0..948a1623e2c 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot' pkgname=libopenshot version=0.1.9 -revision=3 +revision=4 build_style=cmake only_for_archs="i686 x86_64" pycompile_module="openshot.py" diff --git a/srcpkgs/libpqxx/template b/srcpkgs/libpqxx/template index be6c9ecc06d..44f6cee8b46 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 4bf94391f2f..c19d338b7a8 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/libreoffice/template b/srcpkgs/libreoffice/template index cadb3418e93..9b353d2f264 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -538,14 +538,6 @@ do_install() { rm -rf ${DESTDIR}/usr/lib32 } -post_install() { - case "$XBPS_TARGET_MACHINE" in - i686*) # correct desktop files - sed -i "s/libreoffice5.4/libreoffice/" ${DESTDIR}/usr/lib/libreoffice/share/xdg/*.desktop - ;; - esac -} - libreoffice-common_package() { short_desc+=" - Common files" depends="hunspell hyphen mythes openldap" diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index 474b524c6f5..a765f67177a 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,12 +1,12 @@ # Template build file for 'librsvg'. pkgname=librsvg version=2.40.20 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static $(vopt_enable gir introspection)" hostmakedepends="automake libtool pkg-config intltool python glib-devel gdk-pixbuf-devel gobject-introspection" -makedepends="libcroco-devel gtk+3-devel" +makedepends="libcroco-devel pango-devel gdk-pixbuf-devel" triggers="gtk-pixbuf-loaders" short_desc="SVG library for GNOME" maintainer="Juan RP " @@ -48,7 +48,6 @@ librsvg-devel_package() { librsvg-utils_package() { short_desc+=" - utilities" pkg_install() { - vmove usr/bin/rsvg-view-3 vmove usr/bin/rsvg-convert vmove usr/share/man/man1/rsvg-convert.1 } diff --git a/srcpkgs/libsrtp/template b/srcpkgs/libsrtp/template index 2097f9c3edc..fefe1d234ed 100644 --- a/srcpkgs/libsrtp/template +++ b/srcpkgs/libsrtp/template @@ -1,16 +1,17 @@ -# Template build file for 'libsrtp'. +# Template build file for 'libsrtp' pkgname=libsrtp -version=2.1.0 +version=2.2.0 revision=1 build_style=gnu-configure make_build_target="all shared_library" hostmakedepends="automake pkg-config" short_desc="Library implementing SRTP, the Secure Real-time Transport Protocol" maintainer="Juan RP " -license="BSD" +license="BSD-3-Clause" homepage="https://github.com/cisco/libsrtp" +#changelog="https://raw.githubusercontent.com/cisco/libsrtp/master/CHANGES" distfiles="https://github.com/cisco/libsrtp/archive/v${version}.tar.gz" -checksum=0302442ed97d34a77abf84617b657e77674bdd8e789d649f1cac0c5f0d0cf5ee +checksum=44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b post_install() { vlicense LICENSE @@ -26,7 +27,7 @@ libsrtp-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.so - vmove usr/lib/*.a + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" } } diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template index 6747fc907ef..ac2c9c71ade 100644 --- a/srcpkgs/libu2f-host/template +++ b/srcpkgs/libu2f-host/template @@ -1,18 +1,19 @@ # Template file for 'libu2f-host' pkgname=libu2f-host -version=1.1.5 -revision=3 +version=1.1.6 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d" -hostmakedepends="automake libtool pkg-config gengetopt" -makedepends="json-c-devel hidapi-devel libressl-devel" +hostmakedepends="automake gengetopt libtool pkg-config" +makedepends="hidapi-devel json-c-devel libressl-devel" short_desc="C library and tool that implements the host-side of the U2F protocol" maintainer="Juan RP " license="LGPL-2.1-or-later, GPL-3-or-later" homepage="https://developers.yubico.com/libu2f-host/" +#changelog="https://raw.githubusercontent.com/Yubico/libu2f-host/master/NEWS" distfiles="https://github.com/Yubico/libu2f-host/archive/libu2f-host-${version}.tar.gz" -checksum=9d4a84acc50306264fd419015fac41b943a53a16e2feeb0db078aa1bde7f6747 +checksum=45beabd3ba5a08643f3aea4642ea4c68f34f0ad701878f3ad447c5b3c13ecb21 pre_configure() { autoreconf -fi @@ -27,8 +28,8 @@ libu2f-host-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/libunistring/template b/srcpkgs/libunistring/template index ff8558896ae..226b96a0de3 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 770cb26d26a..a676cf77936 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 75bd1d2381b..d669e37bc03 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 d9dc5bd0c7b..9752350c662 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 7d20004a575..5c381e6e459 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 c712ed20002..1ea99c6ff5b 100644 --- a/srcpkgs/linux4.16/template +++ b/srcpkgs/linux4.16/template @@ -1,15 +1,15 @@ # Template file for 'linux4.16' pkgname=linux4.16 -version=4.16.7 +version=4.16.12 revision=1 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " homepage="https://www.kernel.org" -license="GPL-2" +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=d87abef6c5666329194a0005fa8331c0cc03b65383f195442dee8f5558af0139 +checksum=567078358d5a3490d1410696f36f36f5e88f98bef9f4d3c0d68c605aeb71111d nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 05962968d73..fe8bdd3bb2b 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 89f475c7124..209eaf914bc 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/lsscsi/template b/srcpkgs/lsscsi/template new file mode 100644 index 00000000000..4e4d13e49fc --- /dev/null +++ b/srcpkgs/lsscsi/template @@ -0,0 +1,11 @@ +# Template file for 'lsscsi' +pkgname=lsscsi +version=0.29 +revision=1 +build_style=gnu-configure +short_desc="Lists information about SCSI devices in Linux" +maintainer="cr6git " +license="GPL-2.0-or-later" +homepage="http://sg.danny.cz/scsi/lsscsi.html" +distfiles="http://sg.danny.cz/scsi/lsscsi-${version}.tgz" +checksum=b66c681a47a08fd3e563525a4d69f17e3825a29f54fb5f8ff503f8d99f746814 diff --git a/srcpkgs/lua-stdlib-debug/template b/srcpkgs/lua-stdlib-debug/template new file mode 100644 index 00000000000..793b003100b --- /dev/null +++ b/srcpkgs/lua-stdlib-debug/template @@ -0,0 +1,48 @@ +# Template file for 'lua-stdlib-debug' +pkgname=lua-stdlib-debug +version=1.0 +revision=1 +wrksrc=_debug-${version} +noarch=yes +depends="lua" +short_desc="A debug hints management library for Lua (Lua 5.3)" +maintainer="Daniel Santana " +license="MIT" +homepage="https://lua-stdlib.github.io/_debug/" +distfiles="https://github.com/lua-stdlib/_debug/archive/v${version}.tar.gz" +checksum=40697e8b0177647f828fb86627449b40c6df2685e82fa99e9dc772201758841d + +do_install() { + for _lua_version in 5.1 5.2 5.3; do + vmkdir usr/share/lua/$_lua_version/ + vcopy lib/std usr/share/lua/$_lua_version/ + done + vdoc NEWS.md + vdoc README.md + vdoc AUTHORS.md + vlicense LICENSE.md +} + +lua51-stdlib-debug_package() { + depends="lua51" + short_desc="${short_desc/5.3/5.1}" + pkg_install() { + vmove usr/share/lua/5.1 + vdoc NEWS.md + vdoc README.md + vdoc AUTHORS.md + vlicense LICENSE.md + } +} + +lua52-stdlib-debug_package() { + depends="lua52" + short_desc="${short_desc/5.3/5.2}" + pkg_install() { + vmove usr/share/lua/5.2 + vdoc NEWS.md + vdoc README.md + vdoc AUTHORS.md + vlicense LICENSE.md + } +} diff --git a/srcpkgs/lua-stdlib-normalize/template b/srcpkgs/lua-stdlib-normalize/template new file mode 100644 index 00000000000..a23801d9136 --- /dev/null +++ b/srcpkgs/lua-stdlib-normalize/template @@ -0,0 +1,48 @@ +# Template file for 'lua-stdlib-normalize' +pkgname=lua-stdlib-normalize +version=2.0.2 +revision=1 +wrksrc=normalize-${version} +noarch=yes +depends="lua lua-stdlib-debug" +short_desc="Collection of normalized Lua functions (Lua 5.3)" +maintainer="Daniel Santana " +license="MIT" +homepage="https://lua-stdlib.github.io/normalize/" +distfiles="https://github.com/lua-stdlib/normalize/archive/v${version}.tar.gz" +checksum=7ca9bc7812a0581f421f29dcb996011575849e4acda3d1683aa27fe4ff8c2687 + +do_install() { + for _lua_version in 5.1 5.2 5.3; do + vmkdir usr/share/lua/$_lua_version/ + vcopy lib/std usr/share/lua/$_lua_version/ + done + vdoc NEWS.md + vdoc README.md + vdoc AUTHORS.md + vlicense LICENSE.md +} + +lua51-stdlib-normalize_package() { + depends="lua51 lua51-stdlib-debug" + short_desc="${short_desc/5.3/5.1}" + pkg_install() { + vmove usr/share/lua/5.1 + vdoc NEWS.md + vdoc README.md + vdoc AUTHORS.md + vlicense LICENSE.md + } +} + +lua52-stdlib-normalize_package() { + depends="lua52 lua52-stdlib-debug" + short_desc="${short_desc/5.3/5.2}" + pkg_install() { + vmove usr/share/lua/5.2 + vdoc NEWS.md + vdoc README.md + vdoc AUTHORS.md + vlicense LICENSE.md + } +} diff --git a/srcpkgs/lua51-stdlib-debug b/srcpkgs/lua51-stdlib-debug new file mode 120000 index 00000000000..69cde51cc4a --- /dev/null +++ b/srcpkgs/lua51-stdlib-debug @@ -0,0 +1 @@ +lua-stdlib-debug \ No newline at end of file diff --git a/srcpkgs/lua51-stdlib-normalize b/srcpkgs/lua51-stdlib-normalize new file mode 120000 index 00000000000..b377e6adb0b --- /dev/null +++ b/srcpkgs/lua51-stdlib-normalize @@ -0,0 +1 @@ +lua-stdlib-normalize \ No newline at end of file diff --git a/srcpkgs/lua52-stdlib-debug b/srcpkgs/lua52-stdlib-debug new file mode 120000 index 00000000000..69cde51cc4a --- /dev/null +++ b/srcpkgs/lua52-stdlib-debug @@ -0,0 +1 @@ +lua-stdlib-debug \ No newline at end of file diff --git a/srcpkgs/lua52-stdlib-normalize b/srcpkgs/lua52-stdlib-normalize new file mode 120000 index 00000000000..b377e6adb0b --- /dev/null +++ b/srcpkgs/lua52-stdlib-normalize @@ -0,0 +1 @@ +lua-stdlib-normalize \ No newline at end of file diff --git a/srcpkgs/luaposix/template b/srcpkgs/luaposix/template index beddbef1cbd..45880480b41 100644 --- a/srcpkgs/luaposix/template +++ b/srcpkgs/luaposix/template @@ -1,12 +1,12 @@ # Template file for 'luaposix' pkgname=luaposix version=34.0.4 -revision=1 +revision=2 lib32disabled=yes wrksrc="luaposix-release-v${version}" hostmakedepends="lua51-devel lua52-devel lua-devel" makedepends="lua51-devel lua52-devel lua-devel" -depends="lua" +depends="lua lua-stdlib-normalize" short_desc="A POSIX library for Lua programming language" maintainer="Juan RP " license="MIT" @@ -47,8 +47,8 @@ post_install() { } luaposix51_package() { - depends="lua51 lua51-bitlib" - short_desc="${_desc} - Lua 5.1" + depends="lua51 lua51-stdlib-normalize lua51-bitlib" + short_desc="${short_desc} - Lua 5.1" pkg_install() { vlicense "${wrksrc}/lua5.1/LICENSE" vmove usr/lib/lua/5.1 @@ -59,8 +59,8 @@ luaposix51_package() { } luaposix52_package() { - short_desc="${_desc} - Lua 5.2" - depends="lua52" + short_desc="${short_desc} - Lua 5.2" + depends="lua52 lua52-stdlib-normalize" pkg_install() { vlicense "${wrksrc}/lua5.2/LICENSE" vmove usr/lib/lua/5.2 diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 73a8f487225..2a395bafbd1 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/template b/srcpkgs/lxd/template index 684f7778861..656004593a5 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -1,23 +1,23 @@ # Template file for 'lxd' pkgname=lxd -version=2.21 -revision=5 +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=649540bc9581ac07ebe88aa999284a33a7d9444dbf679f880c0eac4c087c1fad +checksum=bcfe2661d97af0dcc0ac5de8407b6e24de8615e6b7881bd4bf8e9c59fefc673f system_groups="lxd" post_install() { - vinstall config/bash/lxd-client 644 /usr/share/bash-completion/completions lxd + vinstall scripts/bash/lxd-client 644 /usr/share/bash-completion/completions lxd vlicense COPYING LICENSE vsv lxd } diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template index 47d3bff7665..e8c5e2cf5e0 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 b0fc8a69eed..e4eef5b30a3 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/mediainfo/template b/srcpkgs/mediainfo/template index 2da4d1ade32..f4aa7024ed6 100644 --- a/srcpkgs/mediainfo/template +++ b/srcpkgs/mediainfo/template @@ -1,17 +1,17 @@ # Template file for 'mediainfo' pkgname=mediainfo -version=18.03.1 +version=18.05 revision=1 wrksrc="MediaInfo" hostmakedepends="automake libtool pkg-config" makedepends="libmediainfo-devel zlib-devel $(vopt_if GUI wxWidgets-devel)" depends="$(vopt_if GUI 'desktop-file-utils hicolor-icon-theme')" short_desc="Display technical and tag data for video and audio files" -homepage="https://mediaarea.net/MediaInfo" maintainer="Georg Schabel " -license="BSD" +license="BSD-2-Clause" +homepage="https://mediaarea.net/MediaInfo" distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.xz" -checksum=79664c356d4f09dc32105810aacf60923f6edcc6bec4836589962bc3375efcd6 +checksum=d94093aaf910759f302fb6b5ac23540a217eb940cfbb21834de2381de975fa65 replaces="mediainfo-gui>=0" build_options="CLI GUI" diff --git a/srcpkgs/mednafen/template b/srcpkgs/mednafen/template index 300514d4ba9..9f8a67d0529 100644 --- a/srcpkgs/mednafen/template +++ b/srcpkgs/mednafen/template @@ -1,6 +1,6 @@ # Template file for 'mednafen' pkgname=mednafen -version=1.21.1 +version=1.21.3 revision=1 wrksrc="$pkgname" build_style=gnu-configure @@ -10,9 +10,9 @@ makedepends="libcdio-devel libsndfile-devel glu-devel SDL2-devel zlib-devel" short_desc="Portable, argument(command-line)-driven multi-system emulator" maintainer="Juan RP " license="GPL-2.0-or-later" -homepage="http://mednafen.sourceforge.net/" +homepage="https://mednafen.github.io/" distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz" -checksum=848136e4b98d5a949d7691f6596564b20d5720e7d766e93deedc7832bbee2a40 +checksum=2e761e8834b098b7f1ab35dccaa6d2be715ee9106cf40af4919f6ca4b99ee3c6 CFLAGS="-D_FILE_OFFSET_BITS=64" CXXFLAGS="$CFLAGS" diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template index b0d76067dfe..d01e14c5610 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/mercurial/template b/srcpkgs/mercurial/template index f9d71b91767..f50e6c34aa2 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -1,18 +1,18 @@ # Template file for 'mercurial' pkgname=mercurial -version=4.5.2 +version=4.6 revision=1 build_style=python2-module hostmakedepends="python-devel" makedepends="python-devel" depends="ca-certificates" -pycompile_module="mercurial hgext hgext3rd" +pycompile_module="hgdemandimport hgext hgext3rd mercurial" short_desc="Fast, lightweight source control management system" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://www.mercurial-scm.org/" distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz" -checksum=a44a9ffd1c9502a4f97298a6bbcb8a79fc8192424c760c67f17b45c12114e390 +checksum=56ae3b10201adae37ad97fbd759cf3cea4ebe64c57641c059978c7a706ee6b49 post_install() { vmkdir usr/share/man/man1 diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index c887afb88d3..c0117085633 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.46.0 +version=0.46.1 revision=1 noarch=yes build_style=python3-module @@ -8,13 +8,13 @@ pycompile_module="mesonbuild" hostmakedepends="python3-devel" depends="ninja python3" checkdepends="glib-devel gobject-introspection libsanitizer-devel ninja - pkg-config vala" + pkg-config vala python-devel" short_desc="Super fast build system" -license="Apache-2.0" maintainer="Dylan Katz " +license="Apache-2.0" homepage="http://mesonbuild.com" distfiles="https://github.com/mesonbuild/meson/archive/${version}.tar.gz" -checksum=24c6098891fbaab70f43ae9e51e0ab99e003c14fea70104f3f71bb2fb49a3e71 +checksum=2d917692d2cc194e12295f00469fbdf3c045e85d0295e5e59ced69115920ffa0 do_check() { # meson depends on trillion of things to perform actual tests diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template index 3c1d08bcfde..5d4d7f68f3e 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/mgba/template b/srcpkgs/mgba/template index 2c422133a77..976b5d0b363 100644 --- a/srcpkgs/mgba/template +++ b/srcpkgs/mgba/template @@ -1,7 +1,7 @@ # Template file for 'mgba' pkgname=mgba version=0.6.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="SDL2-devel ffmpeg-devel libedit-devel libepoxy-devel libmagick-devel diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template index 1de04e2d9f4..c72695f74dc 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 098d2b17353..9528f75c575 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/mksh/template b/srcpkgs/mksh/template index dfb13fa92ba..7570cc0057d 100644 --- a/srcpkgs/mksh/template +++ b/srcpkgs/mksh/template @@ -3,11 +3,12 @@ pkgname=mksh version=R56c revision=1 wrksrc=mksh +checkdepends="perl ed" register_shell="/bin/mksh" short_desc="The MirBSD Korn Shell" maintainer='Andrea Brancaleoni ' -homepage="https://www.mirbsd.org/mksh.htm" license="MirOS" +homepage="https://www.mirbsd.org/mksh.htm" distfiles="https://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-${version}.tgz" checksum=dd86ebc421215a7b44095dc13b056921ba81e61b9f6f4cdab08ca135d02afb77 @@ -28,6 +29,10 @@ do_build() { sh ./Build.sh -r -c lto } +do_check() { + ./test.sh +} + do_install() { vbin mksh vman mksh.1 diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 11ef7909f3d..199814bc650 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,7 +1,7 @@ # Template file for 'monero-gui' pkgname=monero-gui version=0.12.0.0 -revision=3 +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 @@ -44,7 +44,6 @@ do_install() { monero-core_package() { build_style=meta - noarch=yes - depends="monero-gui>=$version" - short_desc+=" - transitional dummy package" + depends="monero-gui>=${version}_${revision}" + short_desc+=" (transitional dummy package)" } diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch new file mode 100644 index 00000000000..1e93d5b1bc0 --- /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 75c457da52d..41efa71065b 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 53b36df27a1..68630ee5860 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 18b3821fa75..64e11488f1d 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 d7b7dc9eecd..da6266ce496 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/mpfr/template b/srcpkgs/mpfr/template index 21363fbeb86..501272b96fc 100644 --- a/srcpkgs/mpfr/template +++ b/srcpkgs/mpfr/template @@ -1,18 +1,17 @@ # Template build file for 'mpfr' pkgname=mpfr -version=4.0.0 -revision=2 +version=4.0.1 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="--enable-thread-safe" makedepends="gmp-devel" short_desc="Library for multiple-precision floating-point computations" maintainer="Juan RP " -license="LGPL-3" +license="LGPL-3.0-or-later" homepage="http://www.mpfr.org" distfiles="http://www.mpfr.org/mpfr-${version}/mpfr-${version}.tar.xz" -checksum=fbe2cd1418b321f5c899ce4f0f0f4e73f5ecc7d02145b0e1fd096f5c3afb8a1d - +checksum=67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e mpfr-devel_package() { depends="${makedepends} mpfr>=${version}_${revision}" diff --git a/srcpkgs/mpfr/update b/srcpkgs/mpfr/update new file mode 100644 index 00000000000..a899a5fdc8a --- /dev/null +++ b/srcpkgs/mpfr/update @@ -0,0 +1 @@ +site="http://www.mpfr.org/mpfr-current/" diff --git a/srcpkgs/msgpack/template b/srcpkgs/msgpack/template index 60f1549c591..2d46a14c3bd 100644 --- a/srcpkgs/msgpack/template +++ b/srcpkgs/msgpack/template @@ -1,24 +1,26 @@ # Template file for 'msgpack' pkgname=msgpack -version=2.1.5 +version=3.0.1 revision=1 wrksrc="msgpack-${version}" build_style=cmake makedepends="zlib-devel" +checkdepends="gtest-devel" short_desc="Binary-based efficient object serialization library" -maintainer="Juan RP " +maintainer="maxice8 " license="Apache-2.0" -homepage="http://msgpack.org/" -distfiles="https://github.com/$pkgname/$pkgname-c/releases/download/cpp-$version/$pkgname-$version.tar.gz" -checksum=6126375af9b204611b9d9f154929f4f747e4599e6ae8443b337915dcf2899d2b +homepage="https://msgpack.org/" +#changelog="https://raw.githubusercontent.com/msgpack/msgpack-c/master/CHANGELOG.md" +distfiles="https://github.com/msgpack/msgpack-c/releases/download/cpp-${version}/msgpack-${version}.tar.gz" +checksum=9859d44d336f9b023a79a3026bb6a558b2ea346107ab4eadba58236048650690 msgpack-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/cmake vmove usr/lib/pkgconfig } diff --git a/srcpkgs/mt-st/template b/srcpkgs/mt-st/template index e812f0808d8..09152f711cb 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/multimon-ng/template b/srcpkgs/multimon-ng/template index 3e3dede92eb..106691244fe 100644 --- a/srcpkgs/multimon-ng/template +++ b/srcpkgs/multimon-ng/template @@ -1,16 +1,16 @@ # Template file for 'multimon-ng' pkgname=multimon-ng -version=1.1.4 +version=1.1.5 revision=1 build_style=cmake configure_args="$(vopt_if x11 '' -DX11_SUPPORT=0)" makedepends="$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if x11 libX11-devel)" short_desc="Digital transmission decoder" maintainer="bra1nwave " -license="GPL-2-or-later" +license="GPL-2.0-or-later" homepage="https://github.com/EliasOenal/multimon-ng" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=4faca3ad316d4a7bf238599b43488286dc1cd0cf4814a279e06d3e34ae2729c6 +checksum=8c155995cc660614e6262b92df109c7581b8f92f219a0df53597b101861d3b5f build_options="pulseaudio x11" build_options_default="pulseaudio x11" diff --git a/srcpkgs/mypaint-brushes/patches/autogen.patch b/srcpkgs/mypaint-brushes/patches/autogen.patch new file mode 100644 index 00000000000..2a9b0430c31 --- /dev/null +++ b/srcpkgs/mypaint-brushes/patches/autogen.patch @@ -0,0 +1,11 @@ ++++ autogen.sh +@@ -90,6 +90,9 @@ + echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " + if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=$AUTOMAKE ++elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then ++ AUTOMAKE=automake-1.16 ++ ACLOCAL=aclocal-1.16 + elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-1.15 + ACLOCAL=aclocal-1.15 diff --git a/srcpkgs/mypaint-brushes/template b/srcpkgs/mypaint-brushes/template new file mode 100644 index 00000000000..dc15c2d06d4 --- /dev/null +++ b/srcpkgs/mypaint-brushes/template @@ -0,0 +1,21 @@ +# Template file for 'mypaint-brushes' +pkgname=mypaint-brushes +version=1.3.0 +revision=1 +build_style=gnu-configure +hostmakedepends="automake" +makedepends="libmypaint-devel" +short_desc="Brushes used by MyPaint and other software using libmypaint" +maintainer="Kartik Singh " +license="CC0-1.0, GPL-2.0-or-later, GPL-3.0-on-later" +homepage="https://github.com/Jehan/mypaint-brushes" +distfiles="https://github.com/Jehan/mypaint-brushes/archive/v${version}.tar.gz" +checksum=704bb6420e65085acfd7a61d6050e96b0395c5eab078433f11406c355f16b214 + +pre_configure() { + ./autogen.sh +} + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/myrddin/template b/srcpkgs/myrddin/template index 4bfad62274e..76e99872e22 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/nano/template b/srcpkgs/nano/template index edd24f48ce5..0aebeb132e7 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -1,6 +1,6 @@ # Template file for 'nano' pkgname=nano -version=2.9.6 +version=2.9.7 revision=1 build_style=gnu-configure makedepends="file-devel ncurses-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://www.nano-editor.org/" distfiles="https://www.nano-editor.org/dist/v${version%.*}/nano-$version.tar.xz" -checksum=a373507ebb4e9307a8202fbc19b5d29718025c8ec773669349211c362545d4c6 +checksum=b64ab017305b1777e97b5b9b07b31db8aeebfc3e8719f61e8da1cf3866d344bd case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-DREG_STARTEND=0";; @@ -18,3 +18,4 @@ esac post_install() { vsconf syntax/nanorc.nanorc } + diff --git a/srcpkgs/nanomsg/template b/srcpkgs/nanomsg/template index 38b0abdf4dc..62668d26f6d 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 00000000000..b5c24d59f24 --- /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 a2e00145cfc..0ee61a7093d 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 efea84a0707..15543bd8cea 100644 --- a/srcpkgs/neofetch/template +++ b/srcpkgs/neofetch/template @@ -1,6 +1,6 @@ # Template file for 'neofetch' pkgname=neofetch -version=3.4.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=2b03328e92f80de8aca9571ad693f4e8b86b62e9c99792f3002f82907c5530a3 +checksum=3cd4db97d732dd91424b357166d38edccec236c21612b392318b48a3ffa29004 post_install() { vlicense LICENSE.md diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index c30111fc917..6b4dd1884f1 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 adfe6df2df2..23fe0cf8a08 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 8f8ff93f777..41bafc5a67e 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/node_exporter/template b/srcpkgs/node_exporter/template index 489c9dd3667..69178cf858c 100644 --- a/srcpkgs/node_exporter/template +++ b/srcpkgs/node_exporter/template @@ -1,7 +1,7 @@ # Template file for 'node_exporter' pkgname=node_exporter -version=0.15.2 -revision=6 +version=0.16.0 +revision=1 build_style=go go_import_path="github.com/prometheus/node_exporter" go_ldflags="-X ${go_import_path}/version.Version=${version} @@ -12,8 +12,9 @@ short_desc="Exporter for machine metrics" maintainer="Toyam Cox " license="Apache-2.0" homepage="https://prometheus.io/" +#changelog="https://raw.githubusercontent.com/prometheus/node_exporter/master/CHANGELOG.md" distfiles="https://github.com/prometheus/node_exporter/archive/v${version}.tar.gz" -checksum=940b850376f94580e88b5e99926d92899975d5792d05709cbd9c48dab0a848ad +checksum=2ed1c1c199e047b1524b49a6662d5969936e81520d6613b8b68cc3effda450cf system_accounts="_node_exporter" diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index 23d49f8d67a..ae58655c7d2 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/nyx/template b/srcpkgs/nyx/template index fb20cdb22df..a1c80bc7fff 100644 --- a/srcpkgs/nyx/template +++ b/srcpkgs/nyx/template @@ -1,12 +1,12 @@ # Template file for 'nyx' pkgname=nyx version=2.0.4 -revision=1 +revision=2 noarch=yes build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-stem" -depends="python3-stem tor" +depends="python3-stem tor python3-setuptools" pycompile_module="nyx" short_desc="Command-line status monitor for tor" maintainer="Jürgen Buchmüller " diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template index 13c1db44b72..6a0287ccc37 100644 --- a/srcpkgs/openrazer-meta/template +++ b/srcpkgs/openrazer-meta/template @@ -1,7 +1,7 @@ # Template file for 'openrazer-meta' pkgname=openrazer-meta version=2.3.0 -revision=1 +revision=2 wrksrc=openrazer-${version} build_style=gnu-makefile make_install_target="setup_dkms udev_install daemon_install xdg_install python_library_install" @@ -21,7 +21,7 @@ do_build() { openrazer-daemon_package() { short_desc="Userspace daemon that abstracts access to the kernel driver" depends="openrazer-driver-dkms python3-daemonize python3-pyudev - python3-setproctitle python3-six" + python3-setproctitle" pkg_install() { vmove etc/xdg/autostart vmove usr/bin diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template index aab4574394d..2c56d8c4765 100644 --- a/srcpkgs/opensc/template +++ b/srcpkgs/opensc/template @@ -1,20 +1,20 @@ # Template file for 'opensc' pkgname=opensc -version=0.17.0 -revision=3 +version=0.18.0 +revision=1 +wrksrc="OpenSC-${version}" build_style=gnu-configure configure_args="--enable-man --enable-sm --enable-static=no --enable-doc --with-xsl-stylesheetsdir=/usr/share/xsl/docbook" -hostmakedepends="automake libtool pkg-config docbook-xsl libxslt" -makedepends="readline-devel pcsclite-devel libressl-devel zlib-devel" -conf_files="/etc/opensc.conf" -maintainer="Juan RP " -homepage="https://github.com/OpenSC/OpenSC/wiki" -license="LGPL-2.1" +hostmakedepends="automake docbook-xsl libtool libxslt pkg-config" +makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel" short_desc="Tools and libraries for smart cards" +maintainer="Juan RP " +license="LGPL-2.1-or-later" +homepage="https://github.com/OpenSC/OpenSC/wiki" distfiles="https://github.com/OpenSC/OpenSC/archive/${version}.tar.gz" -checksum=007c4622afc225b8d7a1bea54f5325affa4417f4e17aaa03256aa9f4c25782fd -wrksrc="OpenSC-$version" +checksum=6ef62b00e8fdbe3e386c3ee25c2cadb56c1931ea42f1a11dce8c947f51b45033 +conf_files="/etc/opensc.conf" pre_configure() { autoreconf -fi @@ -23,11 +23,12 @@ pre_configure() { opensc-pkcs11_package() { short_desc+=" - pkcs11 library" pkg_install() { - vmove "usr/lib/pkcs11" + vmove usr/lib/pkcs11 vmove "usr/lib/opensc-pkcs11*" - vmove "usr/lib/pkcs11-spy.so" + vmove usr/lib/pkcs11-spy.so } } + libopensc_package() { short_desc+=" - library files" depends="libpcsclite" # dlopen() diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 69887a0379b..257651a22a2 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,7 +1,7 @@ # Template file for 'opera' pkgname=opera -version=52.0.2871.99 -revision=2 +version=53.0.2907.68 +revision=1 only_for_archs="x86_64" repository="nonfree" nostrip=yes @@ -10,8 +10,8 @@ short_desc="Fast, secure, easy to use browser" maintainer="Diogo Leal " license="Proprietary" homepage="https://www.opera.com/computer" -distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" -checksum=cafd22dffed17245258c1d2c7c9fe0383f67666d3c75dc8b4b5435e63c29bda8 +distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" +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 cabec0130ec..818f264a913 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 28ad768a389..0bababc6b28 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/pam-u2f/template b/srcpkgs/pam-u2f/template index 651bbf5923d..43ffe2a5380 100644 --- a/srcpkgs/pam-u2f/template +++ b/srcpkgs/pam-u2f/template @@ -1,6 +1,6 @@ # Template file for 'pam-u2f' pkgname=pam-u2f -version=1.0.6 +version=1.0.7 revision=1 wrksrc="${pkgname/-/_}-${version}" build_style=gnu-configure @@ -11,8 +11,9 @@ short_desc="Pluggable Authentication Module (PAM) for U2F" maintainer="Matthew Wynn " license="BSD-2-Clause" homepage="https://developers.yubico.com/pam-u2f/" +#changelog="https://raw.githubusercontent.com/Yubico/pam-u2f/master/NEWS" distfiles="https://developers.yubico.com/pam-u2f/Releases/pam_u2f-${version}.tar.gz" -checksum=101409455aa3257c8bb0968508a90f7ae58166e8ccb1d097e5fe9b541259ed3a +checksum=034aad8e29b159443dd6c1b7740006addc83d0659304fc4b0b4fb592f768e7cf post_install() { vlicense COPYING diff --git a/srcpkgs/pan/template b/srcpkgs/pan/template index 7c2bb9f7889..694644dede7 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 96704a3fcdd..6fed31e373d 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 efd7d088677..e5227ba1b7a 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 0c805d9fdf6..9a1c3a41840 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 f7ef226c353..5e4449b5e15 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 d73fb28b884..6b173190561 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 df781105784..b67f97be7a5 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 c48bb02fc8f..90d4cd0eae8 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 4f9c8367129..b4f7c5e3a41 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 8d9e4a5d72f..02d36c3de02 100644 --- a/srcpkgs/perl-Mojolicious/template +++ b/srcpkgs/perl-Mojolicious/template @@ -1,7 +1,8 @@ # Template file for 'perl-Mojolicious' pkgname=perl-Mojolicious -version=7.79 +version=7.82 revision=1 +noarch=yes wrksrc="${pkgname//perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -11,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=cd8bc365700d48ffa90cc33d446b0e54283360bafd7c95546cc899b28f0528f0 +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 00000000000..819f21285ac --- /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-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template index aaa8a300b53..533b9423e1b 100644 --- a/srcpkgs/perl-Net-HTTP/template +++ b/srcpkgs/perl-Net-HTTP/template @@ -1,16 +1,16 @@ # Template build file for 'perl-Net-HTTP'. pkgname=perl-Net-HTTP -version=6.17 +version=6.18 revision=1 +noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" makedepends="${hostmakedepends} perl-URI" depends="${makedepends}" -noarch=yes short_desc="Net::HTTP - Low-level HTTP connection (client)" maintainer="Juan RP " +license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="http://search.cpan.org/dist/Net-HTTP" -license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Net/Net-HTTP-${version}.tar.gz" -checksum=1e8624b1618dc6f7f605f5545643ebb9b833930f4d7485d4124aa2f2f26d1611 +checksum=7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c diff --git a/srcpkgs/perl-Test-MockModule/template b/srcpkgs/perl-Test-MockModule/template index da9b535cf5e..476f90279ca 100644 --- a/srcpkgs/perl-Test-MockModule/template +++ b/srcpkgs/perl-Test-MockModule/template @@ -1,16 +1,17 @@ # Template file for 'perl-Test-MockModule' pkgname=perl-Test-MockModule -version=0.13 +version=0.15 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-ModuleBuild hostmakedepends="perl perl-Module-Build" -checkdepends="perl-Test-Pod perl-Test-Pod-Coverage" makedepends="perl perl-SUPER" depends="${makedepends}" +checkdepends="perl-Test-Pod perl-Test-Pod-Coverage perl-Test-Warnings" short_desc="Test::MockModule - Override subroutines in a module for unit testing" maintainer="maxice8 " -license="Artistic, GPL-1" +license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="http://search.cpan.org/dist/Test-MockModule" +#changelog="http://cpansearch.perl.org/src/GFRANKS/Test-MockModule-${version}/Changes" distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz" -checksum=7473742a0d600eb11766752c79a966570755168105ee4d4e33d90466b7339053 +checksum=1697fedc6c9fedb19351d8e9abb5f9732c192004a21862f84e9cbdedcfb7a35b diff --git a/srcpkgs/perl-YAML-LibYAML/template b/srcpkgs/perl-YAML-LibYAML/template new file mode 100644 index 00000000000..1b2c3f2e9d5 --- /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/perl-YAML/template b/srcpkgs/perl-YAML/template index 64c06ffb239..592c83f7915 100644 --- a/srcpkgs/perl-YAML/template +++ b/srcpkgs/perl-YAML/template @@ -1,6 +1,6 @@ # Template file for 'perl-YAML' pkgname=perl-YAML -version=1.25 +version=1.26 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -14,4 +14,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="http://search.cpan.org/dist/YAML" distfiles="${CPAN_SITE}/YAML/YAML-${version}.tar.gz" -checksum=be05ffd948eee71d5f7e02151eeddcfd39d90c799885c1ca8b048b1a6b5c819a +checksum=fa2f99d54c4afbc5af9da6322609d2b697d0200b6bce6fdf644aff4242957fbc diff --git a/srcpkgs/phorward/template b/srcpkgs/phorward/template index e36745f08a5..f6c4bd6ca4d 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/php-imagick/template b/srcpkgs/php-imagick/template index 5bf18c34d3e..e63e487f8fc 100644 --- a/srcpkgs/php-imagick/template +++ b/srcpkgs/php-imagick/template @@ -1,6 +1,6 @@ pkgname=php-imagick version=3.4.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="php-devel autoconf pkg-config" makedepends="php-devel pcre-devel libmagick-devel" diff --git a/srcpkgs/plymouth/files/71-plymouth-seat.rules b/srcpkgs/plymouth/files/71-plymouth-seat.rules new file mode 100644 index 00000000000..a49d446f3de --- /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 cf334245dcf..8071db942de 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/postfix/template b/srcpkgs/postfix/template index 114ae67d39a..3be7553161c 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,22 +1,16 @@ # Template file for 'postfix' pkgname=postfix -version=3.3.0 -revision=3 +version=3.3.1 +revision=1 +hostmakedepends="perl" +makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel + postgresql-libs-devel sqlite-devel" short_desc="High-performance mail transport agent" maintainer="Juan RP " license="IPL-1.0, EPL-2.0" homepage="http://www.postfix.org/" -distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$version.tar.gz" -checksum=7942e89721e30118d7050675b0d976955e3160e21f7898b85a79cac4f4baef39 - -hostmakedepends="perl" -makedepends="icu-devel libressl-devel db-devel pcre-devel libsasl-devel - libldap-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel" - -if [ "$CROSS_BUILD" ]; then - # XXX postfix-install needs native binaries. - hostmakedepends+=" ${pkgname}" -fi +distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz" +checksum=54f514dae42b5275cb4bc9c69283f16c06200b71813d0bb696568c4ba7ae7e3b system_accounts="postfix" postfix_homedir="/var/spool/postfix" @@ -52,6 +46,11 @@ make_dirs=" /var/spool/postfix/saved 0700 postfix root /var/spool/postfix/trace 0700 postfix root" +if [ "$CROSS_BUILD" ]; then + # XXX postfix-install needs native binaries. + hostmakedepends+=" $pkgname" +fi + do_build() { sed -e "s,\(/usr/include/db.h\),${XBPS_CROSS_BASE}/\1,g" \ -e 's,^\(\s\+\)CCARGS="$CCARGS -DNO_EAI",\1CCARGS="$CCARGS $icu_cppflags"\n\1SYSLIBS="$SYSLIBS $icu_ldflags",' \ @@ -82,11 +81,13 @@ do_build() { make ${makejobs} } + pre_install() { if [ "$CROSS_BUILD" ]; then sed -e 's,bin/postconf,/usr/bin/postconf,g' -i postfix-install fi } + do_install() { sh postfix-install -non-interactive install_root=${DESTDIR} diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index 613e86ee80a..22d24be0d04 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -1,7 +1,7 @@ # Template file for 'postgresql' pkgname=postgresql -version=9.6.8 -revision=2 +version=9.6.9 +revision=1 build_style=gnu-configure make_build_target="world" configure_args="--with-openssl --with-python @@ -11,10 +11,10 @@ configure_args="--with-openssl --with-python --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs" short_desc="Sophisticated open-source Object-Relational DBMS" maintainer="Juan RP " -homepage="http://www.postgresql.org" -license="BSD" +homepage="https://www.postgresql.org" +license="PostgreSQL" distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2" -checksum=eafdb3b912e9ec34bdd28b651d00226a6253ba65036cb9a41cad2d9e82e3eb70 +checksum=b97952e3af02dc1e446f9c4188ff53021cc0eed7ed96f254ae6daf968c443e2e hostmakedepends="flex docbook docbook2x openjade" makedepends="libfl-devel readline-devel libressl-devel perl diff --git a/srcpkgs/powerstat/template b/srcpkgs/powerstat/template index 631d6bc931d..d63c4d99c16 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 4444812d261..216b8fe8102 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 00000000000..ae1709d2460 --- /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/praat/template b/srcpkgs/praat/template index 3a57c4d4f0a..627d748bdc8 100644 --- a/srcpkgs/praat/template +++ b/srcpkgs/praat/template @@ -1,15 +1,15 @@ # Template file for 'praat' pkgname=praat -version=6.0.38 +version=6.0.40 revision=1 hostmakedepends="pkg-config" -makedepends="gtk+-devel alsa-lib-devel $(vopt_if pulseaudio pulseaudio-devel)" +makedepends="alsa-lib-devel gtk+-devel $(vopt_if pulseaudio pulseaudio-devel)" short_desc="Speech analysis, synthesis, and manipulation" maintainer="newbluemoon " license="GPL-2.0-or-later" homepage="http://www.praat.org/" -distfiles="https://github.com/praat/${pkgname}/archive/v${version}.tar.gz" -checksum=0cc2cf1fe044813c0718d3e727c220fc325372f3aaa297bdadc64dd060ab01d0 +distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz" +checksum=3de075d095b572a01afb83b03469c19f06e38cbc47ad5d8c88b1e35472ce1899 build_options="pulseaudio" diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index ea929588588..336ed958207 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -1,6 +1,6 @@ # Template file for 'procps-ng' pkgname=procps-ng -version=3.3.14 +version=3.3.15 revision=1 build_style=gnu-configure configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/bin @@ -8,12 +8,14 @@ configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/bin --disable-modern-top --without-systemd" hostmakedepends="automake gettext-devel libtool pkg-config" makedepends="ncurses-devel" +checkdepends="dejagnu" short_desc="Utilities for monitoring your system and its processes" maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.com/procps-ng/procps" +#changelog="https://gitlab.com/procps-ng/procps/raw/master/NEWS" distfiles="${SOURCEFORGE_SITE}/${pkgname}/Production/${pkgname}-${version}.tar.xz" -checksum=5eda0253999b7d786e690edfa73301b3113c7a67058478866e98e9ff6736726c +checksum=10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465 conf_files="/etc/sysctl.conf" diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template index 424a26b088e..a560f4b895b 100644 --- a/srcpkgs/prosody/template +++ b/srcpkgs/prosody/template @@ -1,7 +1,7 @@ # Template file for 'prosody' pkgname=prosody -version=0.10.0 -revision=4 +version=0.10.1 +revision=1 build_style=configure configure_args=" --ostype=linux @@ -27,7 +27,7 @@ maintainer="Duncaen " license="MIT" homepage="https://prosody.im/" distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz" -checksum=7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498 +checksum=995e69b3757ad36db3fcb74244e10d6fea58df1d48a20932cae155ffe6bcb5ce case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-DWITHOUT_MALLINFO" ;; diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template index 871e55897b3..3b6ccd9d992 100644 --- a/srcpkgs/psiconv/template +++ b/srcpkgs/psiconv/template @@ -1,7 +1,7 @@ # Template file for 'psiconv' pkgname=psiconv version=0.9.9 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-xhtml-docs" hostmakedepends="pkg-config libmagick-devel" diff --git a/srcpkgs/pstoedit/template b/srcpkgs/pstoedit/template index bf4644b0046..c35d37d4172 100644 --- a/srcpkgs/pstoedit/template +++ b/srcpkgs/pstoedit/template @@ -1,7 +1,7 @@ # Template file for 'pstoedit' pkgname=pstoedit version=3.71 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="ghostscript pkg-config" makedepends="libXext-devel libmagick-devel libxml2-devel" diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template index 411ecb769d0..d8969d11a0a 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 00000000000..47c62596a85 --- /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 a427b424c5a..0c571f2dbd8 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 00000000000..866772c0288 --- /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/pylint/template b/srcpkgs/pylint/template index ad6ae27fbcc..33b370222af 100644 --- a/srcpkgs/pylint/template +++ b/srcpkgs/pylint/template @@ -1,6 +1,6 @@ # Template file for 'pylint' pkgname=pylint -version=1.8.4 +version=1.9.1 revision=1 noarch=yes wrksrc="pylint-${version}" @@ -13,9 +13,9 @@ depends="python-setuptools python-astroid python-six python-isort python-mccabe short_desc="Python2 code static checker" maintainer="Alessio Sergi " homepage="http://www.pylint.org/" -license="GPL-2" +license="GPL-2.0-or-later" distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz" -checksum=34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9 +checksum=c353d8225195b37cc3aef18248b8f3fe94c5a6a95affaf885ae21a24ca31d8eb alternatives=" pylint:epylint:/usr/bin/epylint2 @@ -58,9 +58,9 @@ python3-pylint_package() { pylint:pyreverse.1:/usr/share/man/man1/pyreverse3.1 pylint:symilar.1:/usr/share/man/man1/symilar3.1" noarch=yes - short_desc="${short_desc/Python2/Python3}" - depends="python3-setuptools python3-astroid python3-six python3-isort python3-mccabe" pycompile_module="pylint" + depends="python3-setuptools python3-astroid python3-six python3-isort python3-mccabe" + short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/bin/*3 vmove usr/lib/python3* diff --git a/srcpkgs/python-Arrow/template b/srcpkgs/python-Arrow/template index 52bf214ae5e..84daba5350a 100644 --- a/srcpkgs/python-Arrow/template +++ b/srcpkgs/python-Arrow/template @@ -1,15 +1,26 @@ # Template file for 'python-Arrow' pkgname=python-Arrow -version=0.10.0 -revision=2 -noarch=y -wrksrc="arrow-$version" +version=0.12.1 +revision=1 +noarch=yes +wrksrc="arrow-${version}" build_style=python-module pycompile_module="arrow" -hostmakedepends="python python-setuptools" -short_desc="Better dates & times for Python" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-dateutil python-backports.functools_lru_cache" +short_desc="Better dates & times for Python (Python2)" maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://github.com/crsmithdev/arrow" -distfiles="$homepage/archive/$version.tar.gz" -checksum=4ed4f6c86e9d3e75a1f77af13d6f5a08f6891ab5c815b20f1f7b7c88ffcad118 +distfiles="${PYPI_SITE}/a/arrow/arrow-${version}.tar.gz" +checksum=a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd + +python3-Arrow_package() { + noarch=yes + pycompile_module="arrow" + depends="python3-dateutil" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-Cheroot/patches/fix-setup.py.patch b/srcpkgs/python-Cheroot/patches/fix-setup.py.patch new file mode 100644 index 00000000000..5625f54f721 --- /dev/null +++ b/srcpkgs/python-Cheroot/patches/fix-setup.py.patch @@ -0,0 +1,20 @@ +--- setup.py.orig ++++ setup.py +@@ -43,7 +43,7 @@ + ), + python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', + install_requires=[ +- 'backports.functools_lru_cache', ++ 'backports.functools_lru_cache;python_version<"3.4"', + 'six>=1.11.0', + 'more_itertools>=2.6', + ], +@@ -70,7 +70,7 @@ + 'codecov', + + 'pytest-cov', +- 'backports.unittest_mock', ++ 'backports.unittest_mock;python_version<"3.4"', + ], + }, + setup_requires=[ diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template index 7c386e39abe..a7507f3fd38 100644 --- a/srcpkgs/python-Cheroot/template +++ b/srcpkgs/python-Cheroot/template @@ -1,19 +1,21 @@ # Template file for 'python-Cheroot' pkgname=python-Cheroot -version=6.2.4 -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" -short_desc="High-performance, pure-Python HTTP server" +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="3-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/cherrypy/cheroot" distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz" -checksum=9997623a88400fd41706978adcfbeceee1fe0202a886228e471a58263b643fef +checksum=e83ecc6bd473c340a10adac19cc69c65607638fa3e8b37cf0b26b6fdf4db4994 +alternatives="cheroot:cheroot:/usr/bin/cheroot2" pre_build() { sed -i setup.py \ @@ -26,10 +28,12 @@ post_install() { python3-Cheroot_package() { noarch=yes - depends="python3-six" pycompile_module="cheroot" + 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 21d70722119..2acabc5575d 100644 --- a/srcpkgs/python-CherryPy/template +++ b/srcpkgs/python-CherryPy/template @@ -1,28 +1,33 @@ # Template file for 'python-CherryPy' pkgname=python-CherryPy version=15.0.0 -revision=1 +revision=2 noarch=yes wrksrc="CherryPy-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" -depends="python-six python-Cheroot" +depends="python-setuptools python-six python-Cheroot python-portend" pycompile_module="cherrypy" short_desc="Object-oriented HTTP framework (Python2)" maintainer="Andrea Brancaleoni " -license="3-clause-BSD" -homepage="http://www.cherrypy.org" +license="BSD-3-Clause" +homepage="https://cherrypy.org/" distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz" checksum=7404638da9cf8c6be672505168ccb63e16d33cb3aa16a02ec30a44641f7546af alternatives="cherrypy:cherryd:/usr/bin/cherryd2" +pre_build() { + sed -i setup.py \ + -e '/setuptools_scm/d' \ + -e "s|use_scm_version=True|version='${version}'|" +} post_install() { vlicense LICENSE.md } python3-CherryPy_package() { noarch=yes - depends="python3-six python3-Cheroot" + depends="python3-setuptools python3-six python3-Cheroot python3-portend" pycompile_module="cherrypy" short_desc="${short_desc/Python2/Python3}" alternatives="cherrypy:cherryd:/usr/bin/cherryd3" diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template index 04537c7c07c..5e2f5980d1b 100644 --- a/srcpkgs/python-Django/template +++ b/srcpkgs/python-Django/template @@ -1,6 +1,6 @@ # Template file for 'python-Django' pkgname=python-Django -version=1.11.12 +version=1.11.13 revision=1 noarch=yes wrksrc="Django-${version}" @@ -13,7 +13,7 @@ maintainer="Eivind Uggedal " license="BSD-3-Clause" homepage="https://www.djangoproject.com/" distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz" -checksum=4d398c7b02761e234bbde490aea13ea94cb539ceeb72805b72303f348682f2eb +checksum=46adfe8e0abe4d1f026c1086889970b611aec492784fbdfbdaabc2457360a4a5 alternatives="django:django-admin:/usr/bin/django-admin2" post_install() { diff --git a/srcpkgs/python-Flask-OAuthlib/template b/srcpkgs/python-Flask-OAuthlib/template index 58f0a5af6b2..9252c7dc0a3 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-Flask/template b/srcpkgs/python-Flask/template index 3ec4c4c5b67..e4f7f2623c3 100644 --- a/srcpkgs/python-Flask/template +++ b/srcpkgs/python-Flask/template @@ -1,7 +1,7 @@ # Template file for 'python-Flask' pkgname=python-Flask -version=0.12.2 -revision=2 +version=0.12.4 +revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools python-Jinja2 python-Werkzeug python-itsdangerous python-click" short_desc="Python2 web microframework" maintainer="Markus Berger " +license="BSD-3-Clause" homepage="http://flask.pocoo.org" -license="3-clause-BSD" distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz" -checksum=49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1 +checksum=2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd alternatives="flask:flask:/usr/bin/flask2" post_install() { diff --git a/srcpkgs/python-GitPython/template b/srcpkgs/python-GitPython/template index 4549625025d..5566e087750 100644 --- a/srcpkgs/python-GitPython/template +++ b/srcpkgs/python-GitPython/template @@ -1,6 +1,6 @@ # Template file for 'python-GitPython' pkgname=python-GitPython -version=2.1.9 +version=2.1.10 revision=1 noarch=yes wrksrc="GitPython-${version}" @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python-gitdb" short_desc="Library to interact with Git repositories (Python2)" maintainer="Joseph LaFreniere " -homepage="https://github.com/gitpython-developers/GitPython" license="BSD-3-Clause" +homepage="https://github.com/gitpython-developers/GitPython" distfiles="${PYPI_SITE}/G/GitPython/GitPython-${version}.tar.gz" -checksum=c47cc31af6e88979c57a33962cbc30a7c25508d74a1b3a19ec5aa7ed64b03129 +checksum=b60b045cf64a321e5b620debb49890099fa6c7be6dfb7fb249027e5d34227301 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-Markups/template b/srcpkgs/python-Markups/template index 9312829c506..d029df420f3 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 c83354267d6..5a2b8a0a5d1 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-Pyro4/template b/srcpkgs/python-Pyro4/template index 9e9a3cb18a1..7144d3490d6 100644 --- a/srcpkgs/python-Pyro4/template +++ b/srcpkgs/python-Pyro4/template @@ -1,6 +1,6 @@ # Template file for 'python-Pyro4' pkgname=python-Pyro4 -version=4.71 +version=4.72 revision=1 wrksrc="${pkgname#*-}-${version}" noarch=yes @@ -13,7 +13,7 @@ maintainer="pulux " license="MIT" homepage="https://pythonhosted.org/Pyro4/" distfiles="${PYPI_SITE}/P/Pyro4/Pyro4-${version}.tar.gz" -checksum=78b686b584c180061fe3cfc3adcad4da46b3a7f42be1f9f0d7491cd006541cf3 +checksum=2766b53db49f70b0d047fa6871aeb47484ba7e50cf53cfa37d26f87742c0b6a8 alternatives=" pyro4:pyro4-check-config:/usr/bin/pyro4-check-config2 diff --git a/srcpkgs/python-SPARQLWrapper/template b/srcpkgs/python-SPARQLWrapper/template index 1bc8afa2529..d496c77f5d8 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 cf406e63496..ac4fce9dea0 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-apsw/template b/srcpkgs/python-apsw/template index 848a45e2ccb..17d64002c74 100644 --- a/srcpkgs/python-apsw/template +++ b/srcpkgs/python-apsw/template @@ -1,6 +1,6 @@ # Template file for 'python-apsw' pkgname=python-apsw -_distver=3.22.0 +_distver=3.23.1 _patchver=r1 version=${_distver}${_patchver} revision=1 @@ -13,7 +13,7 @@ maintainer="bra1nwave " license="Zlib" homepage="https://github.com/rogerbinns/apsw" distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz" -checksum=4ac5a9a66b5dd0c11987bff0cc3bd94733e89da26b1cfa4037a36a3ba8392615 +checksum=692936799f8edfae371709fb948c446ea9e7d6fff5993bc9af6fd579c887f641 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-astroid/template b/srcpkgs/python-astroid/template index d00eddf3ca3..2d1b4d02303 100644 --- a/srcpkgs/python-astroid/template +++ b/srcpkgs/python-astroid/template @@ -1,20 +1,20 @@ # Template file for 'python-astroid' pkgname=python-astroid -version=1.6.3 +version=1.6.4 revision=1 noarch=yes wrksrc="astroid-${version}" build_style=python-module +pycompile_module="astroid" hostmakedepends="python-setuptools python3-setuptools" depends="python-six python-lazy-object-proxy python-wrapt python-backports.functools_lru_cache python-enum34 python-singledispatch" -pycompile_module="astroid" short_desc="Abstract syntax tree for Python2" maintainer="Alessio Sergi " homepage="https://github.com/PyCQA/astroid" -license="GPL-2, LGPL-2.1" +license="GPL-2.0-or-later, LGPL-2.1-or-later" distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz" -checksum=35cfae47aac19c7b407b7095410e895e836f2285ccf1220336afba744cc4c5f2 +checksum=dea42ae6e0b789b543f728ddae7ddb6740ba33a49fb52c4a4d9cb7bb4aa6ec09 post_install() { # no tests @@ -23,8 +23,8 @@ post_install() { python3-astroid_package() { noarch=yes - depends="python3-six python3-lazy-object-proxy python3-wrapt" pycompile_module="astroid" + depends="python3-six python3-lazy-object-proxy python3-wrapt" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template index eebc18ac485..8078ec86b69 100644 --- a/srcpkgs/python-attrs/template +++ b/srcpkgs/python-attrs/template @@ -1,6 +1,6 @@ # Template file for 'python-attrs' pkgname=python-attrs -version=17.4.0 +version=18.1.0 revision=1 noarch=yes wrksrc="attrs-${version}" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="MIT" homepage="https://attrs.readthedocs.io/" distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz" -checksum=1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9 +checksum=e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b post_install() { vlicense LICENSE @@ -25,7 +25,7 @@ python3-attrs_package() { pycompile_module="attr" short_desc="${short_desc/Python2/Python3}" pkg_install() { - vlicense LICENSE vmove usr/lib/python3* + vlicense LICENSE } } diff --git a/srcpkgs/python-b2/template b/srcpkgs/python-b2/template index 5728bc324e1..cb2c3a8d02f 100644 --- a/srcpkgs/python-b2/template +++ b/srcpkgs/python-b2/template @@ -1,20 +1,28 @@ +broken="Missing tqdm dependency" # Template file for 'python-b2' pkgname=python-b2 version=1.1.0 -revision=5 -noarch=y -wrksrc="B2_Command_Line_Tool-$version" -build_style=python-module -hostmakedepends="python python-setuptools" -depends="python-logfury python-futures python-Arrow python-dateutil" -short_desc="CLI that gives easy access B2 Cloud Storage" +revision=6 +noarch=yes +wrksrc="B2_Command_Line_Tool-${version}" +build_style=python2-module +pycompile_module="b2" +hostmakedepends="python-setuptools" +depends="python-setuptools python-logfury python-futures python-Arrow + python-requests python-six" +short_desc="Command Line Interface for Backblaze's B2 storage service" maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/Backblaze/B2_Command_Line_Tool" -distfiles="$homepage/archive/v$version.tar.gz" +distfiles="${homepage}/archive/v${version}.tar.gz" checksum=fae0dd48a2b6ab38cb142b91d7907a66144659d599bdfbf3c8995788ed29313b -pycompile_module="b2" post_install() { + # Remove test directory polluting site-packages + rm -rf ${DESTDIR}/usr/lib/python*/site-packages/test + + # Avoid conflict with Boost's b2 tool + mv ${DESTDIR}/usr/bin/b2 ${DESTDIR}/usr/bin/backblaze-b2 + vlicense LICENSE } diff --git a/srcpkgs/python-backcall/template b/srcpkgs/python-backcall/template new file mode 100644 index 00000000000..97f9f5fac1b --- /dev/null +++ b/srcpkgs/python-backcall/template @@ -0,0 +1,26 @@ +# Template file for 'python-backcall' +pkgname=python-backcall +version=0.1.0 +revision=1 +noarch=yes +wrksrc="backcall-${version}" +build_style=python-module +pycompile_module="backcall" +hostmakedepends="python-setuptools python3-setuptools" +depends="python" +short_desc="Python2 module to write backwards compatible callback APIs" +maintainer="Alessio Sergi " +homepage="https://github.com/takluyver/backcall" +license="BSD-3-Clause" +distfiles="${PYPI_SITE}/b/backcall/backcall-${version}.tar.gz" +checksum=38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4 + +python3-backcall_package() { + noarch=yes + depends="python3" + pycompile_module="backcall" + 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 5230e7e2f7e..8db35e5f7f3 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.0 +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=b7a53e5dc997ab1a7671a3a071c8ee78b59539fbe415e74b7404dbe1128b5213 +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 00000000000..18e9d541c1b --- /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 fb2ef64a9bf..03a427aa69f 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 fcb19b3731f..191c71922ce 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 00000000000..a7587e733ef --- /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 cc61c6fbdc9..a9b557d4205 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 939d8e18c07..00000000000 --- 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 304dfba31e7..5a370a2e2ff 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 bb8425d654b..d64d91c70e1 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 c934434cc89..b5e1191d5a8 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 80f8b901d32..20c012972d4 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 abcf2522e0c..9a7be0799cd 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 18d8099fbf4..229de61f0e6 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-ipython/template b/srcpkgs/python-ipython/template index 632e3d09440..3fb2bade62f 100644 --- a/srcpkgs/python-ipython/template +++ b/srcpkgs/python-ipython/template @@ -1,20 +1,20 @@ # Template file for 'python-ipython' pkgname=python-ipython -version=5.6.0 +version=5.7.0 revision=1 noarch=yes wrksrc="ipython-${version}" build_style=python2-module +pycompile_module="IPython" hostmakedepends="python-setuptools" depends="python-pickleshare python-simplegeneric python-traitlets python-pexpect python-prompt_toolkit python-Pygments python-backports.shutil_get_terminal_size" -pycompile_module="IPython" short_desc="Enhanced interactive Python2 shell" maintainer="Alessio Sergi " homepage="https://ipython.org/" license="BSD-3-Clause" distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz" -checksum=8ba332d1ac80261e176e737e934fade9b252fc3adb32afc7252ccc9cb249e601 +checksum=8db43a7fb7619037c98626613ff08d03dda9d5d12c84814a4504c78c0da8323c alternatives=" ipython:ipython:/usr/bin/ipython2 diff --git a/srcpkgs/python-jupyter_notebook/template b/srcpkgs/python-jupyter_notebook/template index 09d68b892f6..182cfec6653 100644 --- a/srcpkgs/python-jupyter_notebook/template +++ b/srcpkgs/python-jupyter_notebook/template @@ -1,22 +1,22 @@ # Template file for 'python-jupyter_notebook' pkgname=python-jupyter_notebook -version=5.4.1 +version=5.5.0 revision=1 noarch=yes wrksrc="notebook-${version}" build_style=python-module +pycompile_module="notebook" hostmakedepends="python-setuptools python3-setuptools" depends="python-Jinja2 python-terminado python-tornado python-ipython_genutils python-traitlets python-jupyter_core python-jupyter_client python-jupyter_nbformat python-jupyter_nbconvert python-ipython_ipykernel python-send2trash mathjax" -pycompile_module="notebook" short_desc="Jupyter interactive notebook (Python2)" maintainer="Alessio Sergi " homepage="https://github.com/jupyter/notebook" license="BSD-3-Clause" distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz" -checksum=7d6143d10e9b026df888e0b2936ceff1827ef2f2087646b4dd475c8dcef58606 +checksum=fa915c231e64a30d19cc2c70ccab6444cbaa93e44e92b5f8233dd9147ad0e664 alternatives=" jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook2 diff --git a/srcpkgs/python-libpcap/template b/srcpkgs/python-libpcap/template index aecb03a8bf6..063eeb0ee6b 100644 --- a/srcpkgs/python-libpcap/template +++ b/srcpkgs/python-libpcap/template @@ -1,14 +1,15 @@ # Template file for 'python-libpcap' pkgname=python-libpcap version=0.6.4 -revision=1 +revision=2 wrksrc="pylibpcap-$version" build_style=python2-module +pycompile_module="pcap.py" hostmakedepends="python" makedepends="libpcap-devel python-devel" -short_desc="Python module for the libpcap packet capture library" +short_desc="Python2 module for the libpcap packet capture library" maintainer="Andrea Brancaleoni " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="http://pylibpcap.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/pylibpcap/pylibpcap/$version/pylibpcap-$version.tar.gz" checksum=cfc365f2707a7986496acacf71789fef932a5ddbeaa36274cc8f9834831ca3b1 diff --git a/srcpkgs/python-logfury/template b/srcpkgs/python-logfury/template index 5a5a7214b56..ba7f2f73be6 100644 --- a/srcpkgs/python-logfury/template +++ b/srcpkgs/python-logfury/template @@ -1,16 +1,16 @@ # Template file for 'python-logfury' pkgname=python-logfury version=0.1.2 -revision=2 -noarch=y -wrksrc="logfury-$version" +revision=3 +noarch=yes +wrksrc="logfury-${version}" build_style=python-module -pycompile_module=logfury -hostmakedepends="python python-setuptools" -depends="python-funcsigs" -short_desc="Low-boilerplate logging of method calls for python libraries" +pycompile_module="logfury" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-six python-funcsigs" +short_desc="Low-boilerplate logging of method calls (Python2)" maintainer="Andrea Brancaleoni " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/ppolewicz/logfury" distfiles="$homepage/archive/$version.tar.gz" checksum=07464a8c1673a6012fee0e7b70b9b12941ede4210ed53e8dcda40433e2ef70fa @@ -18,3 +18,14 @@ checksum=07464a8c1673a6012fee0e7b70b9b12941ede4210ed53e8dcda40433e2ef70fa post_install() { vlicense LICENSE.txt } + +python3-logfury_package() { + noarch=yes + pycompile_module="logfury" + depends="python3-six python3-funcsigs" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense LICENSE.txt + } +} diff --git a/srcpkgs/python-magic/template b/srcpkgs/python-magic/template index 75d9fe9985e..092ee7ea039 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 ea53fc41399..5eee9f4df6f 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-mysqlclient/template b/srcpkgs/python-mysqlclient/template index 757be7a60f9..e4b872c9b51 100644 --- a/srcpkgs/python-mysqlclient/template +++ b/srcpkgs/python-mysqlclient/template @@ -1,12 +1,12 @@ +# Template file for 'python-mysqlclient' pkgname=python-mysqlclient version=1.3.12 -revision=1 +revision=2 wrksrc="mysqlclient-${version}" build_style=python-module -pycompile_module="mysqlclient" +pycompile_module="MySQLdb _mysql_exceptions.py" hostmakedepends="python-setuptools python3-setuptools" makedepends="libmysqlclient-devel python-devel python3-devel zlib-devel libressl-devel" -depends="python" short_desc="Python2 interface to MySQL/MariaDB" maintainer="Alin Dobre " license="GPL-2" @@ -15,8 +15,7 @@ distfiles="${PYPI_SITE}/m/mysqlclient/mysqlclient-${version}.tar.gz" checksum=2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5 python3-mysqlclient_package() { - pycompile_module="mysqlclient" - depends="python3" + pycompile_module="MySQLdb _mysql_exceptions.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-nbxmpp/template b/srcpkgs/python-nbxmpp/template index 09b59fa121f..31212a1e8e6 100644 --- a/srcpkgs/python-nbxmpp/template +++ b/srcpkgs/python-nbxmpp/template @@ -1,26 +1,26 @@ # Template file for 'python-nbxmpp' pkgname=python-nbxmpp -version=0.6.4 +version=0.6.6 revision=1 noarch=yes -wrksrc=${pkgname#*-}-${version} +wrksrc="${pkgname#*-}-${version}" build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python python-openssl" pycompile_module="nbxmpp" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-openssl" short_desc="Non blocking Jabber/XMPP module (Python2)" maintainer="Duncaen " -license="GPL-3" +license="GPL-2.0-or-later" homepage="https://python-nbxmpp.gajim.org/" distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz" -checksum=61c42b9c7dc4adc3776671e81f03432af4d33502802487621d90aa11ccad2e8b +checksum=d0e2830c75c5fa74871995f0be4c5ef2477e696f6ac38b4414170f86bd06e62e python3-nbxmpp_package() { noarch=yes - depends="python3 python3-openssl" + depends="python3-openssl" pycompile_module="nbxmpp" short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove usr/lib/python3* + vmove "usr/lib/python3*" } } diff --git a/srcpkgs/python-neovim/template b/srcpkgs/python-neovim/template index 904ea438ec8..e370e782aaf 100644 --- a/srcpkgs/python-neovim/template +++ b/srcpkgs/python-neovim/template @@ -1,6 +1,6 @@ # Template file for 'python-neovim' pkgname=python-neovim -version=0.2.5 +version=0.2.6 revision=1 noarch=yes wrksrc="python-client-${version}" @@ -13,7 +13,7 @@ maintainer="Steve Prybylski " license="Apache-2.0" homepage="https://github.com/neovim/python-client" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=2ab77beb7cf591f64e038ba0c6eee8cd56843a595827ffc78ee010b93ac16d87 +checksum=629c420b6e61b013f339bc6af409c74f9a135210f14e35967c1ceabe2b169c92 python3-neovim_package() { noarch=yes @@ -21,6 +21,6 @@ python3-neovim_package() { pycompile_module="neovim" short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove usr/lib/python3* + vmove "usr/lib/python3*" } } diff --git a/srcpkgs/python-nose/patches/setup.py.patch b/srcpkgs/python-nose/patches/setup.py.patch new file mode 100644 index 00000000000..617ce52951e --- /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 00000000000..de40a23fc3d --- /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 00000000000..bfe3dfa0c24 --- /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 483594bd86d..9c842785f2c 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-numpy-stl/template b/srcpkgs/python-numpy-stl/template index 327f6fa3135..02314124ddb 100644 --- a/srcpkgs/python-numpy-stl/template +++ b/srcpkgs/python-numpy-stl/template @@ -1,29 +1,44 @@ # Template file for 'python-numpy-stl' pkgname=python-numpy-stl -version=2.3.2 +version=2.5.0 revision=1 -build_style=python-module wrksrc="numpy-stl-${version}" -hostmakedepends="python-setuptools python3-setuptools" -makedepends="python-devel python3-devel python-numpy python3-numpy" -depends="python-numpy python-enum34 python-utils" +build_style=python-module pycompile_module="stl" +hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython" +makedepends="python-devel python3-devel python-numpy python3-numpy" +depends="python-setuptools python-numpy python-enum34 python-utils" short_desc="Python2 library to make working with STL files fast and easy" maintainer="Karl Nilsson " -license="3-Clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/WoLpH/numpy-stl/" distfiles="https://github.com/WoLpH/numpy-stl/archive/v${version}.tar.gz" -checksum=0b5fb6445297c055166d2c9a47cafb663557ddc178f514f6ad98226645082882 +checksum=c2919e2ff4945f41dc6bd140c37f77643776076a1734b8913e2461e44465393b +alternatives=" + numpy-stl:stl:/usr/bin/stl2 + numpy-stl:stl2ascii:/usr/bin/stl2ascii2 + numpy-stl:stl2bin:/usr/bin/stl2bin2" + +pre_build() { + sed -i '/setup_requires=/d' setup.py + # upstream forgot to increment version + sed -i "s/2\.4\.1/${version}/" stl/__about__.py +} pkg_install() { vlicense LICENSE } python3-numpy-stl_package() { - depends="python3-numpy python3-utils" + alternatives=" + numpy-stl:stl:/usr/bin/stl3 + numpy-stl:stl2ascii:/usr/bin/stl2ascii3 + numpy-stl:stl2bin:/usr/bin/stl2bin3" pycompile_module="stl" + depends="python3-setuptools python3-numpy python3-utils" short_desc="${short_desc/Python2/Python3}" pkg_install() { + vmove usr/bin/*3 vmove usr/lib/python3* vlicense LICENSE } diff --git a/srcpkgs/python-oauthlib/template b/srcpkgs/python-oauthlib/template index 6510940e51c..3667d288b0a 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-openssl/template b/srcpkgs/python-openssl/template index 4ffabcad240..f101c1296ea 100644 --- a/srcpkgs/python-openssl/template +++ b/srcpkgs/python-openssl/template @@ -1,6 +1,6 @@ # Template file for 'python-openssl' pkgname=python-openssl -version=17.5.0 +version=18.0.0 revision=1 noarch=yes wrksrc="pyOpenSSL-${version}" @@ -10,10 +10,10 @@ depends="python-cryptography python-six" pycompile_module="OpenSSL" short_desc="Python2 interface to the OpenSSL library" maintainer="Juan RP " -homepage="https://github.com/pyca/pyopenssl" +homepage="https://pyopenssl.org/" license="Apache-2.0" distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz" -checksum=2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773 +checksum=6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580 python3-openssl_package() { noarch=yes diff --git a/srcpkgs/python-owm/template b/srcpkgs/python-owm/template index 6adca7d48d4..e679b23504c 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-pandas/template b/srcpkgs/python-pandas/template index aeed1d217fc..f5373025f8a 100644 --- a/srcpkgs/python-pandas/template +++ b/srcpkgs/python-pandas/template @@ -1,29 +1,29 @@ # Template file for 'python-pandas' pkgname=python-pandas -version=0.22.0 +version=0.23.0 revision=1 wrksrc="pandas-${version}" build_style=python-module +pycompile_module="pandas" hostmakedepends="python-setuptools python3-setuptools" makedepends="python-devel python3-devel python-numpy python3-numpy python-dateutil python3-dateutil python-pytz python3-pytz python-Cython python3-Cython" depends="python-numpy python-dateutil python-pytz" -pycompile_module="pandas" short_desc="Python2 data analysis library" maintainer="Alessio Sergi " homepage="https://pandas.pydata.org/" -license="3-clause-BSD" +license="BSD-3-Clause" distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz" -checksum=cea8d7ef5649bb6a0ff918c9bc6abe81fb13cdc52bb9ccabea7d0ccae2e901b1 +checksum=0775e4d94cd7f37f14864161aa5548495e17128b9aa85cac32fcb4916f6f3dda post_install() { vlicense LICENSE } python3-pandas_package() { - depends="python3-numpy python3-dateutil python3-pytz" pycompile_module="pandas" + depends="python3-numpy python3-dateutil python3-pytz" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-parse/template b/srcpkgs/python-parse/template index 96d5d93c9f8..3471bf60748 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 d84c8451324..d3aa9d76d35 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-passlib/template b/srcpkgs/python-passlib/template index 0eae0449898..035ba7f3316 100644 --- a/srcpkgs/python-passlib/template +++ b/srcpkgs/python-passlib/template @@ -1,6 +1,7 @@ +# Template file for 'python-passlib' pkgname=python-passlib version=1.7.1 -revision=1 +revision=2 noarch=yes wrksrc="passlib-${version}" build_style=python-module @@ -9,7 +10,7 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python" short_desc="Comprehensive password hashing framework for Python2" maintainer="Alin Dobre " -license="BSD" +license="BSD-3-Clause" homepage="https://bitbucket.org/ecollins/passlib" distfiles="${PYPI_SITE}/p/passlib/passlib-${version}.tar.gz" checksum=3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0 diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template index 114f98c7a64..d8657f6da89 100644 --- a/srcpkgs/python-pbr/template +++ b/srcpkgs/python-pbr/template @@ -1,19 +1,19 @@ # Template file for 'python-pbr' pkgname=python-pbr -version=4.0.2 +version=4.0.3 revision=1 noarch=yes wrksrc="pbr-${version}" build_style=python-module +pycompile_module="pbr" hostmakedepends="python-setuptools python3-setuptools" depends="python" -pycompile_module="pbr" short_desc="Python2 build reasonableness" maintainer="Alessio Sergi " homepage="https://docs.openstack.org/developer/pbr/" license="Apache-2.0" distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz" -checksum=dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f +checksum=6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5 alternatives="pbr:pbr:/usr/bin/pbr2" python3-pbr_package() { diff --git a/srcpkgs/python-pdfrw-example b/srcpkgs/python-pdfrw-example deleted file mode 120000 index 031da988534..00000000000 --- 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 e0097384fc5..164f33e1bc3 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 b7b09022784..2a94054de8d 100644 --- a/srcpkgs/python-peewee/template +++ b/srcpkgs/python-peewee/template @@ -1,19 +1,19 @@ # Template file for 'python-peewee' pkgname=python-peewee -version=3.2.5 +version=3.4.0 revision=1 wrksrc="peewee-${version}" build_style=python-module -pycompile_module="peewee" -hostmakedepends="python-setuptools python3-setuptools" +pycompile_module="playhouse peewee.py pwiz.py" +hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython" +makedepends="python-devel python3-devel sqlite-devel" short_desc="Small and simple ORM for Python2" maintainer="johannes " license="MIT" homepage="https://github.com/coleifer/peewee" distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz" -checksum=7fb69135fb8d7f5e6e9098fcd27320e4bbde37288695ad5c99b3f46b4e2314e6 +checksum=fb2e5a2fb3ce41e2f6cbb2c91f08b6cdf364514b62b5a379f799b6df31a24594 alternatives="peewee:pwiz:/usr/bin/pwiz.py2" -noarch=yes post_install() { vlicense LICENSE @@ -21,8 +21,7 @@ post_install() { python3-peewee_package() { alternatives="peewee:pwiz:/usr/bin/pwiz.py3" - noarch=yes - pycompile_module="peewee" + pycompile_module="playhouse peewee.py pwiz.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/bin/*3 diff --git a/srcpkgs/python-picamera/template b/srcpkgs/python-picamera/template index 23a5f5dcdb7..82df69247cb 100644 --- a/srcpkgs/python-picamera/template +++ b/srcpkgs/python-picamera/template @@ -1,6 +1,6 @@ # Template file for 'python-picamera' pkgname=python-picamera -version=1.12 +version=1.13 revision=1 noarch=yes wrksrc="picamera-${version}" @@ -13,7 +13,10 @@ maintainer="cipr3s " license="3-clause-BSD" homepage="https://github.com/waveform80/picamera" distfiles="${PYPI_SITE}/p/picamera/picamera-${version}.tar.gz" -checksum="c1d28e578385eac49bdb5f53bdb83c1075c400231593aa7fa246cdb04c67ad00" +checksum=890815aa01e4d855a6a95dd3ad0953b872a6b954982106407df0c5a31a163e50 + +# Skip hardware check +export READTHEDOCS=True post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python-pip/patches/no-versioned-pip.patch index 1dfa00bf5ef..dbd7f880b2c 100644 --- a/srcpkgs/python-pip/patches/no-versioned-pip.patch +++ b/srcpkgs/python-pip/patches/no-versioned-pip.patch @@ -1,11 +1,11 @@ --- setup.py.orig +++ setup.py -@@ -78,8 +78,6 @@ setup( - entry_points={ - "console_scripts": [ - "pip=pip:main", -- "pip%s=pip:main" % sys.version[:1], -- "pip%s=pip:main" % sys.version[:3], - ], - }, - tests_require=tests_require, +@@ -77,8 +77,6 @@ + entry_points={ + "console_scripts": [ + "pip=pip._internal:main", +- "pip%s=pip._internal:main" % sys.version[:1], +- "pip%s=pip._internal:main" % sys.version[:3], + ], + }, + tests_require=tests_require, diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template index e14f88db403..8ffb61c2c38 100644 --- a/srcpkgs/python-pip/template +++ b/srcpkgs/python-pip/template @@ -1,19 +1,19 @@ # Template file for 'python-pip' pkgname=python-pip -version=9.0.3 +version=10.0.1 revision=1 noarch=yes wrksrc="pip-${version}" build_style=python-module +pycompile_module="pip" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools" -pycompile_module="pip" short_desc="The PyPA recommended tool for installing PyPI packages (Python2)" maintainer="Alessio Sergi " homepage="https://pip.pypa.io/" license="MIT" distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz" -checksum=7bf48f9a693be1d58f49f7af7e0ae9fe29fd671cde8a55e6edca3581c4ef5796 +checksum=f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68 alternatives="pip:pip:/usr/bin/pip2" post_install() { diff --git a/srcpkgs/python-portend/template b/srcpkgs/python-portend/template new file mode 100644 index 00000000000..b5e2571d2ec --- /dev/null +++ b/srcpkgs/python-portend/template @@ -0,0 +1,36 @@ +# Template file for 'python-portend' +pkgname=python-portend +version=2.2 +revision=1 +noarch=yes +wrksrc="portend-${version}" +build_style=python-module +pycompile_module="portend.py" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-tempora" +short_desc="TCP port monitoring utilities (Python2)" +maintainer="Andrea Brancaleoni " +license="MIT" +homepage="https://github.com/jaraco/portend" +distfiles="${PYPI_SITE}/p/portend/portend-${version}.tar.gz" +checksum=bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586 + +pre_build() { + sed -i setup.py \ + -e '/setuptools_scm/d' \ + -e "s|use_scm_version=True|version='${version}'|" +} +post_install() { + vlicense LICENSE +} + +python3-portend_package() { + noarch=yes + depends="python3-tempora" + pycompile_module="portend.py" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense LICENSE + } +} diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template index a43eb094bc5..be1e50ffef5 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-py/template b/srcpkgs/python-py/template index 4cc4cbaa76f..5642b08a1c5 100644 --- a/srcpkgs/python-py/template +++ b/srcpkgs/python-py/template @@ -1,11 +1,13 @@ # Template file for 'python-py' pkgname=python-py version=1.5.3 -revision=1 -wrksrc="${pkgname/python-//}-${version}" +revision=2 +noarch=yes +wrksrc="py-${version}" build_style=python-module pycompile_module="py" hostmakedepends="python-setuptools python3-setuptools" +depends="python" checkdepends="python3-pytest" short_desc="Python2 development support library" maintainer="maxice8 " @@ -13,7 +15,6 @@ license="MIT" homepage="https://github.com/pytest-dev/py" distfiles="https://github.com/pytest-dev/py/archive/${version}.tar.gz" checksum=c0698a6f71e9ea2a44e5bdf81f1ec8d5b5e9646e990c75fadeb133149aeb8440 -noarch=yes do_check() { python3 -m pytest @@ -25,6 +26,7 @@ post_install() { python3-py_package() { noarch=yes + depends="python3" pycompile_module="py" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template index d7a3b6010e6..aed740fa058 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 67079f1447c..65161f0bd48 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 5cca5a1b8c9..00000000000 --- 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 5ddb77e3d9c..00000000000 --- 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-fixture-config/template b/srcpkgs/python-pytest-fixture-config/template index 5e36fbd3689..94f31ab04f9 100644 --- a/srcpkgs/python-pytest-fixture-config/template +++ b/srcpkgs/python-pytest-fixture-config/template @@ -1,31 +1,38 @@ # Template file for 'python-pytest-fixture-config' pkgname=python-pytest-fixture-config version=1.3.0 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="pytest_fixture_config.py" hostmakedepends="python-setuptools python3-setuptools" depends="python-pytest" checkdepends="python3-pytest" -short_desc="FIxture configuration utils for py.test (Python2)" +short_desc="Fixture configuration utils for py.test (Python2)" maintainer="maxice8 " license="MIT" homepage="https://github.com/manahl/pytest-plugins" distfiles="${PYPI_SITE}/p/${pkgname/python-/}/${pkgname/python-/}-${version}.tar.gz" checksum=1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08 -noarch=yes +pre_build() { + sed -i '/setup_requires/d' common_setup.py +} do_check() { python3 setup.py test } +post_install() { + vlicense LICENSE +} python3-pytest-fixture-config_package() { - pycompile_module="pytest_fixture_config.py" noarch=yes depends="python3-pytest" + pycompile_module="pytest_fixture_config.py" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } diff --git a/srcpkgs/python-pytest-mock/template b/srcpkgs/python-pytest-mock/template index 89b4cbb6a80..5ed0029d9ae 100644 --- a/srcpkgs/python-pytest-mock/template +++ b/srcpkgs/python-pytest-mock/template @@ -1,28 +1,34 @@ # Template file for 'python-pytest-mock' pkgname=python-pytest-mock version=1.7.1 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module -pycompile_module="pytest_mock" +pycompile_module="pytest_mock.py _pytest_mock_version.py" hostmakedepends="python-setuptools python3-setuptools" -depends="python-pytest" -short_desc="Thin-wrapper around the mock package for easier use with py.test" +depends="python-pytest python-mock" +short_desc="Thin-wrapper around mock for easier use with py.test (Python2)" maintainer="maxice8 " license="MIT" homepage="https://github.com/pytest-dev/pytest-mock/" distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz" checksum=b879dff61e31fcd4727c227c182f15f222a155293cc64ed5a02d55e0020cf949 -noarch=yes +pre_build() { + sed -i setup.py \ + -e '/setup_requires=/d' \ + -e "s|use_scm_version=.*|version='${version}',|" +} post_install() { vlicense LICENSE } python3-pytest-mock_package() { noarch=yes - pycompile_module="pytest_mock" depends="python3-pytest" + pycompile_module="pytest_mock.py _pytest_mock_version.py" + short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* vlicense LICENSE diff --git a/srcpkgs/python-pytest-relaxed/template b/srcpkgs/python-pytest-relaxed/template index e9911408fd5..7ac53dd7330 100644 --- a/srcpkgs/python-pytest-relaxed/template +++ b/srcpkgs/python-pytest-relaxed/template @@ -1,19 +1,20 @@ +broken="pytest-relaxed currently only works with pytest<3.3" # Template file for 'python-pytest-relaxed' pkgname=python-pytest-relaxed version=1.1.2 revision=1 +noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="pytest_relaxed" hostmakedepends="python-setuptools python3-setuptools" -depends="python-decorator python-pytest" -short_desc="Relaxed test discovery/organization for pytest2" +depends="python-decorator python-six python-pytest" +short_desc="Relaxed test discovery/organization for pytest (Python2)" maintainer="maxice8 " license="BSD-2-Clause" homepage="https://github.com/bitprophet/pytest-relaxed" distfiles="${PYPI_SITE}/p/pytest-relaxed/pytest-relaxed-${version}.tar.gz" checksum=9159d01dcca84d0fcb1f9487d38bf32f8927506a6054a363660c964b9afe9832 -noarch=yes post_install() { vlicense LICENSE @@ -22,7 +23,7 @@ post_install() { python3-pytest-relaxed_package() { noarch=yes depends="${depends/python/python3}" - short_desc="${short_desc/pytest2/pytest3}" + short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* vlicense LICENSE diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template index 880a0fc217d..6aba00ac20b 100644 --- a/srcpkgs/python-pytest/template +++ b/srcpkgs/python-pytest/template @@ -1,22 +1,22 @@ # Template file for 'python-pytest' pkgname=python-pytest -version=3.5.1 +version=3.6.0 revision=2 noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module pycompile_module="_pytest pytest.py" hostmakedepends="python-setuptools python3-setuptools" -depends="python-attrs python-funcsigs python-more-itertools python-pluggy - python-py python-setuptools" -checkdepends="python3-hypothesis python3-more-itertools python3-pluggy - python3-py" +depends="python-atomicwrites python-attrs python-funcsigs python-more-itertools + python-pluggy python-py python-setuptools" +checkdepends="python3-atomicwrites python3-hypothesis python3-more-itertools + python3-pluggy python3-py python3-atomicwrites" short_desc="Simple powerful testing with Python2" 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" @@ -42,8 +42,8 @@ python3-pytest_package() { pytest:pytest:/usr/bin/pytest3 pytest:py.test:/usr/bin/py.test3" short_desc="${short_desc/Python2/Python3}" - depends="python3-attrs python3-more-itertools python3-pluggy python3-py - python3-setuptools" + depends="python3-atomicwrites python3-attrs python3-more-itertools + python3-pluggy python3-py python3-setuptools" pkg_install() { vmove "usr/bin/*3" vmove "usr/lib/python3*" diff --git a/srcpkgs/python-pyudev/template b/srcpkgs/python-pyudev/template index cb09a0c9961..19ab8a1abbc 100644 --- a/srcpkgs/python-pyudev/template +++ b/srcpkgs/python-pyudev/template @@ -1,13 +1,13 @@ # Template file for 'python-pyudev' pkgname=python-pyudev version=0.21.0 -revision=1 +revision=2 noarch=yes wrksrc="pyudev-${version}" build_style=python-module pycompile_module="pyudev" hostmakedepends="python-setuptools python3-setuptools" -depends="python" +depends="python python-six" short_desc="Python bindings to libudev (Python2)" maintainer="Luca Weiss " license="LGPL-2.1" @@ -17,7 +17,7 @@ checksum=5f4625f89347e465731866ddbe042a055bbc5092577356aa3d089ac5fb8efd94 python3-pyudev_package() { noarch=yes - depends="python3" + depends="python3 python3-six" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python-pyzmq/template index ea97c7ffbdd..f7c437a654c 100644 --- a/srcpkgs/python-pyzmq/template +++ b/srcpkgs/python-pyzmq/template @@ -1,6 +1,6 @@ # Template file for 'python-pyzmq' pkgname=python-pyzmq -version=16.0.4 +version=17.0.0 revision=1 wrksrc="pyzmq-${version}" build_style=python-module @@ -12,9 +12,9 @@ makedepends="${hostmakedepends/pkg-config/}" short_desc="Python2 bindings for the ZeroMQ messaging library" maintainer="Alessio Sergi " homepage="https://pyzmq.readthedocs.io/" -license="LGPL-3, 3-clause-BSD" +license="LGPL-3.0-or-later, BSD-3-Clause" distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz" -checksum=6381457420b0108226dab730b6728a4c2158e0286f614b2e89ef905f1c8fb580 +checksum=e6c6394bfe32e81b4ccb917fe24c3d7637c894f3c5f4698ccac513bda1f675d9 pre_build() { cat > setup.cfg <<-EOF diff --git a/srcpkgs/python-raven/template b/srcpkgs/python-raven/template index d42e03f8769..995b90a8d30 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-requests-mock/template b/srcpkgs/python-requests-mock/template new file mode 100644 index 00000000000..f94c2ad14d6 --- /dev/null +++ b/srcpkgs/python-requests-mock/template @@ -0,0 +1,26 @@ +# Template file for 'python-requests-mock' +pkgname=python-requests-mock +version=1.5.0 +revision=2 +noarch=yes +wrksrc="requests-mock-${version}" +build_style=python-module +pycompile_modules="requests_mock" +hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr" +depends="python-requests python-six" +short_desc="Python2 module to test mocked responses from requests" +maintainer="maxice8 " +license="Apache-2.0" +homepage="https://github.com/jamielennox/requests-mock" +distfiles="${PYPI_SITE}/r/requests-mock/requests-mock-${version}.tar.gz" +checksum=a029fe6c5244963ef042c6224ff787049bfc5bab958a1b7e5b632ef0bbb05de4 + +python3-requests-mock_package() { + noarch=yes + pycompile_modules="requests_mock" + depends="python3-requests python3-six" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template index 395b7771e1e..d1b4d87b66e 100644 --- a/srcpkgs/python-setuptools/template +++ b/srcpkgs/python-setuptools/template @@ -1,6 +1,6 @@ # Template file for 'python-setuptools' pkgname=python-setuptools -version=39.1.0 +version=39.2.0 revision=1 noarch=yes wrksrc="setuptools-${version}" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/pypa/setuptools" license="MIT" distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip" -checksum=c5484e13b89927b44fd15897f7ce19dded8e7f035466a4fa7b946c0bdd86edd7 +checksum=f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2 alternatives="setuptools:easy_install:/usr/bin/easy_install2" export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template index 6e57312e02f..0e9f8d6fd65 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-tables/template b/srcpkgs/python-tables/template index 0bb4d4bf23f..68d2a090c19 100644 --- a/srcpkgs/python-tables/template +++ b/srcpkgs/python-tables/template @@ -1,7 +1,7 @@ # Template file for 'python-tables' pkgname=python-tables -version=3.4.2 -revision=5 +version=3.4.3 +revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module pycompile_module="tables" @@ -12,10 +12,11 @@ makedepends="python-devel python3-devel python-numpy python3-numpy depends="python-setuptools python-numpy python-numexpr python-six" short_desc="Hierarchical datasets for Python2" maintainer="pulux " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="http://www.pytables.org/" +# changelog=$homepage/release-notes/RELEASE_NOTES_v3.4.x.html distfiles="${PYPI_SITE}/t/tables/tables-${version}.tar.gz" -checksum=fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c +checksum=b6aafe47154e2140c0a91bb38ebdb6ba67a24dd86263f1c294af8c11cb7deed4 alternatives=" tables:pt2to3:/usr/bin/python2-pt2to3 diff --git a/srcpkgs/python-tempora/template b/srcpkgs/python-tempora/template new file mode 100644 index 00000000000..5266fd47901 --- /dev/null +++ b/srcpkgs/python-tempora/template @@ -0,0 +1,39 @@ +# Template file for 'python-tempora' +pkgname=python-tempora +version=1.11 +revision=1 +noarch=yes +wrksrc="tempora-${version}" +build_style=python-module +pycompile_module="tempora" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-setuptools python-six python-pytz" +short_desc="Objects and routines pertaining to date and time (Python2)" +maintainer="Andrea Brancaleoni " +license="MIT" +homepage="https://github.com/jaraco/tempora" +distfiles="${PYPI_SITE}/t/tempora/tempora-${version}.tar.gz" +checksum=4be862dbdc6fcbcc57f4b355258daa41fc0932af99680142bfa20836379f57a5 +alternatives="tempora:calc-prorate:/usr/bin/calc-prorate2" + +pre_build() { + sed -i setup.py \ + -e '/setuptools_scm/d' \ + -e "s|use_scm_version=True|version='${version}'|" +} +post_install() { + vlicense LICENSE +} + +python3-tempora_package() { + noarch=yes + pycompile_module="tempora" + depends="python3-setuptools python3-six python3-pytz" + alternatives="tempora:calc-prorate:/usr/bin/calc-prorate3" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/bin/*3 + vmove usr/lib/python3* + vlicense LICENSE + } +} diff --git a/srcpkgs/python-toml/template b/srcpkgs/python-toml/template index 8634547fca7..a59a8f055bc 100644 --- a/srcpkgs/python-toml/template +++ b/srcpkgs/python-toml/template @@ -1,16 +1,14 @@ # Template file for 'python-toml' pkgname=python-toml version=0.9.3 -revision=1 +revision=2 noarch=yes -wrksrc=toml-$version +wrksrc="toml-${version}" build_style=python-module -pycompile_module="toml" +pycompile_module="toml.py" +hostmakedepends="python-setuptools python3-setuptools" depends="python" -hostmakedepends="python-setuptools python3-setuptools \ - python-devel python3-devel" -makedepends="python-devel python3-devel" -short_desc="Python2 lib for TOML" +short_desc="Python2 library for TOML" maintainer="AcidBear " license="MIT" homepage="https://github.com/uiri/toml" @@ -22,10 +20,12 @@ pkg_install() { } python3-toml_package() { + noarch=yes depends="python3" + pycompile_module="toml.py" short_desc=${short_desc/Python2/Python3} pkg_install() { - vmove /usr/lib/python3* + vmove usr/lib/python3* vlicense LICENSE } } diff --git a/srcpkgs/python-tweepy/patches/1030.patch b/srcpkgs/python-tweepy/patches/1030.patch new file mode 100644 index 00000000000..6abb9267244 --- /dev/null +++ b/srcpkgs/python-tweepy/patches/1030.patch @@ -0,0 +1,59 @@ +From 778bd7a31d2f5fae98652735e7844533589ca221 Mon Sep 17 00:00:00 2001 +From: Ben Cipollini +Date: Wed, 18 Apr 2018 10:26:07 -0700 +Subject: [PATCH] #1029 - migrate requirements to setup.py, reference in + requirements.txt + +--- + requirements.txt | 7 +++---- + setup.py | 11 ++++++----- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git requirements.txt requirements.txt +index 14440314..cd8c47d3 100644 +--- requirements.txt ++++ requirements.txt +@@ -1,4 +1,3 @@ +-requests>=2.11.1 +-requests_oauthlib>=0.7.0 +-six>=1.10.0 +-PySocks>=1.5.7 ++--index-url https://pypi.python.org/simple/ ++ ++-e . +diff --git setup.py setup.py +index 18c59108..5688c2f5 100644 +--- setup.py ++++ setup.py +@@ -2,7 +2,6 @@ + #from distutils.core import setup + import re, uuid + from setuptools import setup, find_packages +-from pip.req import parse_requirements + + VERSIONFILE = "tweepy/__init__.py" + ver_file = open(VERSIONFILE, "rt").read() +@@ -14,9 +13,6 @@ + else: + raise RuntimeError("Unable to find version string in %s." % (VERSIONFILE,)) + +-install_reqs = parse_requirements('requirements.txt', session=uuid.uuid1()) +-reqs = [str(req.req) for req in install_reqs] +- + setup(name="tweepy", + version=version, + description="Twitter library for python", +@@ -25,7 +21,12 @@ + author_email="tweepy@googlegroups.com", + url="http://github.com/tweepy/tweepy", + packages=find_packages(exclude=['tests']), +- install_requires=reqs, ++ install_requires=[ ++ "requests>=2.11.1", ++ "requests_oauthlib>=0.7.0", ++ "six>=1.10.0", ++ "PySocks>=1.5.7", ++ ], + keywords="twitter library", + classifiers=[ + 'Development Status :: 4 - Beta', diff --git a/srcpkgs/python-tweepy/template b/srcpkgs/python-tweepy/template index 61267874158..bc779970dae 100644 --- a/srcpkgs/python-tweepy/template +++ b/srcpkgs/python-tweepy/template @@ -1,31 +1,30 @@ # Template file for 'python-tweepy' pkgname=python-tweepy version=3.6.0 -revision=1 +revision=2 +noarch=yes wrksrc="tweepy-${version}" build_style=python-module -hostmakedepends="python-setuptools python3-setuptools python-pip python3-pip" -depends="python-requests-oauthlib" -checkdepends="python3-requests-oauthlib" -short_desc="Twitter library for python" +pycompile_module="tweepy" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-requests-oauthlib python-six python-pysocks" +short_desc="Twitter library for Python2" maintainer="maxice8 " license="MIT" -homepage="https://pypy.python.org/pypi/tweepy/3.5.0" +homepage="https://github.com/tweepy/tweepy" distfiles="https://github.com/tweepy/tweepy/archive/v${version}.tar.gz" checksum=70f0c02b6249a3a7551328f731f1b90c822a780eb2fd15eaef4510a477c9f33c -noarch=yes - -do_check() { - python3 setup.py test -} post_install() { vlicense LICENSE + # remove examples from site-packages root + rm -rf ${DESTDIR}/usr/lib/python*/site-packages/examples } python3-tweepy_package() { noarch=yes - depends="python3-requests-oauthlib" + pycompile_module="tweepy" + depends="python3-requests-oauthlib python3-six python3-pysocks" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python-utils/template b/srcpkgs/python-utils/template index 6fbd5d5258d..aaa476df72e 100644 --- a/srcpkgs/python-utils/template +++ b/srcpkgs/python-utils/template @@ -1,14 +1,14 @@ # Template file for 'python-utils' pkgname=python-utils version=2.3.0 -revision=1 +revision=2 +noarch=yes build_style=python-module wrksrc="python-utils-${version}" -hostmakedepends="python-setuptools python3-setuptools" -makedepends="python-devel python3-devel" -depends="python-six" pycompile_module="python_utils" -short_desc="Convenient utilities not included with the standard Python install " +hostmakedepends="python-setuptools python3-setuptools" +depends="python-six" +short_desc="Convenient utilities not included with the standard Python2 install" maintainer="Karl Nilsson " license="BSD-3-Clause" homepage="https://github.com/WoLpH/python-utils" @@ -20,6 +20,7 @@ pkg_install() { } python3-utils_package() { + noarch=yes depends="python3-six" pycompile_module="python_utils" short_desc="${short_desc/Python2/Python3}" diff --git a/srcpkgs/python-virtualenv/template b/srcpkgs/python-virtualenv/template index e2b76515aa2..f17a1adf017 100644 --- a/srcpkgs/python-virtualenv/template +++ b/srcpkgs/python-virtualenv/template @@ -1,19 +1,19 @@ # Template file for 'python-virtualenv' pkgname=python-virtualenv -version=15.2.0 +version=16.0.0 revision=1 noarch=yes wrksrc="virtualenv-${version}" build_style=python-module +pycompile_module="virtualenv.py" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools" -pycompile_module="virtualenv.py" short_desc="Virtual Python2 environment builder" maintainer="Alessio Sergi " homepage="https://virtualenv.pypa.io/" license="MIT" distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz" -checksum=1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54 +checksum=ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv2" post_install() { diff --git a/srcpkgs/python-vispy/template b/srcpkgs/python-vispy/template index 43673d7f561..265d8fca12f 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 36e8e9172ea..f1cb2020daa 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 5282fbf315c..96b7db431ba 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,16 +10,14 @@ 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() { sed -i "s|'backports.ssl_match_hostname'||" setup.py - # use system certs - rm -f websocket/cacert.pem } python3-websocket-client_package() { diff --git a/srcpkgs/python-wheel/template b/srcpkgs/python-wheel/template index e6d511953e8..4c0af47a174 100644 --- a/srcpkgs/python-wheel/template +++ b/srcpkgs/python-wheel/template @@ -1,6 +1,6 @@ # Template file for 'python-wheel' pkgname=python-wheel -version=0.31.0 +version=0.31.1 revision=1 noarch=yes wrksrc="wheel-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/pypa/wheel" license="MIT" distfiles="${PYPI_SITE}/w/wheel/wheel-${version}.tar.gz" -checksum=1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce +checksum=0a2e54558a0628f2145d2fc822137e322412115173e8a2ddbe1c9024338ae83c alternatives="wheel:wheel:usr/bin/wheel2" post_install() { diff --git a/srcpkgs/python-xmltodict/template b/srcpkgs/python-xmltodict/template index 306e83a7b54..715cf3f20bc 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/python-yamllint/template b/srcpkgs/python-yamllint/template index 75e23d522d3..1c548eecf11 100644 --- a/srcpkgs/python-yamllint/template +++ b/srcpkgs/python-yamllint/template @@ -1,20 +1,20 @@ # Template file for 'python-yamllint' pkgname=python-yamllint -version=1.11.0 +version=1.11.1 revision=1 -noarch=yes wrksrc="yamllint-${version}" build_style=python-module pycompile_module="yamllint" hostmakedepends="python-setuptools python3-setuptools" -depends="python-setuptools python-yaml python-pathspec" -checkdepends="python3-yaml python3-pathspec" +depends="python-pathspec python-setuptools python-yaml" +checkdepends="python3-pathspec python3-yaml" short_desc="Python2 linter for YAML files" maintainer="Joseph LaFreniere " homepage="https://github.com/adrienverge/yamllint" -license="GPL-3" +license="GPL-3.0-or-later" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=55916772ada4507fea84d09f8ca7c24b2e0fc8dea6c1f2caf8328c72cc81ae6e +checksum=56221b7c0a50b1619e491eb157624a5d1b160c1a4f019d64f117268f42fe4ca4 +noarch=yes alternatives="yamllint:yamllint:/usr/bin/yamllint2" do_check() { @@ -23,7 +23,7 @@ do_check() { python3-yamllint_package() { noarch=yes - depends="python3-setuptools python3-yaml python3-pathspec" + depends="python3-pathspec python3-setuptools python3-yaml" pycompile_module="yamllint" short_desc="${short_desc/Python2/Python3}" alternatives="yamllint:yamllint:/usr/bin/yamllint3" diff --git a/srcpkgs/python-zeroconf/template b/srcpkgs/python-zeroconf/template index aaade76c396..d8eed53de08 100644 --- a/srcpkgs/python-zeroconf/template +++ b/srcpkgs/python-zeroconf/template @@ -1,22 +1,29 @@ # Template file for 'python-zeroconf' pkgname=python-zeroconf version=0.19.1 -revision=1 +revision=2 +noarch=yes build_style=python-module +pycompile_module="zeroconf.py" hostmakedepends="python-setuptools python3-setuptools" -makedepends="python-devel python3-devel" depends="python-netifaces python-six python-enum34" -pycompile_module="zeroconf" -short_desc="Python2 implementation of multicast DNS service discovery" +short_desc="Pure Python2 implementation of multicast DNS service discovery" maintainer="Karl Nilsson " license="LGPL-2.1" homepage="https://github.com/jstasiak/python-zeroconf/" distfiles="https://github.com/jstasiak/python-zeroconf/archive/${version}.tar.gz" checksum="ca8952a3eb04818dcb566e1344f2f15b5dd6d487770384651cdfae777d5eb848" +pre_build() { + # Remove enum-compat from install_requires, it's a virtual package. + # Also, no need for enum-compat on Python 3.4+. + sed -i '/enum-compat/d' setup.py +} + python3-zeroconf_package() { + noarch=yes + pycompile_module="zeroconf.py" depends="python3-netifaces python3-six" - pycompile_module="zeroconf" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* diff --git a/srcpkgs/python3-Arrow b/srcpkgs/python3-Arrow new file mode 120000 index 00000000000..a4d5b422e3f --- /dev/null +++ b/srcpkgs/python3-Arrow @@ -0,0 +1 @@ +python-Arrow \ No newline at end of file diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template index fa07457d3b9..09536666c38 100644 --- a/srcpkgs/python3-Telethon/template +++ b/srcpkgs/python3-Telethon/template @@ -1,19 +1,19 @@ # Template file for 'python3-Telethon' pkgname=python3-Telethon -version=0.18.3 +version=0.19 revision=1 +noarch=yes wrksrc="Telethon-${version}" build_style=python3-module -pycompile_module="telethon" +pycompile_module="telethon telethon_generator" hostmakedepends="python3-setuptools" -depends="python3-pyaes python3-rsa python3-typing" +depends="python3-pyaes python3-rsa" short_desc="Pure Python3 Telegram client library" maintainer="maxice8 " license="MIT" homepage="https://lonamiwebs.github.io/Telethon" distfiles="https://github.com/LonamiWebs/Telethon/archive/v${version}.tar.gz" -checksum=e9c8a94703b33031c9c87b647b168e1b5a99c6226fc40da2d67a41526c58fb92 -noarch=yes +checksum=2072318a146459fbb4acf92dd3ca03aa4a58e4cf147c43d8e016bd191826e097 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-aiohttp-cors2/template b/srcpkgs/python3-aiohttp-cors2/template new file mode 100644 index 00000000000..9437ba010cc --- /dev/null +++ b/srcpkgs/python3-aiohttp-cors2/template @@ -0,0 +1,18 @@ +# Template file for 'python3-aiohttp-cors2' +pkgname=python3-aiohttp-cors2 +version=0.7.0 +revision=1 +noarch=yes +wrksrc="aiohttp-cors-${version}" +build_style=python3-module +pycompile_module="aiohttp_cors" +hostmakedepends="python3-setuptools" +depends="python3-aiohttp2" +short_desc="Cross Origin Resource Sharing (CORS) support for aiohttp" +maintainer="Michael Aldridge " +license="Apache-2.0" +homepage="https://github.com/aio-libs/aiohttp-cors" +distfiles="https://github.com/aio-libs/aiohttp-cors/archive/v${version}.tar.gz" +checksum=a710a07c3d8e8c2dcb3a3f992c671a058e2058652ed041b5201016978a5527aa +conflicts=python3-aiohttp-cors +replaces="python3-aiohttp-cors>=0" diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template index 740a7f817b3..933aa466072 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-aiohttp2/template b/srcpkgs/python3-aiohttp2/template new file mode 100644 index 00000000000..6b75bbad015 --- /dev/null +++ b/srcpkgs/python3-aiohttp2/template @@ -0,0 +1,26 @@ +# Template file for 'python3-aiohttp2' +pkgname=python3-aiohttp2 +version=2.3.10 +revision=1 +wrksrc="aiohttp-${version}" +build_style=python3-module +pycompile_module="aiohttp" +hostmakedepends="python3-Cython python3-setuptools" +makedepends="python3-devel" +checkdepends="python3-async-timeout python3-async_generator python3-chardet + python3-idna-ssl python3-pytest-mock python3-yarl" +depends="python3-async-timeout python3-attrs python3-chardet python3-idna-ssl + python3-yarl" +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=ca3c15aa2c178599393919c27dbada24860e075d501257db54d6547ecf34bac8 +conflicts=python3-aiohttp +replaces="python3-aiohttp>=0" + +do_check() { + python3 setup.py test +} diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template index c50d9894f92..7cab8e45d91 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-backcall b/srcpkgs/python3-backcall new file mode 120000 index 00000000000..011083fc736 --- /dev/null +++ b/srcpkgs/python3-backcall @@ -0,0 +1 @@ +python-backcall \ No newline at end of file diff --git a/srcpkgs/python3-idna-ssl/template b/srcpkgs/python3-idna-ssl/template index a3ab53ab848..6e795b477a3 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-ipython/template b/srcpkgs/python3-ipython/template index c37e7317e47..a37eed1fad2 100644 --- a/srcpkgs/python3-ipython/template +++ b/srcpkgs/python3-ipython/template @@ -1,6 +1,6 @@ # Template file for 'python3-ipython' pkgname=python3-ipython -version=6.2.0 +version=6.4.0 revision=1 noarch=yes wrksrc="ipython-${version}" @@ -8,13 +8,14 @@ build_style=python3-module pycompile_module="IPython" hostmakedepends="python3-setuptools" depends="python3-pickleshare python3-simplegeneric python3-traitlets - python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi" + python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi + python3-backcall" short_desc="Enhanced interactive Python3 shell" maintainer="Alessio Sergi " homepage="https://ipython.org/" -license="3-clause-BSD" +license="BSD-3-Clause" distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz" -checksum=81b0d6936f87002e6972eccc7e4085f5c2d0673decff22724b53cf34809ffacf +checksum=eca537aa61592aca2fef4adea12af8e42f5c335004dfa80c78caf80e8b525e5c alternatives=" ipython:ipython:/usr/bin/ipython3 diff --git a/srcpkgs/python3-logfury b/srcpkgs/python3-logfury new file mode 120000 index 00000000000..710697327ea --- /dev/null +++ b/srcpkgs/python3-logfury @@ -0,0 +1 @@ +python-logfury \ No newline at end of file diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template index 6de08d76c87..5772113c14b 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 00000000000..32467a70a1e --- /dev/null +++ b/srcpkgs/python3-nose @@ -0,0 +1 @@ +python-nose \ No newline at end of file diff --git a/srcpkgs/python3-perf/template b/srcpkgs/python3-perf/template new file mode 100644 index 00000000000..eb277b1c600 --- /dev/null +++ b/srcpkgs/python3-perf/template @@ -0,0 +1,21 @@ +# Template file for 'python3-perf' +pkgname=python3-perf +version=1.5.1 +revision=2 +noarch=yes +wrksrc="perf-${version}" +build_style=python3-module +pycompile_module="perf" +hostmakedepends="python3-setuptools" +depends="python3-setuptools 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-portend b/srcpkgs/python3-portend new file mode 120000 index 00000000000..5d4327eb368 --- /dev/null +++ b/srcpkgs/python3-portend @@ -0,0 +1 @@ +python-portend \ No newline at end of file diff --git a/srcpkgs/python3-pytest-capturelog b/srcpkgs/python3-pytest-capturelog deleted file mode 120000 index e6b907ead3f..00000000000 --- a/srcpkgs/python3-pytest-capturelog +++ /dev/null @@ -1 +0,0 @@ -python-pytest-capturelog \ No newline at end of file diff --git a/srcpkgs/python3-requests-mock b/srcpkgs/python3-requests-mock new file mode 120000 index 00000000000..d8933139d8e --- /dev/null +++ b/srcpkgs/python3-requests-mock @@ -0,0 +1 @@ +python-requests-mock \ No newline at end of file diff --git a/srcpkgs/python3-requests-mock/template b/srcpkgs/python3-requests-mock/template deleted file mode 100644 index 29cf9707605..00000000000 --- a/srcpkgs/python3-requests-mock/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'python3-requests-mock' -pkgname=python3-requests-mock -version=1.4.0 -revision=1 -wrksrc="requests-mock-${version}" -build_style=python3-module -pycompile_modules="requests_mock" -hostmakedepends="python3-setuptools" -depends="python3-requests" -checkdepends="python3-Sphinx python3-pytest-mock" -short_desc="Python3 module to test mocked responses from requests" -maintainer="maxice8 " -license="Apache-2.0" -homepage="https://github.com/jamielennox/requests-mock" -distfiles="${PYPI_SITE}/r/requests-mock/requests-mock-${version}.tar.gz" -checksum=2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b - -do_check() { - python3 setup.py test -} diff --git a/srcpkgs/python3-tempora b/srcpkgs/python3-tempora new file mode 120000 index 00000000000..3b48506309a --- /dev/null +++ b/srcpkgs/python3-tempora @@ -0,0 +1 @@ +python-tempora \ No newline at end of file diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template index ae3ea68e11a..9c81c815add 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 8133c099991..65feaec4f5a 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 0d777c6c7cb..1f11fe89a92 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 f2a6fbe0548..3b958e0de41 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 00000000000..4c5ed097b26 --- /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/qt5/patches/gcc8-chromium-mojo.patch b/srcpkgs/qt5/patches/gcc8-chromium-mojo.patch new file mode 100644 index 00000000000..cc4f3a979b2 --- /dev/null +++ b/srcpkgs/qt5/patches/gcc8-chromium-mojo.patch @@ -0,0 +1,18 @@ +--- qtwebengine/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400 ++++ qtwebengine/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 +@@ -18,7 +18,13 @@ + #endif + + // Like the C++11 |alignof| operator. +-#if __cplusplus >= 201103L ++#if defined(__GNUC__) && __GNUC__ >= 8 ++// GCC 8 has changed the alignof operator to return the minimal alignment ++// required by the target ABI, instead of the preferred alignment. ++// This means that on 32-bit x86, it will return 4 instead of 8. ++// Use __alignof__ instead to avoid this. ++#define MOJO_ALIGNOF(type) __alignof__(type) ++#elif __cplusplus >= 201103L + #define MOJO_ALIGNOF(type) alignof(type) + #elif defined(__GNUC__) + #define MOJO_ALIGNOF(type) __alignof__(type) +generated by cgit v1.1 at 2018-05-28 17:38:41 +0000 diff --git a/srcpkgs/qupzilla/patches/musl-execinfo.patch b/srcpkgs/qupzilla/patches/musl-execinfo.patch deleted file mode 100644 index b9ace1257b4..00000000000 --- a/srcpkgs/qupzilla/patches/musl-execinfo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/main/main.cpp 2015-01-26 15:26:15.000000000 +0100 -+++ src/main/main.cpp 2015-07-06 09:35:37.741814165 +0200 -@@ -22,7 +22,7 @@ - #include // For QT_REQUIRE_VERSION - #include - --#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__) -+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(__FreeBSD__) || defined(__HAIKU__) - #include - #include - -@@ -166,7 +166,7 @@ - QApplication::setGraphicsSystem(QSL("raster")); - #endif - --#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) -+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(__FreeBSD__) - signal(SIGSEGV, qupzilla_signal_handler); - #endif - diff --git a/srcpkgs/qupzilla/template b/srcpkgs/qupzilla/template index 8708bda4ed9..35eebf0b515 100644 --- a/srcpkgs/qupzilla/template +++ b/srcpkgs/qupzilla/template @@ -1,23 +1,11 @@ # Template file for 'qupzilla' pkgname=qupzilla +reverts="3.0.1_1" version=2.2.6 -revision=2 -wrksrc=QupZilla-${version} -build_style=qmake -hostmakedepends="pkg-config qt5-tools" -makedepends="hunspell-devel qt5-script-devel qt5-declarative-devel - qt5-location-devel qt5-webchannel-devel qt5-webengine-devel qt5-webview-devel - qt5-svg-devel qt5-x11extras-devel xcb-util-devel" -depends="qt5-plugin-sqlite" -short_desc="Lightweight multiplatform browser" +revision=3 +build_style=meta +depends="falkon>=${version}_${revision}" +short_desc="Lightweight multiplatform browser (transitional dummy package)" maintainer="Jürgen Buchmüller " license="GPL-3" homepage="https://qupzilla.com/" -distfiles="https://github.com/QupZilla/${pkgname}/releases/download/v${version}/QupZilla-${version}.tar.xz" -checksum=ef88afbaa85df9ed01e7848be1a82d910a9a62933f0f22acce299226dc4aeed4 -conflicts="qupzilla1>=0" - -if [ $CROSS_BUILD ]; then - hostmakedepends+=" qt5-declarative-devel qt5-location-devel - qt5-webchannel-devel qt5-webengine-devel qt5-x11extras-devel" -fi diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index 2dba549d0ae..00f3d8217d8 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,6 +1,6 @@ # Template file for 'qutebrowser' pkgname=qutebrowser -version=1.2.1 +version=1.3.0 revision=1 noarch=yes build_style=python3-module @@ -12,9 +12,10 @@ depends="python3-setuptools python3-PyQt5-webengine python3-PyQt5-quick short_desc="Keyboard-focused browser with a minimal GUI" maintainer="Eivind Uggedal " license="GPL-3.0-or-later" +#changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc" homepage="https://qutebrowser.org/" distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=1ce6cf2634f06d3e715c53b50e4d042ba04aa39207ec318039a2a333e2d46beb +checksum=83cf51e934d37ac6fa686ba25878d63ba319b3e548f41f8ea2ee02d393313095 pre_build() { a2x -f manpage doc/${pkgname}.1.asciidoc diff --git a/srcpkgs/racer/template b/srcpkgs/racer/template index fdcdb86ad4b..9a3c127f090 100644 --- a/srcpkgs/racer/template +++ b/srcpkgs/racer/template @@ -1,6 +1,6 @@ # Template file for 'racer' pkgname=racer -version=2.0.12 +version=2.0.14 revision=1 hostmakedepends="rust cargo" short_desc="Utility intended to provide Rust code completion for editors and IDEs" @@ -8,7 +8,7 @@ maintainer="Michael Gehring " license="MIT" homepage="https://github.com/racer-rust/racer" distfiles="https://github.com/racer-rust/racer/archive/${version}.tar.gz" -checksum=1fa063d90030c200d74efb25b8501bb9a5add7c2e25cbd4976adf7a73bf715cc +checksum=0442721c01ae4465843cb73b24f6caa0127c3308d72b944ad75736164756e522 nocross=yes do_build() { diff --git a/srcpkgs/range-v3/template b/srcpkgs/range-v3/template index 5449324317a..8866b28a78d 100644 --- a/srcpkgs/range-v3/template +++ b/srcpkgs/range-v3/template @@ -1,16 +1,12 @@ # Template file for 'range-v3' pkgname=range-v3 -version=0.3.5 +version=0.3.6 revision=1 build_style=cmake -configure_args="-DRANGE_V3_NO_TESTING=1 -DRANGE_V3_NO_EXAMPLE=1 -DRANGE_V3_NO_PERF=1" +configure_args="-DRANGE_V3_EXAMPLES=OFF -DRANGE_V3_PERF=ON -DRANGE_V3_TESTS=ON" short_desc="Experimental range library for C++11/14/17" maintainer="John " -license="mixed" +license="BSL-1.0" homepage="https://github.com/ericniebler/range-v3" distfiles="https://github.com/ericniebler/range-v3/archive/${version}.tar.gz" -checksum=0a0094b450fe17e1454468bef5b6bf60e73ef100aebe1663daf6fbdf2c353836 - -post_install() { - vlicense LICENSE.txt -} +checksum=ce6e80c6b018ca0e03df8c54a34e1fd04282ac1b068cd39e902e2e5201ac117f diff --git a/srcpkgs/rasterview/template b/srcpkgs/rasterview/template index 43b2f11ada5..7ff14245b47 100644 --- a/srcpkgs/rasterview/template +++ b/srcpkgs/rasterview/template @@ -1,18 +1,12 @@ # Template file for 'rasterview' pkgname=rasterview -version=1.5.20180309 +version=1.6 revision=1 -_commit=b1b66c3ece195c59901667619b325ccb06abf3de -wrksrc="${pkgname}-${_commit}" build_style=gnu-configure -maintainer="Orphaned " makedepends="fltk-devel" +short_desc="CUPS/PWG Raster file viewer" +maintainer="Orphaned " license="Apache-2.0" homepage="http://www.msweet.org/rasterview/" -short_desc="CUPS/PWG Raster file viewer" -distfiles="https://github.com/michaelrsweet/rasterview/archive/${_commit}.tar.gz" -checksum=6b625a2006552f553a6cbb6bb6fe2c19df867c2867d18819e694373d62a43282 - -do_install() { - vbin rasterview -} +distfiles="https://github.com/michaelrsweet/rasterview/archive/v${version}.tar.gz" +checksum=8186f55fcc45bdfd0b941bd58b46f1dff6734884e4ae181af1cd409d9322dd53 diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index 74ff11bf4f5..773383cfaac 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -1,7 +1,7 @@ # Template build file for 'readline'. pkgname=readline _dist_ver=7.0 -_patch_ver=000 +_patch_ver=003 version=${_dist_ver}.${_patch_ver} revision=1 wrksrc=${pkgname}-${_dist_ver} @@ -10,8 +10,8 @@ configure_args="--with-curses --enable-multibyte" makedepends="ncurses-devel" short_desc="The GNU Readline Library" maintainer="Juan RP " -homepage="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -license="GPL-3" +homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html" +license="GPL-3.0-or-later" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_dist_ver}.tar.gz" checksum=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 @@ -21,17 +21,18 @@ pre_configure() { cd ${XBPS_SRCDISTDIR}/${pkgname}-${version} if [ "${_patch_ver}" -gt 000 ]; then for p in $(seq -w 001 ${_patch_ver}); do - if [ -f readline63-${p} ]; then + if [ -f readline${version/./}-${p} ]; then continue fi - msg_normal " Fetching $url/readline63-$p ...\n" - $XBPS_FETCH_CMD ${url}/readline63-$p + local patch_url="${url}/readline${_dist_ver/./}-${p}" + msg_normal " Fetching ${patch_url} ...\n" + $XBPS_FETCH_CMD "${patch_url}" done fi cd ${wrksrc} for p in $(seq -w 001 ${_patch_ver}); do - patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline63-${p} - msg_normal " Applying patch readline63-$p.\n" + patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p} + msg_normal " Applying patch readline${_dist_ver/./}-$p.\n" done sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf } diff --git a/srcpkgs/readline/update b/srcpkgs/readline/update new file mode 100644 index 00000000000..034db99ab52 --- /dev/null +++ b/srcpkgs/readline/update @@ -0,0 +1,3 @@ +site="https://git.savannah.gnu.org/cgit/readline.git" +pattern="(readline-\K[\d.]+(?=\.tar.gz))|(Readline-\K[\d.]+ patch \d+)" +version="${_dist_ver} patch ${_patch_ver}" diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index 18858c81c81..770566c0da5 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 00000000000..dcc285e571f --- /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 3676f0d91d4..c1abaa2e265 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/remmina/template b/srcpkgs/remmina/template index ab94530eb79..56d7a2725cf 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,9 +1,8 @@ # Template file for 'remmina' pkgname=remmina -version=1.2.0rc29 -revision=2 -_gitrev=1.2.0-rcgit.29 -wrksrc="Remmina-${_gitrev}" +version=1.2.30 +revision=1 +wrksrc="Remmina-${version}" build_style=cmake configure_args="-DWITH_APPINDICATOR=OFF" hostmakedepends="intltool pkg-config" @@ -14,10 +13,10 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel depends="desktop-file-utils hicolor-icon-theme" short_desc="Remote desktop client written in GTK+" maintainer="cr6git " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.remmina.org/wp/" -distfiles="https://github.com/FreeRDP/Remmina/archive/v${_gitrev}.tar.gz" -checksum=24fdcc8b69f8563c464b6ac77dd6bf93a1c963d90f8a114e1a3abad9af2b8682 +distfiles="https://github.com/FreeRDP/Remmina/archive/v${version}.tar.gz" +checksum=cf9528709fe531830f949bc4adcc806b86606942e7ee552fd6177fcd81d4d33f case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" ;; diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template index d6480de0cba..5d3886a740d 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 d58e74f4c97..6cf70d754b5 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 074a956bfa8..47f8300aba4 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/rinse/patches/fix-tests.patch b/srcpkgs/rinse/patches/fix-tests.patch index 6c7bb3e06b6..7a4ff0e63c8 100644 --- a/srcpkgs/rinse/patches/fix-tests.patch +++ b/srcpkgs/rinse/patches/fix-tests.patch @@ -1,4 +1,6 @@ -This fixes the notab tests by converting them to spaces +Source: maxice8 +Upstream: no (feel free to) +Reason: fixes test for tab chars --- scripts/opensuse-11.1/post-install.sh +++ scripts/opensuse-11.1/post-install.sh @@ -65,3 +67,29 @@ This fixes the notab tests by converting them to spaces fi +--- scripts/centos-7/post-install.sh ++++ scripts/centos-7/post-install.sh +@@ -39,8 +39,8 @@ install -m 600 /dev/null $prefix/var/log/tallylog + + cd $prefix/var/log + for n in messages secure maillog spooler;do +- [ -f $n ] && continue +- umask 066 && touch $n ++ [ -f $n ] && continue ++ umask 066 && touch $n + done + cd / + touch $prefix/var/log/lastlog +--- scripts/opensuse-42.2/post-install.sh ++++ scripts/opensuse-42.2/post-install.sh +@@ -38,8 +38,8 @@ gpgcheck=1 + EOF + + if [ $ARCH = "i386" ] ; then +- echo " Setting architecture to i686" +- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf ++ echo " Setting architecture to i686" ++ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf + fi + + diff --git a/srcpkgs/rinse/template b/srcpkgs/rinse/template index 3b34fa241a9..61edd615997 100644 --- a/srcpkgs/rinse/template +++ b/srcpkgs/rinse/template @@ -1,28 +1,28 @@ # Template file for 'rinse' pkgname=rinse -version=3.0.2 +version=3.3 revision=1 -wrksrc="$pkgname" -hostmakedepends="perl dpkg" +noarch=yes +build_style=gnu-makefile +hostmakedepends="dpkg" makedepends="perl" -depends="rpm wget perl-LWP" -checkdepends="${depends} perl-Test-Pod" +depends="perl-LWP rpm wget" +checkdepends="perl-LWP perl-Test-Pod rpm wget" short_desc="Bootstrap a rpm based distribution like debootstrap" maintainer="maxice8 " -license="GPL-3" +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://salsa.debian.org/debian/rinse" +#changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog" +distfiles="https://salsa.debian.org/debian/rinse/-/archive/${version}/rinse-${version}.tar.gz" +checksum=290a90a80bd8358fcaf6849a590eb14f1bb05ce81b365bd95e4d41a93be82e19 +make_check_target=test + conf_files="/etc/rinse/rinse.conf" -homepage="http://collab-maint.alioth.debian.org/rinse/" -distfiles="http://collab-maint.alioth.debian.org/rinse/download/rinse_${version}.tar.gz" -checksum=42f7cc074e84b8c99c290a2284c9de285998c100e8a77481bf14b6cd76608710 pre_install() { - sed -i 's|pod2man.*$|pod2man --release=3.0.2 --official --section=8 ./bin/rinse ./bin/rinse.8|' Makefile -} - -do_check() { - make test + sed -i "s|pod2man.*$|pod2man --release=${version} --official --section=8 ./bin/rinse ./bin/rinse.8|g" Makefile } do_install() { - make PREFIX="${DESTDIR}" sbindir="${DESTDIR}"/bin install + make ${makejobs} PREFIX="$DESTDIR" sbindir="${DESTDIR}/bin" install } diff --git a/srcpkgs/riot-desktop/template b/srcpkgs/riot-desktop/template index 424842fb7c8..a58f81b7c29 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/roxterm/template b/srcpkgs/roxterm/template index 8f9273d7cb7..0bf581713c3 100644 --- a/srcpkgs/roxterm/template +++ b/srcpkgs/roxterm/template @@ -1,23 +1,14 @@ # Template file for 'roxterm' pkgname=roxterm -version=3.3.2 -revision=2 -hostmakedepends="python-lockfile pkg-config docbook-xsl xmlto libtool itstool ImageMagick librsvg-utils po4a" +version=3.6.1 +revision=1 +build_style=cmake +hostmakedepends="ImageMagick itstool librsvg-utils libtool pkg-config po4a xmlto" makedepends="dbus-glib-devel libSM-devel vte3-devel" depends="desktop-file-utils hicolor-icon-theme" -short_desc="Tabbed, VTE-based terminal emulator" +short_desc="Highly configurable terminal emulator" maintainer="Juan RP " -license="GPL-3" -homepage="http://roxterm.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=33501d698971fe80e2756104ffa5541aff23f0ae2b718464006d912ac93c506e - -do_configure() { - python2 mscript.py configure --prefix=/usr --cc="$CC" --cpp="$CPP" --cxx="$CXX" --ld="$LD" -} -do_build() { - python2 mscript.py build --cc="$CC" --cpp="$CPP" --cxx="$CXX" --ld="$LD" --cflags="$CFLAGS" --ldflags="$LDFLAGS" -} -do_install() { - python2 mscript.py install --destdir=${DESTDIR} -} +license="GPL-2.0-or-later, LGPL-3.0-only" +homepage="https://github.com/realh/roxterm" +distfiles="https://github.com/realh/roxterm/archive/${version}.tar.gz" +checksum=29f42371194a2aa031a0a7d607cbb8e63e3c50f984e3e81590692c61978d593f diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template index 9d549cbe582..044fb669988 100644 --- a/srcpkgs/rpi-firmware/template +++ b/srcpkgs/rpi-firmware/template @@ -1,9 +1,9 @@ # Template file for 'rpi-firmware' -_githash="ce8652e2c743f02f04cb29f23611cbf13765483b" +_githash="287af2a2be0787a5d45281d1d6183a2161c798d4" _gitshort="${_githash:0:7}" pkgname=rpi-firmware -version=20180328 +version=20180505 revision=1 noarch=yes wrksrc="firmware-${_githash}" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="3-clause-BSD" homepage="https://github.com/raspberrypi/firmware" distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz" -checksum=e6dfad437e64f2925361a8927061d05764436faf2c0b412a5ae4a48995d6e8e4 +checksum=5edff641f216d2e09c75469dc2e9fc66aff290e212a1cd43ed31c499f99ea055 conf_files="/boot/cmdline.txt /boot/config.txt" @@ -38,9 +38,17 @@ do_install() { vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm done + # Firmware for rpi3 b and zero bluetooth chip + $XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43430/BCM43430A1.hcd + vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm + # Firmware for rpi3 b+ wifi chip for f in bin txt clm_blob; do $XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.${f} vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm done + + # Firmware for rpi3 b+ bluetooth chip + $XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd + vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm } diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index a2b700484a0..8ea40d51fb4 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}" @@ -28,7 +28,7 @@ noshlibprovides=yes # RPi, RPi2, RPi3 only_for_archs="armv6l armv6l-musl armv7l armv7l-musl aarch64 aarch64-musl" -hostmakedepends="perl kmod uboot-mkimage libressl bc" +hostmakedepends="perl kmod uboot-mkimage libressl-devel bc" makedepends="ncurses-devel" triggers="kernel-hooks" # These files could be modified when an external module is built. diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch index 6d228147029..b4f6f7b5ba4 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 4c7a7f32732..00000000000 --- 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 8e62cd1aa3b..285612ffb58 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 00000000000..7d50f3425f6 --- /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 665a0f96fb7..d2aa8431bc8 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/rsyslog/template b/srcpkgs/rsyslog/template index f573bbb1217..0517acb5dcd 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,24 +1,24 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=8.34.0 +version=8.35.0 revision=1 build_style=gnu-configure -configure_args="--sbindir=/usr/bin - --enable-gnutls --enable-mysql --enable-pgsql - --enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5 - --enable-imptcp --enable-mmsnmptrapd - --enable-impstats --enable-omprog --enable-omstdout - --enable-pmlastmsg --enable-pmcisconames --enable-pmaixforwardedfrom - --enable-pmsnare --enable-omuxsock --disable-generate-man-pages" +configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql + --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp + --enable-gssapi-krb5 --enable-mmsnmptrapd --enable-impstats --enable-omprog + --enable-omstdout --enable-pmlastmsg --enable-pmcisconames --enable-pmsnare + --enable-pmaixforwardedfrom --enable-omuxsock --disable-generate-man-pages + --enable-testbench" hostmakedepends="pkg-config postgresql-libs-devel" makedepends="gnutls-devel libcurl-devel libee-devel libfastjson-devel liblogging-devel libmysqlclient-devel mit-krb5-devel postgresql-libs-devel" short_desc="An Enhanced multi-threaded syslog daemon" maintainer="Juan RP " license="GPL-3.0-or-later, Apache-2.0" -homepage="http://www.rsyslog.com" +homepage="https://www.rsyslog.com" +#changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=18330a9764c55d2501b847aad267292bd96c2b12fa5c3b92909bd8d4563c80a9 +checksum=d216a7f7c88341d5964657e61a33193c13d884c988822fced9fce3ab0b1f1082 conf_files="/etc/rsyslog.conf" make_dirs="/etc/rsyslog.d 0755 root root" lib32disabled=yes diff --git a/srcpkgs/run-parts/template b/srcpkgs/run-parts/template index 4d496562bc6..c5f917492a8 100644 --- a/srcpkgs/run-parts/template +++ b/srcpkgs/run-parts/template @@ -1,17 +1,18 @@ # Template file for 'run-parts' pkgname=run-parts -version=4.8.4 +version=4.8.6 revision=1 bootstrap=yes +wrksrc="debianutils-${version}" build_style=gnu-configure make_build_target="run-parts" -wrksrc="debianutils" short_desc="Run scripts or programs in a directory" maintainer="Juan RP " +license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/debianutils" -license="GPL-2" +#changelog="http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_${version}_changelog" distfiles="${DEBIAN_SITE}/main/d/debianutils/debianutils_${version}.tar.xz" -checksum=c061ab99aea61f892043b7624b021ab5b193e9c6bbfd474da0fbcdd506be1eb2 +checksum=db09047144dadf6a35d0f28977fbef83b0dd60ca32e6c8512cce2444a6423f73 do_install() { vbin run-parts diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template index 07e770e11ea..cfcf78968d9 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 de0cc48e905..0c93db0b162 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/sbcl/template b/srcpkgs/sbcl/template index c9df0802e8e..7b7e5657c3f 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,11 +1,8 @@ # Template file for 'sbcl' pkgname=sbcl -version=1.4.7 +version=1.4.8 revision=1 only_for_archs="i686 x86_64 x86_64-musl armv7l aarch64" -case "$XBPS_TARGET_MACHINE" in - *-musl) broken=https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9674/steps/shell_3/logs/stdio ;; -esac hostmakedepends="iana-etc" makedepends="zlib-devel" @@ -15,7 +12,7 @@ maintainer="Leah Neukirchen " license="custom" homepage="http://www.sbcl.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=75e7636a138b23235c18d51ac2283eafa2826b79df4391c01105d94b92a7bdf2 +checksum=ce24b62b88482621c228a4fd6c802350330b6263e1b1b98460eeb4a81d7fb335 nocross=yes nopie=yes @@ -23,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" 7421381c592f726c9dd65672d2d390d05f600b0edfdb366416ad1d7c756536bb" + checksum+=" f0612bbf37de07c4d1213de1cdd108315da1f2251789d0278592b434fa82b044" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2" diff --git a/srcpkgs/sc-controller/template b/srcpkgs/sc-controller/template index a702a00c41a..731743a9291 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/shfmt/template b/srcpkgs/shfmt/template index acc5b13a1af..047a1fb40df 100644 --- a/srcpkgs/shfmt/template +++ b/srcpkgs/shfmt/template @@ -1,7 +1,7 @@ # Template file for 'shfmt' pkgname=shfmt -version=2.3.0 -revision=3 +version=2.4.0 +revision=1 build_style=go go_import_path="mvdan.cc/sh" go_package="${go_import_path}/cmd/shfmt" @@ -11,7 +11,7 @@ maintainer="Michael Gehring " license="BSD" homepage="https://github.com/mvdan/sh" distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz" -checksum=7fac5b1d054f39f68440b19752321a59f41085b767311bd978cdcb107730ff8e +checksum=b5f1253d51d98ccbb1cf1b71436f60f75fb2765306f0401b57c12acc0603c0e1 post_install() { vlicense LICENSE diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template index 0885c4a99e0..1eb07512693 100644 --- a/srcpkgs/sk1/template +++ b/srcpkgs/sk1/template @@ -2,7 +2,7 @@ pkgname=sk1 reverts="2.0rc3.20180316_1 2.0rc3.20180329_1" version=2.0rc3 -revision=2 +revision=3 build_style=python2-module pycompile_dirs="/usr/lib/sk1-wx-${version}" hostmakedepends="pkg-config python" diff --git a/srcpkgs/smenu/template b/srcpkgs/smenu/template index ba8762a84d6..e2cb1b9c71f 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 a0b9511ba43..1c9f0692481 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 00000000000..e7628fd0c2f --- /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 91fd3e0a9ab..ca6eaf6d91c 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 ad1d6272762..6b51d511579 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 00000000000..d3094846993 --- /dev/null +++ b/srcpkgs/ssdeep/update @@ -0,0 +1 @@ +pkgname=release diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template index 4a3cc80d776..9ef5475c225 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 00000000000..10395c809d3 --- /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 a98b366c6d2..12dc8033b7b 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 79ac004febe..78c803a3649 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 848d0a58007..a6b69299072 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/sublime-text3/template b/srcpkgs/sublime-text3/template index 067ae756e0c..b5d857871a0 100644 --- a/srcpkgs/sublime-text3/template +++ b/srcpkgs/sublime-text3/template @@ -1,13 +1,13 @@ # Template file for 'sublime-text3' pkgname=sublime-text3 -version=3143 +version=3176 revision=1 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2" - checksum=9ce120c4f28b239d3b3860ee672d9d87e1397a4c08ee6c4e62fd6e261a296519 + checksum=74f17c1aec4ddec9d4d4c39f5aec0414a4755d407a05efa571e8892e0b9cf732 else distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2" - checksum=b1ecc4b70d66b9236b876f1913c4094b6dd51436e45c74883ba70a1939e9f735 + checksum=43e49dfdbea61cc0a1b6ebcdf0ff522d8531e6998e05f4756ba4218446f85a21 fi depends="libpng gtk+ hicolor-icon-theme desktop-file-utils" maintainer="Andrea Brancaleoni " diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 80e3a9df62d..06a5a6e18a8 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider -version=3.9.1 -revision=3 +version=3.9.3 +revision=1 wrksrc=SuperCollider-Source build_style=cmake configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/supercollider/supercollider" distfiles="${homepage}/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2" -checksum=ea58ba387ae6ff52aed1ebf5c6658d145b1ec9da7ad5a1eec806accaa47d0e94 +checksum=b939964a93709d747711552d116fb935508d39ba3fb64e55a45b0210a8eb11b5 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" diff --git a/srcpkgs/supercollider/update b/srcpkgs/supercollider/update new file mode 100644 index 00000000000..db9b5430fc6 --- /dev/null +++ b/srcpkgs/supercollider/update @@ -0,0 +1 @@ +pkgname=VERSION diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template index 7ef8ce10810..1f402e5c877 100644 --- a/srcpkgs/telegraf/template +++ b/srcpkgs/telegraf/template @@ -1,7 +1,7 @@ # Template file for 'telegraf' pkgname=telegraf -version=1.5.0 -revision=5 +version=1.6.1 +revision=1 build_style="go" go_import_path="github.com/influxdata/telegraf" go_package="${go_import_path}/cmd/telegraf" @@ -13,7 +13,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="https://www.influxdata.com/time-series-platform/telegraf/" distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz" -checksum=56fc495bf2d2e1d9ff55e05896b15617f5e552bb7626a7c95c4a8922ef723c34 +checksum=5f5af61b40fd6da742813e8e865f5a9e6545cfc92d88df904e9e2488f41104c9 pre_build() { cd $GOSRCPATH diff --git a/srcpkgs/telegram-desktop/update b/srcpkgs/telegram-desktop/update index 15fc43f3054..d10075fe289 100644 --- a/srcpkgs/telegram-desktop/update +++ b/srcpkgs/telegram-desktop/update @@ -1,2 +1,3 @@ -ignore="2.* 1.12.0 1.12.1 1.11.0" +site=https://github.com/telegramdesktop/tdesktop/releases/latest +pattern='href="/telegramdesktop/tdesktop/releases/tag/v\K[\d\.]+(?=")' diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template index c7cb1ecec03..6527bb4e563 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 00000000000..f1d68892e9a --- /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 49b73d2a493..1b3e846d59d 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,13 +1,13 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.26 +version=3.27 revision=2 noarch=yes build_style=python3-module pycompile_module="thefuck" hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-colorama python3-decorator python3-psutil - python3-pyte python3-requests" +depends="python3-colorama python3-decorator python3-psutil python3-pyte + python3-requests" checkdepends="python3-colorama python3-decorator python3-psutil python3-pyte python3-pytest-mock python3-requests" short_desc="Magnificent app which corrects your previous console command" @@ -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 8dab2f65bd4..955266cae7b 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/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 990c4ce6cb5..ef4c1f1d08c 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=52.7.0 +version=52.8.0 revision=1 build_style=meta homepage="https://www.mozilla.org/thunderbird/" @@ -99,61 +99,61 @@ _pkgtmpl() { } } -checksum="8212abdbe942452369dc290b00a98954d7a713c99b60d439b3b513216760fbcb - 3d49ddaf86b0a0d2909c4fa2fdb1c1a1a150a09e70600dad2b070b6f8a737f42 - 52814d6cdd5cebcd44b9df8225d9f185882e56983896f127427b66cfc0116a0a - 39b84ae64b41ae34135e166f32e11ccbc6e1c2fefb3bbde642735c16ce8f9daf - cf2d10315603e84614052e68044e417513573c6002a2a2c3c37f651fdb52a035 - 5416998b38b8b3b18b62048929de711ca2999f8e8a45ea242c69c2e68bb9cfbd - 87bb623143d2b1f4a2fafb5c7054ffbef7c85fa24f78c415a86f97b28b39e9f0 - a2fef472427924f08a759d96bf3bb8986956ed395ee92f0a2f9ed7dee34bb6dd - f34586b7f06c42712158c4766ef3484a6985b9024d51cd546b5b19f241b6ed6f - b2c6cb1b6668e6aabd2838b4e1db74618db70b8f682de9dfc1a803ffc3b71c5c - 06b1ec1c4ace0211a51e60bcad7322299bec420d14516186dcfd9ece11548543 - 9827822895c0f228f9f253ea9434779dbc330d894c653d2821596ccf9bfa88a2 - 6a02b6c79f8be2ad43a01bdfcd8430451ed3d5ad4e9c9f5012caa98800daf36f - 595a5ef2e64984ece043d0d0d374e3d81a4f7201b632758687b9f03e1e23057c - 3b55d2377d7790675e3b68eeb4d1338a1913ff22d375183806c2bfa054dfa540 - 819be79a7473a0f3afd4825b26e3f5ba1dd6b745e7d4fb2fa6ec8bd10236e9aa - 47d591d366a50ae9f69221be2b1882546b9beaadf3962240b65e6910a9023dd8 - 1afff1eed8ebee534f87f21d675e1d3d76875f1a2bd1c1d8504c2e43e14b1dab - 0891d434e1ba57a71d0dbfd5a0f54c7bbbf0bbc5b5725671e3243aa9d836fd2c - 8f63092de10863ee4bf4c66f88e33842c987ad244d73bb2377e386730652f08d - 0d71ac2f70c3f4d117e8ed41f5c4a82e333bdfa58783e829dae179a901a24093 - 3a7de09335a80a7a846b413479b3ee069a1d74ade1c054e71fa4f4e8261e88d9 - 017e9ee7d930637f7f72633b4eeeb8cde9f44fd47cbf4564704ef8d4e6b96616 - 314d22069e8f7e5d9dc18a35e8cd8baf4bd80280f4e22e5bb7b4c5c96e482860 - 16af3293f6b01a80e31525d33c65113b445f53ae0ccd318597cc1ce686bf0cc9 - 143ddad4eaa4eab357eae17b31c86ab0fb33f5f5e112b90e144bd66249f09ec3 - 8c85aaf66eaaf806229b090665e2d3389dae2f44b96e128605bcec269460ff73 - c14a32839dba703bddaeca917a1b9abaaa254ef1a254aee75fca08bb08de7c76 - 2bdbcb919a81a905a5d29022eceb8f8b4091e1f938a666d5ea757023a27e9b68 - 01942aacb942e1fe95c119aa6904ec67ea7c2b5e7c3bb41e5678dc558bf8e4c7 - 94bd63d09400796e7001fc9a2e7930a29d0f8e338dc3a79a23368b3daa5827fb - 8ea8d3f3d7e4dac11688a2215bb512fa0e0adecdea31c391235a36d16ed2b204 - 6458c381a598cc97513c1b7b83ea2d7092b4b7b729d939d6ba1c51b91a4e1c8b - 96feb42e3ae1646d64ad74b2de7952e73a05a4302b7dde5841a32c43be859255 - 341e891e3aa85199a4da33a716d0d70fde05fba87c7ca165722f7b95f7172a67 - 7d2fe137ef7b18056a399a6768f93b9e35d543da8c1b07151d4b34f08bb287af - bd7df863f1695ac09ababad15f681ecd099d6bf7e33115adfea1be41b53e7f7c - 15c4a0bbf3fa30fa970a3870bd1e580b39bcdf217d74723ee4252b57a94be78b - 1d70ee7b991f5ab73e5aa627d8f19f93e8771a85da27abda1dc40c98a513a5da - 0becb534e4577903b84aa2fe2ce5d59ae0fc2e7daa9bcbcddf697211b5dae43e - c59eb5cae2f997a886ae0c78ade2178f92d49dfde5ec00949e409fe7eaa04025 - c8948e2776e85e9e3b56e9cf05f5cc7c5f75d325950939f5f542a3d7d4a4a638 - 1111fef71a87b7a1921201046cf186909b2fbf7f52f55f6837a2dac510a9b9e8 - fd0367417943f820620980c832a9b94613020ba9382f1f1b7137daf9e003463b - 5528eb38e8da8f83264b4387a9b5c9a7444ebb5bda9db7911c4ceeb5febcdba2 - 3a6a8680abfa01f696c4dcb25fd88a14b889c6b03866d185909b72d462b901d7 - 815c60141b335c1ecc497668343aa4fb77d378eac475bebddaef4ba4cbf552bb - c75343dcc57b2eb13c7affed446d2b59d31ed8f677995479fa37af13615f40f4 - 591aafe3714e5a0253b9210a054452b0a92a4202029d4016e0e593a54212e3aa - 7c1f9e88265233d1f39eb2ed79695c3bbeb1b1a7acab02634c0f9eab5e1280a2 - f0fa84335f0d15c972aff835a0a887e0a6816eeb14f0a096ccc987d1baf43bbc - d41d6e198cc298ed35ee76d98f305b60614069ba8774096f83fefe38cab8ae3b - 4fde53c46c3108ecdc077d4908e4c67ee1d2074e1dc793897925f4a218027069 - ca485aff2aafd544d819ab494119286a70954fead827d86d4158cfd4b493022e - c6d1de503332abe0129b1bee3fe129f20ffc6f3870058d54d2627fdf420332ad - b97c479f0e52e8429ad0f3c9195ca3005e01a9a32b1ef6c4fae6efa4e81710eb - c551cc18219c4cf979be3e32adb3dc34b3cfebd036fdde7a1148041d47418533 - 3eda9dd7b4814d142b2a1f74e0c3f9b90321fd8f6b620df83c25c780ae17e780" +checksum="babc8c7230081ec21bd44190beb667611b566ea03f6f471e2170c9f76f78c8ea + aeae96cf4baf67e1a193b4bb34b18e874f8e35025c64e51810b87b3c414b1490 + 16057e993a0f45387ab931d952af8ce1d9d22a60f211d836bad7f1d662855bbe + 834245301cc7b83eb765c2c0f819cd6a7f76b92e39c6834c009020398c0b265e + 4fdfede1ce6ca6e44f1956f2ef49e934c601ac3b12c80a6ae5a5c6c47790c131 + 93d28398d54d4e86780d479e5f239fdc516f0d5b51919777a61dface094a9512 + 945f31b9409f6231cd3512bded82522e9ffec283387cbe51dcc83cda388d51b4 + 343b7da87749497ae9a19d3fada86b5138637680807f777628b54779f0cc1f4e + bf0043033fb140bedc7f0eecc557693c165c8e1ebb939018d0b2b1f7db7a1cad + b7ae6e521b213f239d08f2e5a080e7a36d488b3454013487527e933fa21be9ad + 962b47c41d92e2855dc3bf8bae82af2b604cfbbfdae53a7d8f7a2c0766d17195 + 9825238e7cb785bac9cb94c32ab261dd0f7635df16ee96ce3cf092aab116e676 + 3954794a7df584d4a4e5561e32da2734561d7e7573a02d6d72a63b5afbe23fd4 + 78d9423758e8ae538affc4a8bed05ce0b6b27427a5333901d2387ddccdf5a30f + 5af2a9b42d1b53917f62ded2eb219ffa0347d5aabf45926a3a04b00747a1f94e + 2ddff5be5bcc95eb64044b932f6a02aadefc5000c650ca0f49088035a8ae7dad + fe57740f88c0d11e06a6e9e76f2a8e44e8a3cafd5f2eebdc4d3d81ea506e224b + 1fe4460f0e4e7f2cada39298542eb4404553656a42743df8cb1d689676f125e5 + 2a28960004cfa003f82f8a79488957f8059f3362d58226e4c246d0d9eb4786a0 + 44f394c5c84f1b5dcf7ce08b13a227170196a6b284b3249548830336be535a4e + 8187c48a4c00635faa8d2cb93cbf9f23919039c662a6c5b9be0dbbf28c2fbb7f + f64c745089a68b47664569fe6eb0ea8198dfcf28009723b97e8b242fb27287f7 + e5d64beeba305fc84e6b2eb3b2a76e91f82d40b61f0d392e4a5e3f40f94e98af + daf9941666c11babff96c8b90145366d5b8ae4291688dc86ef423b7803fa4c05 + 1e5a512e7d1cf914a3d0fc105269be70ea2ed230a9fc7688c5d13ddeb366c9d5 + 0ba6bc817dcada05ba84834693f8dc2a34a6b11325312d1cf5fb406469a9a26a + 60ada7f1d81536ff207436e5d97742b74a314b6687deda0f102d7a4afbf8e220 + a6831c6fd8667d45b82301bdbbe0acbb2b814f7785eae61c3df03b5e9f4ff44a + 2aa78f474f69a8bc2d0d8893ff18a57b2126c8888706d21c20625207bf83f0cc + 557558deeb63012f91959e975832458c753c9469a205827962f68c5f42bbfb3b + adabb413805c050e2d809116b0a7aa929dcb9ff5a8cda78e7acf6ac120953468 + bc8675a3667aabc3c438ca19c8ef5560e867579347a1bb64e3231f9a4c064c38 + 88840b998eb7320df68d23a7ad3d0451b806986cd8324cdaa2332ec186613128 + fed11dfbf56caa82c8d3b9de5a1d77a3b25ad9f3c98640735921cf3386c510f3 + 879f073ada33126d5deeaf07492835c4246480631cf7ab658f9b1ab952dbd63f + 8e6b88d22fdf2c1d724d35c452338b21c81e65fc207accb93644dc83daa5107a + dec871d230e2afd1977b8c67c8aa65ae4ea017a634c6fe891ce7f0561621cc65 + 20d6a0c950c9f225366e0a24d364ed5e8beaa6936a341c0324788cbf10142d2a + d4e02f9fc22dc237ed0b3623a9e298f177434afb0967b32721acccc3201618a5 + 661b78d3a15559e359cb948a9f5df55cc5cd9958b794f877d2836106f686f487 + 606606ea12c72fbf3bf00369d69a182ec2db369eadd245d5fc1f9365a2b18b6d + aa4a97312893ca1a3952af89711b7793e841f9e91f44f9f53612a164593dd110 + 4838816aa27dc5799e4dbfd8c491b83889c68fdbd8f1ff3220522da014e539e4 + a102c56a122fd22a1ea0a69a75ff8709d55a383595cc90b066d144d993e990f8 + 99b2f4b52c4f1dea880bfd826a119fa604885a9195039376ba092a830ef929c4 + 40119528c2301ecf0e778590026aed070e1e36929a245b8c02a69c1222d6103e + a3b8bff61f1bfda9ca7a9cbc3a04563b33c693f4853e4fe15cff2d098314e578 + 35cff3578b05c5448307ae69f1e2784598d1696ccba3ec9abccdb19c0f05f1a1 + 601baa286166d9ddebd6e0d0ed609403faa2474253b74aad0add0a9413c71c89 + a78686c96f8f04ce1bae89c60585aefbb89db6dd89ffb58d03e02de4bd8ad90b + 01c6f243d9654f3f94964121ce0472fbe81a6d3e668c88df412bad5af89c8ade + 4004249e78db033b808ab0c8153e00cef03261ebb73a95e8551bb1c6b3959e48 + e0dd273b8e68b89588dd3272f7075af7ff1d18c6426af898f516eb2e02b04887 + 6d59ed19e25dc1eb4b2dcbbad7e7adb00cf54266a77fcf237e98ec0ff78e415a + 1529750bb6eed89bea777120d049f8fe598ecad3450fac1910504479eec9cd89 + 020917361ec5336af4d52f8e4096dc8fde910aa6a7a6c7bdc8d1c575f5631a54 + 57a37a05cffc455d59a62bfcd7e3f8dda8a5373ed213c3313b564a65e0a17475 + 72f8710cfc670aa6b7983a02e6d17cf36a813a5f7d0cbfee039fc6892708f1b0" diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 7b65916547a..cba24ef2996 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,14 +3,14 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=52.7.0 +version=52.8.0 revision=1 short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="http://www.mozilla.org/thunderbird/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=82462890d393ed78c03226924a6166596b7b6d1562b5071e713a7558cd292ea3 +checksum=35b9a687997d92f36107090c1217941e5d637760b0efa7d13819cde36894eb59 only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes diff --git a/srcpkgs/tint2/template b/srcpkgs/tint2/template index 1548715c688..2de0a4bf7df 100644 --- a/srcpkgs/tint2/template +++ b/srcpkgs/tint2/template @@ -1,17 +1,17 @@ # Template file for 'tint2' pkgname=tint2 -version=16.2 +version=16.4 revision=1 -wrksrc="${pkgname}-${version}-b810bad93ff65854137fbd2f344ad2f99338008f" +wrksrc="tint2-v${version}" build_style=cmake hostmakedepends="pkg-config" -makedepends="libXdamage-devel libXcomposite-devel libXinerama-devel libXrandr-devel - gtk+-devel imlib2-devel librsvg-devel startup-notification-devel" +makedepends="gtk+-devel imlib2-devel librsvg-devel libXcomposite-devel + libXdamage-devel libXinerama-devel libXrandr-devel startup-notification-devel" depends="desktop-file-utils" -short_desc="A basic, good-looking task manager for WMs" +short_desc="Simple panel/taskbar made for modern X window managers" maintainer="Juan RP " # changelog="https://gitlab.com/o9000/tint2/blob/master/ChangeLog" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://gitlab.com/o9000/tint2" -distfiles="https://gitlab.com/o9000/${pkgname}/repository/${version}/archive.tar.gz>${pkgname}-${version}.tar.gz" -checksum=4b2253d4e76743d6a9c79db3e95792673528e41d0eddc1ee23db2e8d58a2e80b +distfiles="https://gitlab.com/o9000/tint2/-/archive/v${version}/tint2-v${version}.tar.bz2" +checksum=95ee08ee98212a8390db7b549616ae0a5c29462825bea502bc28f8f31523a890 diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index 4f8ec9506c6..707cc2a7477 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 95dc33542d8..2a31e87526e 100644 --- a/srcpkgs/udiskie/template +++ b/srcpkgs/udiskie/template @@ -1,19 +1,19 @@ # Template file for 'udiskie' pkgname=udiskie -version=1.7.3 +version=1.7.5 revision=1 noarch=yes build_style=python3-module pycompile_module="udiskie" hostmakedepends="python3-setuptools" -depends="udisks2 python3-gobject python3-yaml python3-docopt gtk+3 libnotify - python3-keyutils" +depends="gtk+3 libnotify python3-docopt python3-gobject python3-keyutils + python3-yaml udisks2" short_desc="Removable disk automounter using udisks" maintainer="Matthias Fulz " -homepage="https://github.com/coldfix/udiskie" license="MIT" +homepage="https://github.com/coldfix/udiskie" distfiles="https://github.com/coldfix/udiskie/archive/${version}.tar.gz" -checksum=abb7d18bf562a41d26cf18c1d39d5a50fb6087c5b41c1ec9605a8b9bd083d8a6 +checksum=5754222ad9f0aa8bc4eb4f528caa441460ebfaef7f724ad540bdef62fb4ceb90 post_install() { vlicense COPYING diff --git a/srcpkgs/uncrustify/template b/srcpkgs/uncrustify/template index d7b7f92112b..1eaad1c6e6e 100644 --- a/srcpkgs/uncrustify/template +++ b/srcpkgs/uncrustify/template @@ -1,6 +1,6 @@ # Template file for 'uncrustify' pkgname=uncrustify -version=0.66.1 +version=0.67 revision=1 build_style=cmake create_wrksrc=yes @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://uncrustify.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=4b36dabcb33cfc286d79ea8fcb5babadf1d0a25eb5eb7ea9da650414325063e4 +checksum=54f15c8ebddef120522db21f38fac1dd3b0a285fbf60a8b71f9e333e96cf6ddc do_check() { make -C build test diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template index cfbb8c15315..97453e72c85 100644 --- a/srcpkgs/upower/template +++ b/srcpkgs/upower/template @@ -1,7 +1,7 @@ # Template file for 'upower' pkgname=upower version=0.99.7 -revision=2 +revision=4 build_style=gnu-configure configure_args="--disable-static --with-backend=linux" hostmakedepends="pkg-config intltool libxslt docbook-xsl $(vopt_if gir gobject-introspection)" @@ -9,10 +9,12 @@ makedepends="libusb-devel libgudev-devel dbus-glib-devel libimobiledevice-devel conf_files="/etc/UPower/UPower.conf" short_desc="Abstraction for enumerating power devices" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://upower.freedesktop.org" distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz" checksum=24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401 + +provides="upower0-${version}_${revision}" replaces="upower0>=0" # Package build options @@ -29,6 +31,8 @@ libupower-glib3_package() { } } upower-devel_package() { + provides="upower0-devel-${version}_${revision}" + replaces="upower0-devel>=0" depends="dbus-glib-devel libupower-glib3>=${version}_${revision}" short_desc+=" - development files" pkg_install() { @@ -40,10 +44,3 @@ upower-devel_package() { vmove "usr/lib/*.so" } } - -upower0_package() { - build_style=meta - noarch=yes - depends="upower>=$version" - short_desc+=" - transitional dummy package" -} diff --git a/srcpkgs/upower0 b/srcpkgs/upower0 deleted file mode 120000 index 9df007da7f1..00000000000 --- a/srcpkgs/upower0 +++ /dev/null @@ -1 +0,0 @@ -upower \ No newline at end of file diff --git a/srcpkgs/libupower-glib1 b/srcpkgs/upower0-devel similarity index 100% rename from srcpkgs/libupower-glib1 rename to srcpkgs/upower0-devel diff --git a/srcpkgs/upower0/template b/srcpkgs/upower0/template new file mode 100644 index 00000000000..07916918511 --- /dev/null +++ b/srcpkgs/upower0/template @@ -0,0 +1,17 @@ +# Template file for 'upower0' +pkgname=upower0 +reverts="0.99.7_3 0.99.7_2" +version=0.9.23 +revision=11 +build_style=meta +depends="upower>=${version}_${revision}" +short_desc="Abstraction for enumerating power devices (transitional dummy package)" +maintainer="Juan RP " +homepage="https://upower.freedesktop.org" +license="GPL-2" + +upower0-devel_package() { + build_style=meta + short_desc+=" - development files" + depends="upower-devel>=${version}_${revision}" +} diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template index b29feb2b71b..7c52fbd299d 100644 --- a/srcpkgs/urlwatch/template +++ b/srcpkgs/urlwatch/template @@ -1,6 +1,6 @@ # Template file for 'urlwatch' pkgname=urlwatch -version=2.9 +version=2.11 revision=1 noarch=yes build_style=python3-module @@ -8,12 +8,17 @@ pycompile_module="urlwatch" hostmakedepends="python3-setuptools" depends="python3-appdirs python3-keyring python3-minidb python3-requests python3-yaml" +checkdepends="python3-nose ${depends} python3-pycodestyle" short_desc="Tool for monitoring webpages for updates" maintainer="Eivind Uggedal " license="BSD-3-Clause" homepage="https://thp.io/2008/urlwatch/" distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz" -checksum=0d15aaeec64122b388ab88bfbe400aa75e90f40a122ccdabcd73f0f1881b65bf +checksum=18a498e7e1defdee855732c3a0606956fefcebdb95c567e4780c313cba7b2c4d + +do_check() { + nosetests3 +} post_install() { vlicense COPYING diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template index 4ddef26e6bc..4d85c89d7c5 100644 --- a/srcpkgs/usbutils/template +++ b/srcpkgs/usbutils/template @@ -1,18 +1,19 @@ # Template file for 'usbutils' pkgname=usbutils -version=009 +version=010 revision=1 build_style=gnu-configure configure_args="--datadir=/usr/share/hwdata --disable-zlib" hostmakedepends="pkg-config" -makedepends="libusb-devel eudev-libudev-devel" +makedepends="eudev-libudev-devel libusb-devel" depends="hwids" -homepage="http://linux-usb.sourceforge.net/" short_desc="Linux USB utilities" maintainer="Juan RP " -license="GPL-2" -distfiles="${KERNEL_SITE}/utils/usb/$pkgname/${pkgname}-${version}.tar.xz" -checksum=8bbff0e54cb5f65a52be4feb9162fc0b022a97eb841b44784f7a89a9ea567160 +license="GPL-2.0-only" +homepage="http://linux-usb.sourceforge.net/" +#changelog="https://raw.githubusercontent.com/gregkh/usbutils/master/NEWS" +distfiles="${KERNEL_SITE}/utils/usb/usbutils/usbutils-${version}.tar.xz" +checksum=61c7364bb4986fb05e5067e4ac5585b1299b664c57f761caecd2e9e724794a19 post_install() { # Remove lsusb.py - avoid useless python scripts diff --git a/srcpkgs/uzbl/template b/srcpkgs/uzbl/template index 749378c4743..1d94f67e406 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 502270e0246..4df453f9cb7 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 0632a6d1874..e77a90219de 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/vim/template b/srcpkgs/vim/template index 097251ae71f..da477b1a6c5 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,6 @@ # Template file for 'vim' pkgname=vim -version=8.0.1722 +version=8.1.0000 revision=1 hostmakedepends="glib-devel pkg-config" makedepends="acl-devel gtk+-devel libXt-devel lua-devel ncurses-devel @@ -11,7 +11,7 @@ maintainer="Juan RP " license="Vim" homepage="https://www.vim.org" distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz" -checksum=3811609292bd0f5455c305d3ca677c181643f6abdce0654d322fa2c00cea3483 +checksum=c8351001df6d8ccdd48ab7fa0d90de8a5c874be339313ba65c0025ebf72c2059 subpackages="xxd vim-common vim-x11 gvim" # XXX vim-huge cannot be cross compiled for now. diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index d3bfb3fd6db..4707311f082 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-live555 --disable-fluidsynth --enable-dvdread 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 0f529ec025d..00000000000 --- 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 9149475c049..00000000000 --- 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 f9c24fbf3d9..32c04a19c52 100644 --- a/srcpkgs/volume_key/template +++ b/srcpkgs/volume_key/template @@ -1,8 +1,9 @@ # Template file for 'volume_key' pkgname=volume_key -version=0.3.9 -revision=4 +version=0.3.10 +revision=2 build_style=gnu-configure +make_build_args="PYTHON_CPPFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7" hostmakedepends="pkg-config python-devel" makedepends="cryptsetup-devel glib-devel gpgme-devel nss-devel python-devel" short_desc="Library for manipulating storage volume encryption keys" @@ -10,24 +11,20 @@ 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 - -if [ -n "$CROSS_BUILD" ]; then - make_build_args+=" PYTHON_CPPFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7" -fi +checksum=c5729de7e33e39c8674e9aae2337d2719f9298d6499f1656d0d25a065a7e98a7 volume_key-python_package() { - short_desc+=" - python bindings" - depends="${sourcepkg}>=${version}_${revision}" + lib32disabled=yes + pycompile_module="volume_key.py" + short_desc+=" - Python2 bindings" pkg_install() { - vmove "usr/lib/python*" + vmove "usr/lib/python2*" } } volume_key-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision} - ${sourcepkg}-python>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/*.so diff --git a/srcpkgs/wget/patches/0001-Fix-logging-in-background-mode.patch b/srcpkgs/wget/patches/0001-Fix-logging-in-background-mode.patch deleted file mode 100644 index 9f09c320a59..00000000000 --- a/srcpkgs/wget/patches/0001-Fix-logging-in-background-mode.patch +++ /dev/null @@ -1,76 +0,0 @@ -From c722973212547aa812cd818279e3fb989fb38dd4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Wed, 7 Feb 2018 22:33:06 +0100 -Subject: [PATCH] Fix logging in background mode -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* ../src/main.c: Re-init logfile if changed for background mode -* ../src/utils.c: fork_to_background() returns whether logfile changed -* ../src/utils.h: Set return type bool for fork_to_background() - -Fixes: #53020 -Reported-by: Noël Köthe ---- - src/main.c | 7 ++++++- - src/utils.c | 4 +++- - src/utils.h | 2 +- - 3 files changed, 10 insertions(+), 3 deletions(-) - -diff --git src/main.c src/main.c -index 0ffd551a..5430e7ce 100644 ---- src/main.c -+++ src/main.c -@@ -1880,7 +1880,12 @@ for details.\n\n")); - sock_init(); - #else - if (opt.background) -- fork_to_background (); -+ { -+ bool logfile_changed = fork_to_background (); -+ -+ if (logfile_changed) -+ log_init (opt.lfilename, append_to_log); -+ } - #endif - - /* Initialize progress. Have to do this after the options are -diff --git src/utils.c src/utils.c -index 6f41fabe..2d265c11 100644 ---- src/utils.c -+++ src/utils.c -@@ -469,7 +469,7 @@ fork_to_background (void) - #else /* def __VMS */ - - #if !defined(WINDOWS) && !defined(MSDOS) --void -+bool - fork_to_background (void) - { - pid_t pid; -@@ -514,6 +514,8 @@ fork_to_background (void) - DEBUGP (("Failed to redirect stdout to /dev/null.\n")); - if (freopen ("/dev/null", "w", stderr) == NULL) - DEBUGP (("Failed to redirect stderr to /dev/null.\n")); -+ -+ return logfile_changed; - } - #endif /* !WINDOWS && !MSDOS */ - -diff --git src/utils.h src/utils.h -index 66838f2c..26e2c28c 100644 ---- src/utils.h -+++ src/utils.h -@@ -71,7 +71,7 @@ char *xstrdup_lower (const char *); - char *strdupdelim (const char *, const char *); - char **sepstring (const char *); - bool subdir_p (const char *, const char *); --void fork_to_background (void); -+bool fork_to_background (void); - - char *aprintf (const char *, ...) GCC_FORMAT_ATTR (1, 2); - char *concat_strings (const char *, ...); --- -2.16.1 - diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index 5f1c288f8fa..e2c47d11a50 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -1,21 +1,22 @@ # Template file for 'wget' pkgname=wget -version=1.19.4 -revision=4 +version=1.19.5 +revision=1 build_style=gnu-configure configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')" hostmakedepends="perl pkg-config" -makedepends="$(vopt_if ssl libressl-devel) $(vopt_if gnutls gnutls-devel) - libidn-devel libuuid-devel pcre-devel" +makedepends="libidn-devel libuuid-devel pcre-devel + $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')" checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL" depends="ca-certificates" -conf_files="/etc/wgetrc" short_desc="The GNU wget download utility" maintainer="Juan RP " +license="GPL-3.0-or-later" +#changelog="https://git.savannah.gnu.org/cgit/wget.git/plain/NEWS" homepage="http://www.gnu.org/software/wget/wget.html" -license="GPL-3" distfiles="${GNU_SITE}/wget/wget-${version}.tar.gz" -checksum=93fb96b0f48a20ff5be0d9d9d3c4a986b469cb853131f9d5fe4cc9cecbc8b5b5 +checksum=b39212abe1a73f2b28f4c6cb223c738559caac91d6e416a6d91d4b9d55c9faee +conf_files="/etc/wgetrc" build_options="gnutls ssl" build_options_default="ssl" diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template index c7c785024b8..382c847911b 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 a57305edff4..eb040062cff 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 53d3f0aac5e..baef9b4b911 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 new file mode 100644 index 00000000000..56f4ca7e84e --- /dev/null +++ b/srcpkgs/wireguard-go/template @@ -0,0 +1,20 @@ +# Template file for 'wireguard-go' +pkgname=wireguard-go +version=0.0.20180524 +revision=1 +build_style=go +go_import_path="git.zx2c4.com/wireguard-go" +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=1d539f6c51dd33098a536af0285ef03c561db0ff343f23a75405207fcf48ec3e + +pre_build() { + rm donotuseon_linux.go + cd ${GOSRCPATH} + dep ensure -vendor-only -v +} diff --git a/srcpkgs/wireguard-go/update b/srcpkgs/wireguard-go/update new file mode 100644 index 00000000000..70ee5e56716 --- /dev/null +++ b/srcpkgs/wireguard-go/update @@ -0,0 +1,2 @@ +site='https://git.zx2c4.com/wireguard-go/' +pattern='wireguard-go-\K[\d.]*\d' diff --git a/srcpkgs/wireguard-tools b/srcpkgs/wireguard-tools new file mode 120000 index 00000000000..021f6472a7b --- /dev/null +++ b/srcpkgs/wireguard-tools @@ -0,0 +1 @@ +wireguard \ No newline at end of file diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index ac547a47f42..192ce250d24 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -1,19 +1,19 @@ # Template file for 'wireguard' pkgname=wireguard -version=0.0.20180514 +version=0.0.20180524 revision=1 wrksrc="WireGuard-${version}" build_wrksrc="src/tools" build_style=gnu-makefile make_install_args="WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes" makedepends="libmnl-devel" -depends="dkms" +depends="dkms wireguard-tools" short_desc="Fast, modern, secure VPN tunnel" 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=e895b65e06e85429403be3d1987577a6967476b069f0ff53caead6f682f466da +checksum=57614239c1f1a99a367f2c816153acda5bffada66a3b8e3b8215f1625784abc9 triggers="dkms" dkms_modules="wireguard ${version}" @@ -25,3 +25,16 @@ post_install() { make -C .. DESTDIR="${DESTDIR}" \ DKMSDIR="/usr/src/wireguard-${version}/" dkms-install } + +wireguard-tools_package() { + short_desc+=" - tools" + depends="openresolv" + pkg_install() { + vmove usr/bin/wg + vmove usr/bin/wg-quick + vmove usr/share/bash-completion/completions/wg + vmove usr/share/bash-completion/completions/wg-quick + vmove usr/share/man/man8/wg-quick.8 + vmove usr/share/man/man8/wg.8 + } +} diff --git a/srcpkgs/x265/patches/fix-cross.patch b/srcpkgs/x265/patches/fix-cross.patch new file mode 100644 index 00000000000..e31968a5a80 --- /dev/null +++ b/srcpkgs/x265/patches/fix-cross.patch @@ -0,0 +1,11 @@ +--- source/common/param.cpp.orig 2018-05-28 11:05:41.571934454 +0200 ++++ source/common/param.cpp 2018-05-28 11:05:47.109929916 +0200 +@@ -633,7 +633,7 @@ int x265_param_parse(x265_param* p, cons + if (bValueWasNull) + p->cpuid = atobool(value); + else +- p->cpuid = parseCpuName(value, bError); ++ p->cpuid = parseCpuName(value, bError, false); + #endif + } + OPT("fps") diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index 379d08bf955..932ced458ec 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -1,25 +1,25 @@ # Template file for 'x265' pkgname=x265 -version=2.7 -revision=1 -build_style=cmake +version=2.8 +revision=2 build_wrksrc="source" wrksrc="x265_${version}" +build_style=cmake configure_args="-DENABLE_PIC=1" hostmakedepends="yasm" short_desc="Open Source H.265/HEVC video encoder" maintainer="Juan RP " +license="GPL-2.0-or-later" homepage="http://x265.org/" -license="GPL-2" distfiles="https://bitbucket.org/multicoreware/x265/downloads/x265_${version}.tar.gz" -checksum=d5e75fa62ffe6ed49e691f8eb8ab8c1634ffcc0725dd553c6fdb4d5443b494a2 +checksum=6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=${CROSS_BUILD%-musl}" fi pre_configure() { - if [ -n "$CROSS_BUILD" ]; then + if [ "$CROSS_BUILD" ]; then sed -i CMakeLists.txt -e "s; -mcpu=native;;" fi } @@ -30,6 +30,6 @@ x265-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a + vmove "usr/lib/*.a" } } diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template index 5b7b8d2da04..29ac8fe70fc 100644 --- a/srcpkgs/xapps/template +++ b/srcpkgs/xapps/template @@ -1,6 +1,6 @@ # Template file for 'xapps' pkgname=xapps -version=1.2.0 +version=1.2.1 revision=1 build_style=meson hostmakedepends="glib-devel gnome-common pkg-config vala" @@ -10,9 +10,10 @@ depends="gist inxi xfconf" short_desc="Cross-desktop libraries and common resources from Linux Mint" maintainer="Michael Aldridge " license="GPL-3.0-or-later, LGPL-3.0-or-later" +#changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog" homepage="https://github.com/linuxmint/xapps" distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz" -checksum=94a80164627bab115f44e5c7fd994cdb13e75162fa64a64301afcca2483706e7 +checksum=daf41acb021b4dfb1b313710eea812e315a9f49e6a2cc037691ec51799f4cf26 xapps-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template index d51597f25db..75866452b67 100644 --- a/srcpkgs/xdg-utils/template +++ b/srcpkgs/xdg-utils/template @@ -12,6 +12,7 @@ homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/" #changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog" distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz" checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9 +make_check_target=test post_install() { vlicense LICENSE diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template index 0651bf716c0..14a945f3745 100644 --- a/srcpkgs/xf86-video-amdgpu/template +++ b/srcpkgs/xf86-video-amdgpu/template @@ -1,14 +1,14 @@ # Template build file for 'xf86-video-amdgpu'. pkgname=xf86-video-amdgpu version=18.0.1 -revision=1 +revision=2 lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-23_1 mesa-ati-dri" +depends="virtual?xserver-abi-video-24_1 mesa-ati-dri" short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index 76bd25d1405..767b0d70399 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -1,14 +1,14 @@ # Template build file for 'xf86-video-ati'. pkgname=xf86-video-ati version=18.0.1 -revision=1 +revision=2 lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-23_1 mesa-ati-dri" +depends="virtual?xserver-abi-video-24_1 mesa-ati-dri" short_desc="Xorg ATI Radeon video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template index 1682e26942a..d4ea325a8cc 100644 --- a/srcpkgs/xf86-video-cirrus/template +++ b/srcpkgs/xf86-video-cirrus/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-cirrus'. pkgname=xf86-video-cirrus version=1.5.3 -revision=5 +revision=6 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-23_1" +depends="virtual?xserver-abi-video-24_1" short_desc="Xorg Cirrus Logic video driver" homepage="http://xorg.freedesktop.org" license="MIT" diff --git a/srcpkgs/xf86-video-dummy/template b/srcpkgs/xf86-video-dummy/template index 36a4837e5bb..234d38ab475 100644 --- a/srcpkgs/xf86-video-dummy/template +++ b/srcpkgs/xf86-video-dummy/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-dummy'. pkgname=xf86-video-dummy version=0.3.8 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-23_1" +depends="virtual?xserver-abi-video-24_1" short_desc="Xorg dummy video driver" homepage="http://xorg.freedesktop.org" license="MIT" diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template index 6251884d564..c7058073441 100644 --- a/srcpkgs/xf86-video-fbdev/template +++ b/srcpkgs/xf86-video-fbdev/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-fbdev'. pkgname=xf86-video-fbdev version=0.4.4 -revision=9 +revision=10 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-23_1" +depends="virtual?xserver-abi-video-24_1" short_desc="Xorg framebuffer video driver" homepage="http://xorg.freedesktop.org" license="MIT" diff --git a/srcpkgs/xf86-video-fbturbo-sunxi/template b/srcpkgs/xf86-video-fbturbo-sunxi/template index be76903108e..e72badef53a 100644 --- a/srcpkgs/xf86-video-fbturbo-sunxi/template +++ b/srcpkgs/xf86-video-fbturbo-sunxi/template @@ -1,20 +1,20 @@ -# Template build file for 'xf86-video-fbturbo-sunxi'. +# Template file for 'xf86-video-fbturbo-sunxi' pkgname=xf86-video-fbturbo-sunxi version=0.4.0 -revision=4 +revision=5 wrksrc="${pkgname%-sunxi}-${version}" build_style=gnu-configure +hostmakedepends="pkg-config xorg-server-devel" +makedepends="libXrandr-devel libump-devel-git xorg-server-devel" +depends="virtual?xserver-abi-video-24_1 sunxi-mali" short_desc="Xorg DDX driver for Allwinner SoC (A10/A13/A20)" homepage="http://github.com/ssvb/xf86-video-fbturbo" -license="MIT, GPL" +license="MIT, GPL-2.0-or-later" maintainer="Juan RP " distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f only_for_archs="armv7l" -hostmakedepends="pkg-config xorg-server-devel" -makedepends="libXrandr-devel libump-devel-git xorg-server-devel" -depends="virtual?xserver-abi-video-23_1 sunxi-mali" conflicts="xf86-video-fbturbo>=0" LDFLAGS="-Wl,-z,lazy" @@ -22,6 +22,8 @@ LDFLAGS="-Wl,-z,lazy" pre_configure() { cp /usr/include/xorg/dri2.h src } + post_install() { vinstall xorg.conf 644 usr/share/X11/xorg.conf.d 99-fbturbo.conf + vlicense COPYING } diff --git a/srcpkgs/xf86-video-fbturbo/template b/srcpkgs/xf86-video-fbturbo/template index 5ad5a8aeb30..b95ef3f0bda 100644 --- a/srcpkgs/xf86-video-fbturbo/template +++ b/srcpkgs/xf86-video-fbturbo/template @@ -1,11 +1,11 @@ # Template build file for 'xf86-video-fbturbo'. pkgname=xf86-video-fbturbo version=0.4.0 -revision=15 +revision=16 build_style=gnu-configure short_desc="Xorg DDX driver for ARM devices (RaspberryPi/Allwinner)" homepage="http://github.com/ssvb/xf86-video-fbturbo" -license="MIT, GPL" +license="MIT, GPL-2.0-or-later" maintainer="Juan RP " distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f @@ -13,10 +13,11 @@ checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" hostmakedepends="pkg-config xorg-server-devel" makedepends="libXrandr-devel xorg-server-devel" -depends="virtual?xserver-abi-video-23_1" +depends="virtual?xserver-abi-video-24_1" LDFLAGS="-Wl,-z,lazy" post_install() { vinstall xorg.conf 644 usr/share/X11/xorg.conf.d 99-fbturbo.conf + vlicense COPYING } diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index cd2bfe09a8a..7769230e24a 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -1,19 +1,20 @@ # Template file for 'xf86-video-intel' pkgname=xf86-video-intel -version=2.99.917.829 -revision=1 -_commit=d7dfab62a9853b44bbcd67dac08391d8e5114c97 +version=2.99.917.831 +revision=2 +_commit=e7bfc9065345085f767235eea8b148c356e5bd2b lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-configure configure_args="--with-default-dri=3" hostmakedepends="git automake libtool pkg-config xorg-util-macros" makedepends="libXvMC-devel xorg-server-devel" -depends="virtual?xserver-abi-video-23_1 mesa-intel-dri" +depends="virtual?xserver-abi-video-24_1 mesa-intel-dri" short_desc="Xorg DDX Intel video driver" maintainer="Juan RP " homepage="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel" license="MIT" +lib32disabled=yes LDFLAGS="-Wl,-z,lazy" @@ -22,9 +23,11 @@ do_fetch() { cd ${wrksrc} git reset --hard $_commit } + pre_configure() { NOCONFIGURE=1 ./autogen.sh } + post_install() { vlicense COPYING } diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template index 2d4a9a71a60..734515e91e6 100644 --- a/srcpkgs/xf86-video-mga/template +++ b/srcpkgs/xf86-video-mga/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-mga'. pkgname=xf86-video-mga version=1.6.5 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure hostmakedepends="automake libtool pkg-config xorg-util-macros" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-23_1" +depends="virtual?xserver-abi-video-24_1" nocross=yes short_desc="Xorg Matrox Graphics Adapter video driver" homepage="http://xorg.freedesktop.org" diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index d4c9a741c74..2144857ea33 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -1,13 +1,13 @@ # Template build file for 'xf86-video-nouveau'. pkgname=xf86-video-nouveau version=1.0.15 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure only_for_archs="i686 i686-musl x86_64 x86_64-musl" hostmakedepends="pkg-config" makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel" -depends="virtual?xserver-abi-video-23_1 mesa-nouveau-dri" +depends="virtual?xserver-abi-video-24_1 mesa-nouveau-dri" short_desc="Xorg opensource NVIDIA video driver" maintainer="Juan RP " homepage="http://nouveau.freedesktop.org/wiki/" diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template index 922baba7660..24c0402b99e 100644 --- a/srcpkgs/xf86-video-openchrome/template +++ b/srcpkgs/xf86-video-openchrome/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-openchrome'. pkgname=xf86-video-openchrome version=0.6.0 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel libXvMC-devel" -depends="virtual?xserver-abi-video-23_1" +depends="virtual?xserver-abi-video-24_1" short_desc="Xorg driver for VIA IGPs" homepage="http://xorg.freedesktop.org" license="MIT" @@ -17,6 +17,10 @@ checksum=da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75 CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg" LDFLAGS="-Wl,-z,lazy" +case "$XBPS_TARGET_MACHINE" in + arm*|aarch*) broken="requires sarea.h which isn't present in cross-compiled arm" ;; +esac + post_install() { vlicense COPYING } diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template index 7c15273df5c..5827cd1850c 100644 --- a/srcpkgs/xf86-video-sisusb/template +++ b/srcpkgs/xf86-video-sisusb/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-sisusb'. pkgname=xf86-video-sisusb version=0.9.7 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-23_1" +depends="virtual?xserver-abi-video-24_1" short_desc="Xorg SiS USB video driver" homepage="http://xorg.freedesktop.org/" license="MIT" diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template index 36131ffdb4d..a7683454527 100644 --- a/srcpkgs/xf86-video-vesa/template +++ b/srcpkgs/xf86-video-vesa/template @@ -1,12 +1,12 @@ # Template build file for 'xf86-video-vesa'. pkgname=xf86-video-vesa version=2.4.0 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" -depends="virtual?xserver-abi-video-23_1" +depends="virtual?xserver-abi-video-24_1" short_desc="Xorg VESA video driver" homepage="http://xorg.freedesktop.org" license="MIT" diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index 6845ca06d5a..380b0f48999 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -1,20 +1,20 @@ -# Template build file for 'xf86-video-vmware'. +# Template build file for 'xf86-video-vmware' pkgname=xf86-video-vmware -version=13.2.1 -revision=2 +version=13.3.0 +revision=1 lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" build_style=gnu-configure configure_args="--enable-vmwarectrl-client" hostmakedepends="pkg-config" makedepends="libdrm-devel MesaLib-devel xorg-server-devel" -depends="virtual?xserver-abi-video-23_1 mesa-vmwgfx-dri" +depends="virtual?xserver-abi-video-24_1 mesa-vmwgfx-dri" short_desc="Modular Xorg VMware virtual video driver" maintainer="Juan RP " -homepage="http://xorg.freedesktop.org" license="MIT" +homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -checksum=e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b +checksum=47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index 2961c64a54e..235e011ab62 100644 --- a/srcpkgs/xfce4-terminal/template +++ b/srcpkgs/xfce4-terminal/template @@ -1,14 +1,14 @@ # Template file for 'xfce4-terminal' pkgname=xfce4-terminal -version=0.8.7.3 +version=0.8.7.4 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool" -makedepends="dbus-glib-devel exo-devel vte3-devel libxfce4ui-devel" -depends="hicolor-icon-theme desktop-file-utils" +hostmakedepends="intltool pkg-config" +makedepends="exo-devel vte3-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="A modern terminal emulator primarly for the Xfce desktop environment" maintainer="Juan RP " -homepage="https://www.xfce.org" license="GPL-2.0-or-later" +homepage="https://www.xfce.org" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.bz2" -checksum=dafa155177934fc7dce2d4efb33402f74b1a593a17ff17d2187a6429f599dfd6 +checksum=a88f98af4da72394f2cfbd7f14b0f053ec0a3b58a4f6a577836357c60a6c42ab diff --git a/srcpkgs/xl2tpd/template b/srcpkgs/xl2tpd/template index f0cad2ff5bb..022522b075b 100644 --- a/srcpkgs/xl2tpd/template +++ b/srcpkgs/xl2tpd/template @@ -1,6 +1,6 @@ # Template file for 'xl2tpd' pkgname=xl2tpd -version=1.3.11 +version=1.3.12 revision=1 makedepends="libpcap-devel" short_desc="Open source implementation of the Layer 2 Tunnelling Protocol" @@ -9,7 +9,7 @@ license="GPL-2.0-or-later" homepage="https://www.xelerance.com/services/software/xl2tpd/" #changelog="https://github.com/xelerance/xl2tpd/blob/master/CHANGES" distfiles="https://github.com/xelerance/xl2tpd/archive/v${version}.tar.gz" -checksum=f7373538490e6a2a4d69f81eac321edb1c2428430e4ba7abb66c35bb8f3dadf5 +checksum=6f0ac50a76500d5cc56a67451b61e5f561b3309357176b39deabb1705e8745fd conf_files=" /etc/${pkgname}/${pkgname}.conf diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index e6082b445ea..c2fd06ebbe8 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,45 +1,39 @@ # Template file for 'xorg-server' pkgname=xorg-server -version=1.19.6 -revision=4 +version=1.20.0 +revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-record --enable-xorg --enable-xnest --enable-xephyr --enable-composite --enable-xvfb - --disable-static --disable-config-hal --disable-xfbdev --disable-xfake - --enable-config-udev --enable-config-udev-kms - --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb - --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto - --enable-dmx --enable-kdrive-mouse - --enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd - --disable-linux-acpi --disable-linux-apm - --enable-suid-wrapper --with-shared-memory-dir=/dev/shm + --disable-static --disable-config-hal --enable-config-udev + --enable-config-udev-kms --with-xkb-path=/usr/share/X11/xkb + --with-xkb-output=/var/lib/xkb --with-fontrootdir=/usr/share/fonts/X11 + --with-sha1=libcrypto --enable-dmx --enable-kdrive --disable-linux-acpi + --disable-linux-apm --enable-suid-wrapper --with-shared-memory-dir=/dev/shm --without-systemd-daemon --enable-xcsecurity" +hostmakedepends="flex perl pkg-config wayland-devel" +makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel + libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel + libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel + libxkbui-devel pixman-devel wayland-devel wayland-protocols + xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel + xcb-util-wm-devel" +# See hw/xfree86/common/xf86Module.h. Only care for the major version. +depends="xkeyboard-config" short_desc="The X11 server from X.org" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" -license="MIT, BSD" +license="MIT, BSD-3-Clause" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2" -checksum=a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197 - +checksum=9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6 lib32disabled=yes - -hostmakedepends="pkg-config perl flex" -makedepends=" - xorgproto xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel - eudev-libudev-devel libressl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel - libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel - libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel - libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel - wayland-devel wayland-protocols libepoxy-devel xcb-util-renderutil-devel - libXfont2-devel" -# See hw/xfree86/common/xf86Module.h. Only care for the major version. -depends="xkeyboard-config" -provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-23_1 xf86-video-modesetting-1_1" +provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1" replaces="xf86-video-modesetting>=0" subpackages="xorg-server-devel xorg-server-xdmx xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-server" +conf_files="/etc/X11/Xwrapper.config" case "$XBPS_TARGET_MACHINE" in -i686*|x86_64*) +i686*|x86_64*|aarch64*) # Enable glamor/dri/opengl/xwayland by default on x86. configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx --enable-xwayland" makedepends+=" MesaLib-devel" @@ -53,7 +47,6 @@ i686*|x86_64*) ;; esac -conf_files="/etc/X11/Xwrapper.config" # Symbols must be resolved lazily for modules to work. # See https://bugs.freedesktop.org/show_bug.cgi?id=41208#c5 @@ -66,6 +59,7 @@ pre_configure() { ;; esac } + post_install() { case "$XBPS_TARGET_MACHINE" in *-musl) vinstall ${FILESDIR}/20-modules.conf 644 usr/share/X11/xorg.conf.d;; @@ -91,12 +85,14 @@ xorg-server-xdmx_package() { vmove usr/share/man/man1/*dmx* } } + xorg-server-xwayland_package() { short_desc="A nested X server that runs as a wayland client" pkg_install() { vmove usr/bin/Xwayland } } + xorg-server-xnest_package() { short_desc="A nested X server that runs as an X application" pkg_install() { @@ -104,6 +100,7 @@ xorg-server-xnest_package() { vmove usr/share/man/man1/Xnest.1 } } + xorg-server-xephyr_package() { short_desc="X server outputting to a window on a pre-existing X display" pkg_install() { @@ -111,6 +108,7 @@ xorg-server-xephyr_package() { vmove usr/share/man/man1/Xephyr.1 } } + xorg-server-xvfb_package() { short_desc="Virtual framebuffer X server" depends="xkeyboard-config" @@ -119,6 +117,7 @@ xorg-server-xvfb_package() { vmove usr/share/man/man1/Xvfb.1 } } + xorg-server-devel_package() { depends="${makedepends}" short_desc+=" - development files" diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index e190383b633..9b45a73461a 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,14 +1,14 @@ # Template file for 'xpra' pkgname=xpra version=2.3 -revision=1 +revision=2 build_style=python2-module pycompile_module="xpra" hostmakedepends="pkg-config python-Cython" makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel libvpx-devel libwebp-devel libxkbfile-devel pygtk-devel x264-devel" -depends="cups pygtk python-Pillow python-PyOpenGL-accelerate python-cups - python-dbus python-lz4 python-rencode xauth xf86-video-dummy xorg-server-xvfb" +depends="cups pygtk python-Pillow python-cups python-dbus python-lz4 + python-rencode xauth xf86-video-dummy xorg-server-xvfb" short_desc="Like screen(1) for X" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template index aec584651c4..fd8645f7204 100644 --- a/srcpkgs/xreader/template +++ b/srcpkgs/xreader/template @@ -1,20 +1,23 @@ # Template file for 'xreader' pkgname=xreader -version=1.6.2 +version=1.8.2 revision=1 build_style=gnu-configure -configure_script="./autogen.sh" -configure_args="--disable-caja --disable-introspection --disable-nemo --disable-thumbnailer" -hostmakedepends="automake mate-common pkg-config yelp-tools" -makedepends="djvulibre-devel libgxps-devel libsecret-devel - libspectre-devel libSM-devel poppler-glib-devel webkit2gtk-devel" +configure_args="--disable-introspection --disable-thumbnailer" +hostmakedepends="mate-common" +makedepends="djvulibre-devel libSM-devel libgnomekbd-devel libgxps-devel libsecret-devel + libspectre-devel libxkbfile-devel poppler-glib-devel webkit2gtk-devel xapps-devel" depends="desktop-file-utils hicolor-icon-theme" -maintainer="cr6git " short_desc="Document viewer capable of displaying formats like PDF and Postscript" +maintainer="cr6git " +license="GPL-2.0-or-later" homepage="https://github.com/linuxmint/xreader" -license="GPL-2" distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz" -checksum=b925007199b156943a568e2da1b7058f99e328cdd3f03f447d280e9bf7356cab +checksum=a8a767c4617bbeeecb3ebeb570cbaecb4c5e5ee7e69f359a5a46053aa0d09b63 + +pre_configure() { + NOCONFIGURE=1 ./autogen.sh +} libxreader_package() { short_desc+=" - shared library" diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template index 23362c89337..5046fdd91dd 100644 --- a/srcpkgs/xurls/template +++ b/srcpkgs/xurls/template @@ -7,11 +7,15 @@ go_import_path="github.com/mvdan/${pkgname}" go_package="${go_import_path}/cmd/${pkgname}" short_desc="Extract urls from text" maintainer="dleeram " -license="BSD-3" -homepage="https://${go_import_path}" +license="BSD-3-Clause" +homepage="https://www.github.com/mvdan/xurls" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=47fb038408e8b26965a0e06a4b409edb7bcb3a7373c0c930edf9891bbc58909a +do_check() { + go test -v +} + post_install() { vlicense LICENSE } diff --git a/srcpkgs/ykpivmgr/update b/srcpkgs/ykpivmgr/update new file mode 100644 index 00000000000..bb3788d7e3e --- /dev/null +++ b/srcpkgs/ykpivmgr/update @@ -0,0 +1,2 @@ +site=https://developers.yubico.com/yubico-piv-tool/Releases +pattern='href="yubico-piv-tool-\K[\d\.]+(?=\.tar\.gz")' diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 82702231bff..71348315969 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,7 +1,7 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2018.05.09 -revision=2 +version=2018.05.26 +revision=1 noarch=yes wrksrc="$pkgname" build_style=python-module @@ -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=2db4d85d56381845b8b797bb25e7d4dcac801b5e5c09d3f20964682a455c846a +checksum=ddd3f5134c6cc601f0bb422a366cfe35f7cf4b368ea868b5ca5bfd697f053bad alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index c2690a230f6..a9ba6ca00f9 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 8d5b5966dae..345de32219d 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 1a1d05794ff..5cfad14604d 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" diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template index 3e3b5cd4604..3ffa206ddc8 100644 --- a/srcpkgs/zbar/template +++ b/srcpkgs/zbar/template @@ -1,7 +1,7 @@ # Template file for 'zbar' pkgname=zbar version=0.10 -revision=3 +revision=4 build_style=gnu-configure configure_args="$(vopt_with qt) --with-gtk" hostmakedepends="automake pkg-config libtool gettext-devel python diff --git a/srcpkgs/zeroinstall-injector/update b/srcpkgs/zeroinstall-injector/update new file mode 100644 index 00000000000..2aa695a3dd8 --- /dev/null +++ b/srcpkgs/zeroinstall-injector/update @@ -0,0 +1 @@ +pkgname=0install diff --git a/srcpkgs/zopfli/template b/srcpkgs/zopfli/template index a763ea7cb0c..ff342ed7ff5 100644 --- a/srcpkgs/zopfli/template +++ b/srcpkgs/zopfli/template @@ -1,16 +1,16 @@ # Template file for 'zopfli' pkgname=zopfli -version=1.0.1 +version=1.0.2 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-makefile make_build_args="zopfli zopflipng" short_desc="Very good, but slow, deflate or zlib compression" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/google/zopfli" distfiles="https://github.com/google/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=29743d727a4e0ecd1b93e0bf89476ceeb662e809ab2e6ab007a0b0344800e9b4 +checksum=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55 pre_build() { export CFLAGS="$CFLAGS $LDFLAGS -lm"