diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 69703fd03be..b0f255f29b2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,9 +7,9 @@ This document describes how you as a contributor can help adding packages, corre ## Getting your packages into Void by yourself If you really want to get a package into Void Linux we recommend you to package it yourself. -We provide a [comprehensive Manual](https://github.com/voidlinux/void-packages/blob/master/Manual.md) +We provide a [comprehensive Manual](https://github.com/void-linux/void-packages/blob/master/Manual.md) on how you can create new packages. Also there's a -[manual about xbps-src](https://github.com/voidlinux/void-packages/blob/master/README.md) which is used +[manual about xbps-src](https://github.com/void-linux/void-packages/blob/master/README.md) which is used to build package files from templates. For this guide, we assume you have basic knowledge about [git](http://git-scm.org) and a [GitHub Account](http://github.com) @@ -21,7 +21,7 @@ as specific git- or svn-revisions anymore. templates must be placed in `void-packages/srcpkgs//template` where `pkgname` is the same as the pkgname variable in the template. -For deeper insights on the contents of template files consider reading the [manual](https://github.com/voidlinux/void-packages/blob/master/Manual.md) +For deeper insights on the contents of template files consider reading the [manual](https://github.com/void-linux/void-packages/blob/master/Manual.md) There's a helper tool for creating new packages in the [xtools](https://github.com/chneukirchen/xtools) package: @@ -33,18 +33,18 @@ There's a helper tool for creating new packages in the [xtools](https://github.c Once you have built your template files there are certain rules on how the commit should be named. * Use the following for newly added packages: ```New package: -``` - [Example](https://github.com/voidlinux/void-packages/commit/176d9655429188aac10cd229827f99b72982ab10) + [Example](https://github.com/void-linux/void-packages/commit/176d9655429188aac10cd229827f99b72982ab10) * Use the following if you update a package: ```: update to .``` - [Example](https://github.com/voidlinux/void-packages/commit/b6b82dcbd4aeea5fc37a32e4b6a8dd8bd980d5a3) + [Example](https://github.com/void-linux/void-packages/commit/b6b82dcbd4aeea5fc37a32e4b6a8dd8bd980d5a3) * If you changed something on the template without a version change use ```: ``` - [Example](https://github.com/voidlinux/void-packages/commit/8b68d6bf1eb997cd5e7c095acd040e2c5379c91d) + [Example](https://github.com/void-linux/void-packages/commit/8b68d6bf1eb997cd5e7c095acd040e2c5379c91d) If you want to describe your changes in more detail, make an empty line and add the description afterwards. -[Example](https://github.com/voidlinux/void-packages/commit/f1c45a502086ba1952f23ace9084a870ce437bc6) +[Example](https://github.com/void-linux/void-packages/commit/f1c45a502086ba1952f23ace9084a870ce437bc6) -This is also described in the [manual](https://github.com/voidlinux/void-packages/blob/master/Manual.md) in deeper detail. +This is also described in the [manual](https://github.com/void-linux/void-packages/blob/master/Manual.md) in deeper detail. There's a helper tool for committing packages in the [xtools](https://github.com/chneukirchen/xtools) package: @@ -61,7 +61,7 @@ packages should also be part of the same pull request. When you make changes to your pull request, please *do not close and reopen your pull request*. Instead, just forcibly git push, overwriting any old commits. Closing and opening your pull requests repeatedly spams the Void maintainers. -##### Travis +#### Travis Once you have started a pull request, you will get instant feedback from Travis. It will check if the templates you have changed comply with the our guidelines. At the moment not all packages comply to the rules, so if you update a package, it may happen, that Travis diff --git a/Manual.md b/Manual.md index abb8e6094fd..433e4625313 100644 --- a/Manual.md +++ b/Manual.md @@ -1275,7 +1275,7 @@ You can now make your own commits to the `forked` repository: To keep your forked repository always up to date, setup the `upstream` remote to pull in new changes: - $ git remote add upstream git://github.com/voidlinux/void-packages.git + $ git remote add upstream git://github.com/void-linux/void-packages.git $ git pull upstream master Once you've made changes to your `forked` repository you can submit diff --git a/README.md b/README.md index e7eee614c02..02cbecdcde3 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ To enable it: Clone the `void-packages` git repository, install the bootstrap packages: ``` -$ git clone git://github.com/voidlinux/void-packages.git +$ git clone git://github.com/void-linux/void-packages.git $ cd void-packages $ ./xbps-src binary-bootstrap ``` @@ -363,7 +363,7 @@ If your system does not support `user namespaces`, a privileged group is require Clone the `void-packages` git repository: - $ git clone git://github.com/voidlinux/void-packages + $ git clone git://github.com/void-linux/void-packages and `xbps-src` should be fully functional; just start the `bootstrap` process, i.e: @@ -438,38 +438,9 @@ Once the build has finished, you can specify the path to the local repository to # make # ./mklive.sh ... -r /path/to/hostdir/binpkgs -### Breaking out of a dependency loop - -The package gtk+3 can not be built using *-N* with its default options because -there is a dependency loop: colord depends on gtk+3 and gtk+3 depends on colord. - -The following steps are required to build a temporary gtk+3 without colord and -later on rebuild gtk+3 with colord enabled, once all dependencies are available: - - $ ./xbps-src -N pkg gtk+3 - -Break this build with Ctrl+C once you see vala, colord, gtk+3 being looped over. - - $ ./xbps-src -o ~gir,~colord -N pkg gtk+3 - -Now you have a gtk+3 without colord registered and can build the other dependencies. - - $ ./xbps-src -N pkg gtk+3 - -Here gtk+3 will not be updated because the package already exists. In the -next step we force a re-registration of gtk+3 with colord enabled. - - $ ./xbps-src -f pkg gtk+3 - -Be careful with -f (force) building packages, if your repository contains -multiple architectures. Force registering noarch packages will break them -for architectures which already had them registered in their repodata file. - -Now you can continue to build packages and their dependencies with *-N*. - ### Contributing -See [Contributing](https://github.com/voidlinux/xbps-packages/blob/master/CONTRIBUTING.md) +See [Contributing](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md) for a general overview of how to contribute and the -[Manual](https://github.com/voidlinux/xbps-packages/blob/master/Manual.md) +[Manual](https://github.com/void-linux/void-packages/blob/master/Manual.md) for details of how to create source packages. diff --git a/common/shlibs b/common/shlibs index 6dec0fb9511..82f5a36a156 100644 --- a/common/shlibs +++ b/common/shlibs @@ -111,6 +111,7 @@ libfreetype.so.6 freetype-2.3.9_1 libfontconfig.so.1 fontconfig-2.6.0_1 libX11-xcb.so.1 libX11-1.2_1 libX11.so.6 libX11-1.2_1 +libXpresent.so.1 libXpresent-1.0.0_1 libexpat.so.1 expat-2.0.0_1 libjpeg.so.8 libjpeg-turbo-1.3.0_2 libturbojpeg.so.0 libjpeg-turbo-1.3.0_2 @@ -150,6 +151,7 @@ librsvg-2.so.2 librsvg-2.26.0_1 libdbus-1.so.3 dbus-libs-1.2.10_1 libdbus-glib-1.so.2 dbus-glib-0.80_1 libxml2.so.2 libxml2-2.7.0_1 +libxlsxwriter.so.0 libxlsxwriter-0.7.7_1 libfuse.so.2 fuse-2.8.1_1 libfuse3.so.3 fuse3-3.1.0_1 libXext.so.6 libXext-1.0.5_1 @@ -301,6 +303,7 @@ libXvMC.so.1 libXvMC-1.0.4_1 libXvMCW.so.1 libXvMC-1.0.4_1 libXvMCr600.so.1 mesa-ati-dri-10.1.0_1 libXvMCnouveau.so.1 mesa-nouveau-dri-10.1.0_1 +libxcb-errors.so.0 xcb-util-errors-1.0_1 libxcb-icccm.so.4 xcb-util-wm-0.3.9_1 libxcb-ewmh.so.2 xcb-util-wm-0.3.9_1 libxcb-aux.so.0 xcb-util-0.3.4_1 @@ -497,6 +500,7 @@ libKF5KdepimDBusInterfaces.so.5 kdepim-apps-libs-17.12.3_1 libKF5SendLater.so.5 kdepim-apps-libs-17.12.3_1 libKF5KaddressbookImportExport.so.5 kdepim-apps-libs-17.12.3_1 libKF5Gravatar.so.5 libgravatar-17.12.3_1 +libKF5Sane.so.5 libksane-18.04.2_1 libKPimSMTP.so.5 ksmtp-17.12.3_1 libKF5MailTransport.so.5 kmailtransport-17.12.3_1 libKF5MailTransportAkonadi.so.5 kmailtransport-17.12.3_1 @@ -745,13 +749,13 @@ libasyncns.so.0 libasyncns-0.8_1 libpulse.so.0 libpulseaudio-1.0_1 libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1 libpulse-simple.so.0 libpulseaudio-1.0_1 -libpulsecommon-11.1.so libpulseaudio-11.1_1 -libpulsecore-11.1.so libpulseaudio-11.1_1 +libpulsecommon-12.0.so libpulseaudio-12.0_1 +libpulsecore-12.0.so libpulseaudio-12.0_1 liborc-0.4.so.0 orc-0.4.11_1 liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 -libtotem-plparser.so.18 totem-pl-parser-3.10.0_1 -libtotem-plparser-mini.so.18 totem-pl-parser-3.10.0_1 +libtotem-plparser.so.18 totem-pl-parser-3.26.1_1 +libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1 libgladeui-2.so.6 libgladeui3-3.10.0_1 libtdb.so.1 libtdb-1.2.2_1 libgssdp-1.0.so.3 gssdp-0.9.0_1 @@ -810,6 +814,8 @@ libpeas-1.0.so.0 libpeas-1.0.0_2 libpeas-gtk-1.0.so.0 libpeas-1.0.0_2 libtotem.so.0 libtotem-3.6.2_1 libclutter-1.0.so.0 clutter-1.14.0_1 +libavfs.so.0 libavfs-1.0.5_1 +libdmr.so.0.1 deepin-movie-reborn-3.2.5_1 libgjs.so.0 gjs-0.7.11_1 libgjs-gi.so gjs-0.7.11_1 libgjs-dbus.so.0 gjs-0.7.11_1 @@ -991,6 +997,7 @@ libLLVM-4.0.so libllvm4.0-4.0.0_1 libLLVM-5.0.so libllvm5.0-5.0.0_1 libLLVM-6.0.so libllvm6.0-6.0.0_1 libisofs.so.6 libisofs-0.6.24_1 +libmpack.so.0 libmpack-1.0.5_1 libv8.so.3.24 libv8-3.24.35.22_1 libGeoIP.so.1 libgeoip-1.4.8_1 libcherokee-base.so.0 libcherokee-1.2.101_1 @@ -1035,6 +1042,8 @@ libmash-0.2.so.0 mash-0.2.0_4 libbytesize.so.1 libbytesize-1.2_1 libblockdev.so.2 libblockdev-2.16_1 libbd_utils.so.2 libblockdev-2.16_1 +libndctl.so.6 libndctl-60.3_1 +libdaxctl.so.1 libdaxctl-60.3_1 libudisks2.so.0 udisks2-1.93.0_1 libgcr-base-3.so.1 gcr-3.3.92_1 libgck-1.so.0 gcr-3.8.0_1 @@ -1211,7 +1220,7 @@ librlog.so.5 librlog-1.4_1 libtinyxml.so.0 tinyxml-2.6.2_1 libtinyxml2.so.6 tinyxml2-6.0.0_1 libbluray.so.2 libbluray-1.0.0_1 -libnfs.so.11 libnfs-2.0.0_1 +libnfs.so.12 libnfs-3.0.0_1 libzip.so.5 libzip-1.2_1 libapp.so.0 libapp-20110513_1 libluajit-5.1.so.2 LuaJIT-2.0.0_1 @@ -1276,7 +1285,6 @@ libzzipmmapped-0.so.13 zziplib-0.13.62_1 libkworkspace5.so.5 plasma-workspace-5.8.4_1 libdb-5.3.so libdb-5.3.21_1 libdb_cxx-5.3.so libdb-cxx-5.3.21_1 -libsdb.so.0 sdb-0.6.2_1 libcares.so.2 c-ares-1.10.0_1 libcryptopp.so.5.6 crypto++-565_1 libqzeitgeist.so.1 libqzeitgeist-0.8.0_1 @@ -1352,12 +1360,6 @@ libakonadiprotocolinternals.so.1 akonadi-1.9.2_1 libqimageblitz.so.4 qimageblitz-0.0.6_1 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1 libkexiv2.so.11 libkexiv2-4.10.4_1 -libkscreensaver.so.5 kde-workspace-4.10.4_1 -libkdecorations.so.4 kde-workspace-4.10.4_1 -libplasmaclock.so.4 kde-workspace-4.10.4_1 -libtaskmanager.so.4 kde-workspace-4.10.4_1 -libkworkspace.so.4 kde-workspace-4.10.4_1 -libprocessui.so.4 kde-workspace-4.10.4_1 libKPimGAPIContacts.so.5 libkgapi-17.12.3_1 libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1 libKPimGAPILatitude.so.5 libkgapi-17.12.3_1 @@ -1442,6 +1444,7 @@ libvlccore.so.9 libvlc-3.0.2_1 libvlc_vdpau.so.0 libvlc-2.2.0_1 libvlc_pulse.so.0 libvlc-3.0.2_1 libvlc_xcb_events.so.0 libvlc-3.0.2_1 +libcmocka.so.0 cmocka-1.1.1_1 libbtrfs.so.0 libbtrfs-3.12_1 libecore_audio.so.1 efl-1.12.0_1 libecore_con.so.1 efl-1.12.0_1 @@ -1547,7 +1550,6 @@ libwx_gtk2u_webview-3.0.so.0 wxWidgets-3.0.2_3 libmspack.so.0 libmspack-0.4alpha_1 libslim.so.1.3.6 slim-1.3.6_1 libmozjs-24.so mozjs24-24.2.0_1 -libmozjs-38.so mozjs38-38.8.0_1 libmediaart-2.0.so.0 libmediaart-1.9.1_1 libinput.so.10 libinput-1.2.0_1 libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1 @@ -1709,6 +1711,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 +libfswatch.so.9 libfswatch-1.11.3_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 @@ -1791,7 +1794,6 @@ libblas.so.3 blas-3.5.0_1 libcblas.so.3 cblas-3.6.0_1 liblapack.so.3 lapack-3.5.0_1 libcinnamon-menu-3.so.0 cinnamon-menus-2.2.0_1 -libpolkit-gtk-mate-1.so.0 mate-polkit-1.8.0_2 libmate-desktop-2.so.17 mate-desktop-1.8.0_1 libmarco-private.so.1 libmarco-1.14.0_1 libmate-menu.so.2 mate-menus-1.8.0_1 @@ -1956,7 +1958,7 @@ libsysstat-qt5.so.0 libsysstat-0.3.2_1 libpolkit-qt5-agent-1.so.1 polkit-qt5-0.112.0_1 libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1 -libfm-qt.so.3 libfm-qt-0.11.1_1 +libfm-qt.so.5 libfm-qt-0.13.1_1 libqtermwidget5.so.0 qtermwidget-0.6.0_1 libnpth.so.0 npth-1.1_1 libglfw.so.3 glfw-3.0.4_1 @@ -2015,11 +2017,11 @@ libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 liblastfm.so.1 liblastfm-1.0.9_1 liblastfm_fingerprint.so.1 liblastfm-1.0.9_1 -libdruntime-ldc-debug-shared.so.79 ldc-runtime-1.9.0_1 -libdruntime-ldc-shared.so.79 ldc-runtime-1.9.0_1 -libphobos2-ldc-shared.so.79 ldc-runtime-1.9.0_1 -libphobos2-ldc-debug-shared.so.79 ldc-runtime-1.9.0_1 -libldc-jit.so.79 ldc-runtime-1.9.0_1 +libdruntime-ldc-debug-shared.so.80 ldc-runtime-1.10.0_1 +libdruntime-ldc-shared.so.80 ldc-runtime-1.10.0_1 +libphobos2-ldc-shared.so.80 ldc-runtime-1.10.0_1 +libphobos2-ldc-debug-shared.so.80 ldc-runtime-1.10.0_1 +libldc-jit.so.80 ldc-runtime-1.10.0_1 libmarblewidget.so.19 marble-4.14.3_2 libastro.so.1 marble-4.14.3_2 libmarblewidget-qt5.so.28 marble5-17.12.2_1 @@ -2054,9 +2056,9 @@ librrd_th.so.4 rrdtool-1.4.9_1 libmosquitto.so.1 libmosquitto-1.4_1 libmosquittopp.so.1 libmosquittopp-1.4_1 libmpv.so.1 mpv-0.8.0_2 -libmbedtls.so.10 mbedtls-2.0.0_1 -libmbedcrypto.so.1 mbedtls-2.8.0_1 -libmbedx509.so.0 mbedtls-2.0.0_1 +libmbedtls.so.11 mbedtls-2.9.0_1 +libmbedcrypto.so.3 mbedtls-2.9.0_1 +libmbedx509.so.0 mbedtls-2.9.0_1 libdmtx.so.0 libdmtx-0.7.4_1 libdbus-c++-1.so.0 libdbus-c++-0.9.0_1 libdbus-c++-glib-1.so.0 libdbus-c++-0.9.0_1 @@ -2077,8 +2079,8 @@ libgom-1.0.so.0 gom-0.3.0_1 libetpan.so.20 libetpan-1.7.2_1 libxmp.so.4 libxmp-4.3.7_1 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1 -libOpenImageIO_Util.so.1.7 openimageio-1.7.7_1 -libOpenImageIO.so.1.7 openimageio-1.7.7_1 +libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1 +libOpenImageIO.so.1.8 openimageio-1.8.12_1 libOpenColorIO.so.1 opencolorio-1.0.8_1 libyaml-cpp.so.0.5 yaml-cpp-0.5.2_1 libpaper.so.1 libpaper-1.1.24_1 @@ -2123,9 +2125,9 @@ liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1 liblastfm5.so.1 liblastfm-qt5-1.0.9_1 libquazip5.so.1 quazip-qt5-0.7.3_2 libjreen-qt5.so.1 jreen-qt5-1.2.0_1 -libtomahawk.so.0.8.4 tomahawk-qt5-0.8.4_3 -libtomahawk-playdarapi.so.0.8.4 tomahawk-qt5-0.8.4_3 -libtomahawk-widgets.so.0.8.4 tomahawk-qt5-0.8.4_3 +libtomahawk.so.0.8.99 tomahawk-qt5-0.8.4_13 +libtomahawk-playdarapi.so.0.8.99 tomahawk-qt5-0.8.4_13 +libtomahawk-widgets.so.0.8.99 tomahawk-qt5-0.8.4_13 libzen.so.0 libzen-0.4.31_1 libmediainfo.so.0 libmediainfo-0.7.75_1 libnghttp2.so.14 nghttp2-1.0.2_1 @@ -2164,7 +2166,6 @@ libprocps.so.7 procps-ng-3.3.15_1 libgegl-0.4.so.0 gegl-0.4.0_1 libgegl-npd-0.4.so gegl-0.4.0_1 libgegl-sc-0.4.so gegl-0.4.0_1 -libprocps.so.6 procps-ng-3.3.12_1 libskarnet.so.2.6 skalibs-2.6.0.0_1 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1 libtidy.so.5 libtidy5-5.1.25_1 @@ -2775,12 +2776,6 @@ libKDb3.so.4 kdb-3.1.0_1 libKPropertyWidgets3.so.4 kproperty-3.1.0_1 libKPropertyCore3.so.4 kproperty-3.1.0_1 libKReport3.so.4 kreport-3.1.0_1 -libKPropertyWidgets3.so.4 kproperty-3.1.0_1 -libKPropertyCore3.so.4 kproperty-3.1.0_1 -libKReport3.so.4 kreport-3.1.0_1 -libKPropertyWidgets3.so.4 kproperty-3.1.0_1 -libKPropertyCore3.so.4 kproperty-3.1.0_1 -libKReport3.so.4 kreport-3.1.0_1 libbotan-2.so.5 botan-2.6.0_1 libswipl.so.7.6 swi-prolog-7.6.0_1 libpcre2-16.so.0 libpcre2-10.22_1 @@ -2885,7 +2880,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1 libspectrum.so.8 libspectrum-1.2.2_1 libbearssl.so.0 bearssl-0.3_1 libXfont2.so.2 libXfont2-2.0.1_1 -libqalculate.so.15 libqalculate-2.3.0_1 +libqalculate.so.18 libqalculate-2.6.0_1 libweston-4.so.0 weston-4.0.0_1 libweston-desktop-4.so.0 weston-4.0.0_1 libostree-1.so.1 libostree-2017.3_1 @@ -2914,12 +2909,13 @@ libbacfind-9.0.4.so bacula-common-9.0.4_1 libbacsql-9.0.4.so bacula-common-9.0.4_1 libbaccats-9.0.4.so bacula-common-9.0.4_1 libbacsd-9.0.4.so bacula-common-9.0.4_1 -libbaccats-mysql-9.0.4.so bacula-common-9.0.4_1 libbaccats-sqlite3-9.0.4.so bacula-common-9.0.4_1 libbaccats-postgresql-9.0.4.so bacula-common-postgresql-9.0.4_1 libbaccats-mysql-9.0.4.so bacula-common-mariadb-9.0.4_1 bpipe-fd.so bacula-fd-9.0.4_1 libnftables.so.0 libnftables-0.8.4_1 +libbctoolbox.so.1 bctoolbox-0.6.0_1 +libortp.so.13 ortp-1.0.2_1 libsuperlu.so.5 superlu-5.2.1_1 libgosu.so.0 gosu-0.12.0_1 libyara.so.3 libyara-3.5.0_1 @@ -2971,6 +2967,7 @@ libfishsound.so.1 libfishsound-1.0.0_1 libxqilla.so.2 XQilla-2.3.4_1 libKF5DocTools.so.5 kdoctools-5.36.0_1 libKF5MediaPlayer.so.5 kmediaplayer-5.36.0_1 +libxo.so.0 libxo-0.9.0_1 libbrotlicommon.so.1 brotli-1.0.2_1 libbrotlidec.so.1 brotli-1.0.2_1 libbrotlienc.so.1 brotli-1.0.2_1 @@ -3017,7 +3014,7 @@ libArcus.so.3 libArcus-3.1.0_1 libgutenprint.so.2 gutenprint-5.2.12_1 libunbound.so.2 unbound-1.6.6_1 libmirage.so.11 libmirage-3.1.0_1 -libwkhtmltox.so.0 wkhtmltopdf-0.12.4_1 +libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libixml.so.10 libupnp1.8-1.8.2_1 libupnp.so.10 libupnp1.8-1.8.2_1 libevent_extra-2.1.so.6 libevent-2.1.8_3 @@ -3047,7 +3044,7 @@ libvted-3.so.0 libvted-3.7.0_2 libpeasd-3.so.0 libpeasd-3.7.0_2 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2 -libmega.so.30300 MEGAsdk-3.3.1_1 +libmega.so.30308 MEGAsdk-3.3.8_1 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1 libgpod.so.4 libgpod-0.8.3_1 libi2c.so.0 i2c-tools-4.0_1 @@ -3057,17 +3054,17 @@ librime.so.1 librime-1.2.9_1 libairspy.so.0 libairspy-1.0.9_1 libKF5KDcraw.so.5 libkdcraw5-17.04.3_1 libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1 -libfswatch.so.9 fswatch-1.11.2_1 libhackrf.so.0 libhackrf-2017.02.1_1 libtecla.so.1 libtecla-1.6.3_1 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 +libzim.so.4 libzim-4.0.0_1 +libkiwix.so.2 kiwix-lib-2.0.0_1 libctpp2.so.2 ctpp2-2.8.3_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 +libaria2.so.0 libaria2-1.33.1_3 +librpm.so.8 librpm-4.14.1_1 +librpmsign.so.8 librpmsign-4.14.1_1 +librpmbuild.so.8 librpmbuild-4.14.1_1 +librpmio.so.8 librpmio-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 @@ -3139,7 +3136,6 @@ libzuluCryptPluginManager.so.1.0.0 zulucrypt-5.2.0_1 libzuluCrypt-exe.so.1.2.0 zulucrypt-5.2.0_1 libzuluCrypt.so.1.2.0 zulucrypt-5.2.0_1 libaacs.so.0 libaacs-0.9.0_1 -libnfdump-1.6.15.so nfdump-1.6.15_1 libttfautohint.so.1 ttfautohint-1.8.1_1 libcob.so.4 gnucobol-libs-2.2_1 libkrfbprivate.so.5.0 krfb-17.08.1_1 @@ -3149,14 +3145,30 @@ libarcan_shmif_server.so.0.11 arcan-0.5.4.3_1 libarcan_tui.so.0.11 arcan-0.5.4.3_1 libldm.so.1 linux-driver-management-1.0.1_1 liblwipv6.so.2 lwipv6-1.5a_1 -libpipewire-0.1.so.0 pipewire-0.1.7_1 -libspa-lib.so.0 pipewire-0.1.7_1 +libpipewire-0.1.so.0 libpipewire-0.1.9_1 +libspa-lib.so.0 libspa-lib-0.1.9_1 libvolk.so.1.4 volk-1.4_1 -libgnuradio-runtime-3.7.12git.so.0.0.0 gnuradio-3.7.12git_1 -libgnuradio-pmt-3.7.12git.so.0.0.0 gnuradio-3.7.12git_1 -libgnuradio-blocks-3.7.12git.so.0.0.0 gnuradio-3.7.12git_1 -libgnuradio-audio-3.7.12git.so.0.0.0 gnuradio-3.7.12git_1 -libgnuradio-noaa-3.7.12git.so.0.0.0 gnuradio-3.7.12git_1 +libgnuradio-runtime-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-pmt-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-blocks-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-audio-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-noaa-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-fec-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-fft-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-filter-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-analog-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-digital-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-dtv-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-atsc-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-channels-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-pager-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-trellis-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-video-sdl-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-vocoder-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-fcd-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-wavelet-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-wxgui-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 +libgnuradio-osmosdr-0.1.4.so.0.0.0 gnuradio-osmosdr-0.1.4_1 libflann_cpp.so.1.9 flann-1.9.1_1 libflann.so.1.9 flann-1.9.1_1 libvtksys-8.1.so.1 vtk-8.1.0_1 @@ -3266,7 +3278,8 @@ libwayland-egl++.so.0.2 libwaylandpp-2.2.0_1 libwayland-client++.so.0.2 libwaylandpp-2.2.0_1 libwayland-cursor++.so.0.2 libwaylandpp-2.2.0_1 libwayland-client-extra++.so.0.2 libwaylandpp-2.2.0_1 -libfwup.so.1 fwupdate-10_1 +libfwupd.so.2 libfwupd-1.0.8_1 +libfwup.so.1 libfwup-11_1 libTKBin.so.7 occt-7.2.0p1_1 libTKDraw.so.7 occt-7.2.0p1_1 libTKSTEP209.so.7 occt-7.2.0p1_1 @@ -3336,9 +3349,9 @@ libgeos-3.6.2.so geos-3.6.2_1 libgeos_c.so.1 geos-3.6.2_1 libspatialindex.so.4 libspatialindex-1.8.5_1 libspatialindex_c.so.4 libspatialindex-1.8.5_1 -liboctave.so.4 octave-4.2.1_8 -liboctinterp.so.4 octave-4.2.1_8 -liboctgui.so.2 octave-4.2.1_8 +liboctave.so.5 octave-4.4.0_1 +liboctinterp.so.5 octave-4.4.0_1 +liboctgui.so.3 octave-4.4.0_1 libpapi.so.5 papi-5.6.0_1 libpfm.so.4 papi-5.6.0_1 libfifechan.so.0.1.4 fifechan-0.1.4_1 @@ -3351,4 +3364,22 @@ 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 +libgsettings-qt.so.1 gsettings-qt-0.1+17.10.20170824_1 +libplacebo.so.5 libplacebo-0.5.0_1 +libw2xc.so waifu2x-converter-cpp-5.2_1 +libnova-0.15.so.0 libnova-0.15.0_1 +libdtkcore.so.2 dtkcore-2.0.6_1 +libdtksettings.so.1 dtksettings-0.1.7_1 +libdtksettingsview.so.1 dtksettings-0.1.7_1 +libdframeworkdbus.so.2 dde-qt-dbus-factory-1.0.1_1 +libdtkwidget.so.2 dtkwidget-2.0.6.1_1 libcue.so.2 libcue-2.2.0_1 +libdtkwm.so.2 dtkwm-2.0.6_1 +libticonv.so.8 libticonv-1.1.5_1 +libtifiles2.so.10 libtifiles2-1.1.7_1 +libticables2.so.7 libticables2-1.3.5_1 +libticalcs2.so.12 libticalcs2-1.1.9_1 +libhtmlcxx.so.3 htmlcxx-0.86_1 +libcss_parser_pp.so.0 htmlcxx-0.86_1 +libcss_parser.so.0 htmlcxx-0.86_1 +libaom.so.0 libaom-1.0.0_1 diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh index 6f7a47a687a..15efb8d0ddc 100755 --- a/common/travis/fetch_upstream.sh +++ b/common/travis/fetch_upstream.sh @@ -3,4 +3,4 @@ # changed_templates.sh /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m' -git fetch --depth 200 git://github.com/voidlinux/void-packages.git master +git fetch --depth 200 git://github.com/void-linux/void-packages.git master diff --git a/common/travis/set_mirror.sh b/common/travis/set_mirror.sh index 5492ef08906..ff1fb349bb2 100755 --- a/common/travis/set_mirror.sh +++ b/common/travis/set_mirror.sh @@ -1,7 +1,7 @@ #!/bin/sh TRAVIS_PROTO=http -TRAVIS_MIRROR=198.204.250.219 +TRAVIS_MIRROR=auto.voidlinux.org for _i in etc/repos-remote.conf etc/defaults.conf etc/repos-remote-x86_64.conf ; do printf '\x1b[32mUpdating %s...\x1b[0m\n' $_i diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 58194a86241..486b8311cca 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -286,7 +286,7 @@ setup_pkg() { unset_package_funcs - ( . $XBPS_CONFIG_FILE 2>/dev/null ) + . $XBPS_CONFIG_FILE 2>/dev/null if [ -n "$cross" ]; then source_file $XBPS_CROSSPFDIR/${cross}.sh diff --git a/common/xbps-src/shutils/purge_distfiles.sh b/common/xbps-src/shutils/purge_distfiles.sh index 73df13932bc..1cfaf5bdc0b 100644 --- a/common/xbps-src/shutils/purge_distfiles.sh +++ b/common/xbps-src/shutils/purge_distfiles.sh @@ -4,10 +4,7 @@ purge_distfiles() { - # Ignore msg_error calls when sourcing templates - msg_error() { - : - } + readonly HASHLEN=64 if [ -z "$XBPS_SRCDISTDIR" ]; then msg_error "The variable \$XBPS_SRCDISTDIR is not set." exit 1 @@ -28,8 +25,7 @@ purge_distfiles() { pkg=${template#*/} pkg=${pkg%/*} if [ ! -L "srcpkgs/$pkg" ]; then - unset checksum - source $template 2>/dev/null + checksum="$(grep -Ehrow [0-9a-f]{$HASHLEN} ${template}|sort|uniq)" read -a _my_hashes <<< ${checksum} i=0 while [ -n "${_my_hashes[$i]}" ]; do @@ -77,7 +73,6 @@ purge_distfiles() { echo hashes=($XBPS_SRCDISTDIR/by_sha256/*) - readonly HASHLEN=64 for file in ${hashes[@]}; do hash_distfile=${file##*/} hash=${hash_distfile:0:$HASHLEN} diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 25b43014ec9..6c0d65084de 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -63,6 +63,9 @@ update_check() { rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';; *cran.r-project.org/src/contrib*) rx='\b\Q'"${pkgname#R-cran-}"'\E_\K\d+(\.\d+)*(-\d+)?(?=\.tar)';; + *download.kde.org/stable/applications*|*download.kde.org/stable/frameworks*) + url="${url%%${version%.*}*}" + rx='href="\K[\d\.]+(?=/")';; esac fi diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index a19f7e77e01..df3aeb77cb6 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,6 +1,6 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.93.1.18 +version=3.93.1.25 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=95fce2565c9d3a6b7ba753c78ab27b456d62702ad11be3d9ce6dbd14f68c6066 +checksum=c7afef7b90306ba5fc41944539b1835c16eb245a40d66ab0e616831c1cf100e3 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/Carla-devel b/srcpkgs/Carla-devel new file mode 120000 index 00000000000..817012ce210 --- /dev/null +++ b/srcpkgs/Carla-devel @@ -0,0 +1 @@ +Carla \ No newline at end of file diff --git a/srcpkgs/Carla/patches/aarch64.patch b/srcpkgs/Carla/patches/aarch64.patch new file mode 100644 index 00000000000..480b454c842 --- /dev/null +++ b/srcpkgs/Carla/patches/aarch64.patch @@ -0,0 +1,11 @@ +--- source/modules/water/memory/ByteOrder.h 2018-01-22 21:05:35.000000000 +0000 ++++ - 2018-06-18 09:58:25.563913205 +0000 +@@ -153,7 +153,7 @@ + { + #ifdef CARLA_OS_MAC + return OSSwapInt32 (n); +- #elif defined(CARLA_OS_WIN) || ! (defined (__arm__) || defined (__arm64__)) ++ #elif defined(CARLA_OS_WIN) || ! (defined (__arm__) || ! defined (__arm64__)) + asm("bswap %%eax" : "=a"(n) : "a"(n)); + return n; + #else diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch new file mode 100644 index 00000000000..5166cb20da7 --- /dev/null +++ b/srcpkgs/Carla/patches/musl.patch @@ -0,0 +1,12 @@ +--- source/modules/hylia/link/asio/impl/error_code.ipp 2018-01-22 21:05:35.000000000 +0000 ++++ - 2018-06-18 09:13:32.145486974 +0000 +@@ -101,7 +101,7 @@ + #elif defined(__MACH__) && defined(__APPLE__) \ + || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) \ + || defined(_AIX) || defined(__hpux) || defined(__osf__) \ +- || defined(__ANDROID__) ++ || defined(__ANDROID__) || !defined(__GLIBC__) + char buf[256] = ""; + using namespace std; + strerror_r(value, buf, sizeof(buf)); + diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template new file mode 100644 index 00000000000..213283e77ba --- /dev/null +++ b/srcpkgs/Carla/template @@ -0,0 +1,53 @@ +# Template file for 'Carla' +pkgname=Carla +version=1.9.8 +revision=2 +build_style=gnu-makefile +pycompile_module="carla_utils.py carla_backend.py" +pycompile_dirs="usr/share/carla" +hostmakedepends="pkg-config python3" +makedepends=" + python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel liblo-devel + alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel gtk+-devel qt5-devel + qt-devel fluidsynth-devel fftw-devel mxml-devel zlib-devel python3-rdflib" +depends="python3 python3-PyQt5 python3-PyQt5-svg" +short_desc="Audio plugin host" +maintainer="nutcase84 " +license="GPL-2.0-or-later" +homepage="http://kxstudio.linuxaudio.org/Applications:Carla" +distfiles="https://github.com/falkTX/Carla/archive/${version}.tar.gz" +checksum=966647c508bf92eafb03d0aaf687acb399c687782461154fad40d64745786e67 + +case $XBPS_TARGET_MACHINE in + x86_64* | i686*);; + *) make_build_args+=" NOOPT=true" + make_install_args+=" NOOPT=true";; +esac + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" Carla-devel" +fi + +pre_build() { + if [ "$CROSS_BUILD" ]; then + sed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \ + source/plugin/Makefile + fi + + make ${make_build_args} features +} + +post_install() { + vmkdir "$py3_sitelib" + mv ${DESTDIR}/usr/lib/python3/dist-packages/*.py "${DESTDIR}"/"$py3_sitelib" + vbin bin/carla-lv2-export +} + +Carla-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/carla-lv2-export + vmove usr/lib/pkgconfig + vmove usr/include + } +} diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template index 250913bf739..adadff9b982 100644 --- a/srcpkgs/CopyQ/template +++ b/srcpkgs/CopyQ/template @@ -1,6 +1,6 @@ # Template file for 'CopyQ' pkgname=CopyQ -version=3.4.0 +version=3.5.0 revision=1 build_style=cmake hostmakedepends="qt5-tools-devel" @@ -9,6 +9,6 @@ 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" +changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES" distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz" -checksum=2e9b5975310a46bfe39873392a1b27ef36be96783608440317885a8c140ab280 +checksum=86876e9ca66d0ac57ce86512df73f36bae3f10f06a9c66d05dc8785abf884df6 diff --git a/srcpkgs/Fonts-TLWG/template b/srcpkgs/Fonts-TLWG/template index 0c8baa2b7a3..06b4c06e8ee 100644 --- a/srcpkgs/Fonts-TLWG/template +++ b/srcpkgs/Fonts-TLWG/template @@ -1,20 +1,20 @@ # Template file for 'Fonts-TLWG' pkgname=Fonts-TLWG -version=0.6.4 +version=0.6.5 revision=1 -wrksrc=fonts-tlwg-${version} +wrksrc="fonts-tlwg-${version}" +noarch=yes build_style=gnu-configure configure_args="--with-ttfdir=/usr/share/fonts/TTF" -hostmakedepends="fontforge xbps-triggers" -depends="font-util xbps-triggers" +hostmakedepends="fontforge" +depends="font-util" +font_dirs="/usr/share/fonts/TTF" short_desc="Thai fonts TTF" maintainer="ColdPhoenix " -license="GPL-2, Bitstream Font License" +license="GPL-2.0-or-later, Bitstream Font License" homepage="https://linux.thai.net/projects/fonts-tlwg" -distfiles="https://linux.thai.net/pub/thailinux/software/fonts-tlwg/fonts-tlwg-${version}.tar.xz" -checksum=e82da504bb31e148a5d1de3fe39dda49933cc7e06b9b377c6c50a8a995d16b32 -noarch="yes" -font_dirs="/usr/share/fonts/TTF" +distfiles="https://github.com/tlwg/fonts-tlwg/releases/download/v${version}/fonts-tlwg-${version}.tar.xz" +checksum=06faaa60f9bbbb178c788697dcc10676165595de1403b79c868bd57f60223bd1 post_install() { vlicense COPYING diff --git a/srcpkgs/GCP-Guest-Environment/template b/srcpkgs/GCP-Guest-Environment/template index ef22ec11849..23c01177234 100644 --- a/srcpkgs/GCP-Guest-Environment/template +++ b/srcpkgs/GCP-Guest-Environment/template @@ -1,6 +1,6 @@ # Template file for 'GCP-Guest-Environment' pkgname=GCP-Guest-Environment -version=20171025 +version=20180611 revision=1 noarch=yes wrksrc="compute-image-packages-${version}" @@ -17,7 +17,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://github.com/GoogleCloudPlatform/compute-image-packages" distfiles="https://github.com/GoogleCloudPlatform/compute-image-packages/archive/${version}.tar.gz" -checksum=16e4498034375ae2b227366785b51d7006fece25d51ad46a21013a342f201415 +checksum=f71bdc6d01cff014bb4d066096be9a6e067fd3028c730cc4c9557001ec99ab6e post_install() { for _i in Guest-Initialization accounts clock-skew ip-forwarding ; do diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template index 4338c5769b5..1da2e6f7830 100644 --- a/srcpkgs/GraphicsMagick/template +++ b/srcpkgs/GraphicsMagick/template @@ -1,6 +1,6 @@ # Template file for 'GraphicsMagick' pkgname=GraphicsMagick -version=1.3.29 +version=1.3.30 revision=1 keep_libtool_archives=yes build_style=gnu-configure @@ -16,8 +16,9 @@ short_desc="GraphicsMagick Image Processing System" maintainer="Juan RP " license="MIT" homepage="http://www.graphicsmagick.org/" +changelog="http://www.graphicsmagick.org/NEWS.html" distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz" -checksum=de820cd10597205941a7e9d02c2e679231e92e8e769c204ef09034d2279ad453 +checksum=d566a0e10d7c6c901ca5f3c3f31dd441cb758d655fd7817dc205dca11b7cf5b6 post_install() { vlicense Copyright.txt LICENSE diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 20d90027c70..5fba8f920ce 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -3,7 +3,7 @@ pkgname=ImageMagick _majorver=6.9.10 _patchver=0 version="${_majorver}.${_patchver}" -revision=1 +revision=2 wrksrc="${pkgname}-${_majorver}-${_patchver}" build_style=gnu-configure configure_args="--without-autotrace --with-wmf=yes @@ -34,6 +34,11 @@ if [ -z "$CROSS_BUILD" ]; then subpackages+=" libmagick-perl" fi +post_extract() { + sed -i '/VERSION/s/6\.9A/6.99/g' version.sh PerlMagick/Makefile.PL \ + PerlMagick/*/Makefile.PL PerlMagick/quantum/quantum.pm +} + pre_configure() { autoreconf -if } diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template new file mode 100644 index 00000000000..8e2b2ede65b --- /dev/null +++ b/srcpkgs/LGOGDownloader/template @@ -0,0 +1,19 @@ +# Template file for 'LGOGDownloader' +pkgname=LGOGDownloader +version=3.3 +revision=1 +wrksrc="lgogdownloader-${version}" +build_style=cmake +hostmakedepends="pkg-config" +makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel liboauth-devel + rhash-devel jsoncpp-devel boost-devel libressl-devel zlib-devel" +short_desc="An open source downloader for GOG.com games that uses the GOG.com API" +maintainer="RunningDroid " +license="WTFPL" +homepage="https://sites.google.com/site/gogdownloader/" +distfiles="https://sites.google.com/site/gogdownloader/lgogdownloader-${version}.tar.gz" +checksum=8bb7a37b48f558bddeb662ebac32796b0ae11fa2cc57a03d48b3944198e800ce + +if [ -z "$CROSS_BUILD" ]; then + hostmakedepends+=" help2man" +fi diff --git a/srcpkgs/LGOGDownloader/update b/srcpkgs/LGOGDownloader/update new file mode 100644 index 00000000000..e7782db2aa2 --- /dev/null +++ b/srcpkgs/LGOGDownloader/update @@ -0,0 +1,2 @@ +site="https://github.com/Sude-/lgogdownloader/releases" +pattern='v\K.+(?=)' diff --git a/srcpkgs/MEGAcmd/template b/srcpkgs/MEGAcmd/template index 8612b5dd654..dd31539111a 100644 --- a/srcpkgs/MEGAcmd/template +++ b/srcpkgs/MEGAcmd/template @@ -1,7 +1,7 @@ # Template file for 'MEGAcmd' pkgname=MEGAcmd version=0.9.7 -revision=2 +revision=3 build_style=gnu-configure make_build_args='LIBTOOLFLAGS="--tag=CXX"' hostmakedepends="autoconf-archive autogen gettext automake libtool pkg-config" diff --git a/srcpkgs/MEGAsdk/patches/01-include.patch b/srcpkgs/MEGAsdk/patches/01-include.patch deleted file mode 100644 index 65e5e6b8468..00000000000 --- a/srcpkgs/MEGAsdk/patches/01-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/Makefile.am 2018-02-02 13:43:23.000000000 +0100 -+++ - 2018-02-28 21:39:59.128449601 +0100 -@@ -53,6 +53,7 @@ - mega/mega_dict-src.h \ - mega/gfx/freeimage.h \ - mega/gfx/GfxProcCG.h \ -+ mega/mega_http_parser.h \ - mega/mediafileattribute.h - - if BUILD_MEGAAPI diff --git a/srcpkgs/MEGAsdk/patches/megacmd-02-qt.patch b/srcpkgs/MEGAsdk/patches/megacmd-02-qt.patch index 827b08f1535..92772b509b8 100644 --- a/srcpkgs/MEGAsdk/patches/megacmd-02-qt.patch +++ b/srcpkgs/MEGAsdk/patches/megacmd-02-qt.patch @@ -1,4 +1,6 @@ ---- a/bindings/qt/sdk.pri +diff --git bindings/qt/sdk.pri bindings/qt/sdk.pri +index c64482fc..0c9c4520 100644 +--- bindings/qt/sdk.pri +++ bindings/qt/sdk.pri @@ -2,7 +2,7 @@ MEGASDK_BASE_PATH = $$PWD/../../ @@ -9,51 +11,75 @@ src/backofftimer.cpp \ src/base64.cpp \ src/command.cpp \ -@@ -41,7 +41,7 @@ SOURCES += src/attrmap.cpp \ - src/mega_utf8proc.cpp +@@ -42,7 +42,7 @@ SOURCES += src/attrmap.cpp \ + src/mediafileattribute.cpp CONFIG(USE_MEGAAPI) { -- SOURCES += src/megaapi.cpp src/megaapi_impl.cpp \ -+ SOURCES += \ - bindings/qt/QTMegaRequestListener.cpp \ - bindings/qt/QTMegaTransferListener.cpp \ - bindings/qt/QTMegaGlobalListener.cpp \ -@@ -52,7 +52,6 @@ CONFIG(USE_MEGAAPI) { +- SOURCES += src/megaapi.cpp src/megaapi_impl.cpp ++ SOURCES -= src/megaapi.cpp src/megaapi_impl.cpp + + CONFIG(qt) { + SOURCES += bindings/qt/QTMegaRequestListener.cpp \ +@@ -67,7 +67,7 @@ CONFIG(USE_LIBWEBSOCKETS) { + } - # CONFIG += USE_LIBUV CONFIG(USE_LIBUV) { - SOURCES += src/mega_http_parser.cpp ++ SOURCES -= src/mega_http_parser.cpp DEFINES += HAVE_LIBUV INCLUDEPATH += $$MEGASDK_BASE_PATH/bindings/qt/3rdparty/include/libuv win32 { -@@ -98,12 +97,6 @@ win32 { - } +@@ -197,7 +197,7 @@ win32 { + CONFIG += USE_CURL + + CONFIG(USE_CURL) { +- SOURCES += src/wincurl/net.cpp \ ++ SOURCES -= src/wincurl/net.cpp \ + src/wincurl/fs.cpp \ + src/wincurl/waiter.cpp + HEADERS += include/mega/wincurl/meganet.h +@@ -205,7 +205,7 @@ win32 { + LIBS += -llibcurl -lcares -llibeay32 -lssleay32 + } + else { +- SOURCES += src/win32/net.cpp \ ++ SOURCES -= src/win32/net.cpp \ + src/win32/fs.cpp \ + src/win32/waiter.cpp + HEADERS += include/mega/win32/meganet.h +@@ -218,7 +218,7 @@ win32 { --unix { + unix { -SOURCES += src/posix/net.cpp \ -- src/posix/fs.cpp \ -- src/posix/waiter.cpp --} -- - HEADERS += include/mega.h \ - include/mega/account.h \ - include/mega/attrmap.h \ -@@ -169,9 +162,6 @@ win32 { ++SOURCES -= src/posix/net.cpp \ + src/posix/fs.cpp \ + src/posix/waiter.cpp + } +@@ -293,7 +293,7 @@ win32 { } unix { - !exists($$MEGASDK_BASE_PATH/include/mega/config.h) { -- error("Configuration file not found! Please re-run configure script located in the project's root directory!") -- } ++ exists($$MEGASDK_BASE_PATH/include/mega/config.h) { + error("Configuration file not found! Please re-run configure script located in the project's root directory!") + } HEADERS += include/mega/posix/meganet.h \ - include/mega/posix/megasys.h \ - include/mega/posix/megafs.h \ -@@ -231,6 +221,7 @@ win32 { +@@ -309,7 +309,7 @@ CONFIG(USE_PCRE) { + + CONFIG(qt) { + DEFINES += USE_QT MEGA_QT_LOGGING +- SOURCES += src/gfx/qt.cpp src/thread/qtthread.cpp ++ SOURCES -= src/gfx/qt.cpp src/thread/qtthread.cpp } + else { + DEFINES += USE_FREEIMAGE +@@ -385,7 +385,7 @@ win32 { unix:!macx { -+ LIBS += -lmega INCLUDEPATH += $$MEGASDK_BASE_PATH/include/mega/posix - LIBS += -lsqlite3 -lrt +- LIBS += -lsqlite3 -lrt ++ LIBS += -lmega -lsqlite3 -lrt + exists($$MEGASDK_BASE_PATH/bindings/qt/3rdparty/libs/libcurl.a) { + LIBS += $$MEGASDK_BASE_PATH/bindings/qt/3rdparty/libs/libcurl.a diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index 7d969509c38..2b96ed54fd8 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk -version=3.3.1 -revision=2 +version=3.3.8 +revision=1 wrksrc=sdk-${version} build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" @@ -16,16 +16,20 @@ maintainer="John " license="2-clause-BSD" homepage="https://mega.nz" distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz" -checksum=da00cbff64eba5b83a98c78347f8def3350fcf2c74ba4d4f03e099e42a1566e6 +checksum=a64bf54b335ebbfc0138f4d81f3106bc4f02e9c1c8f840cd90515a7b34c01cd4 replaces="libmega>=0" build_options="libuv mediainfo" case "$XBPS_TARGET_MACHINE" in - *-musl);; + *-musl) build_options_default="libuv";; *) build_options_default="libuv mediainfo";; esac +do_check() { + : #requires static gtest libs +} + pre_configure() { ./autogen.sh } diff --git a/srcpkgs/MEGAsync/template b/srcpkgs/MEGAsync/template index 60e60b670d8..ed50e9e40d5 100644 --- a/srcpkgs/MEGAsync/template +++ b/srcpkgs/MEGAsync/template @@ -1,6 +1,6 @@ # Template file for 'MEGAsync' pkgname=MEGAsync -version=3.6.0.0 +version=3.6.6.0 revision=1 wrksrc="${pkgname}-${version}_Linux" build_wrksrc="src" @@ -13,7 +13,7 @@ maintainer="John " license="custom" homepage="https://mega.co.nz" distfiles="https://github.com/meganz/MEGAsync/archive/v${version}_Linux.tar.gz" -checksum=4be2ff9e3c0beb7653e269e14802fc0cf82b58cd78b0dbbae469533635cd8ddc +checksum=377a0b77b2506ebe0052d6366c3b5b74c3012cb4938e4df5e4b003677073f5fa restricted=yes nocross=yes diff --git a/srcpkgs/MEGAsync/update b/srcpkgs/MEGAsync/update new file mode 100644 index 00000000000..382bff4f3ad --- /dev/null +++ b/srcpkgs/MEGAsync/update @@ -0,0 +1 @@ +pattern='/archive/(v?)?\K[\d\.]+(?=\_Linux\.tar\.gz")' diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template index 4ae89c43950..9acdbce084c 100644 --- a/srcpkgs/MoarVM/template +++ b/srcpkgs/MoarVM/template @@ -1,6 +1,6 @@ # Template file for 'MoarVM' pkgname=MoarVM -version=2018.05 +version=2018.06 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=9b4afe7a9a7716285355d4de6ed3991df1d5564c395b749a44de0fbaa768a383 +checksum=6eb8ffc8966151a8031c02abd78325fbe9ebeb0b835a5b7a9985ea3b25ca39a8 nocross=yes shlib_provides="libmoar.so" diff --git a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch new file mode 100644 index 00000000000..11f75722a5a --- /dev/null +++ b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch @@ -0,0 +1,10 @@ +Kludge to work around https://github.com/signalapp/Signal-Desktop/issues/2376. +--- Gruntfile.js.orig 2018-05-15 01:57:11.000000000 +0200 ++++ Gruntfile.js 2018-05-20 19:15:45.054357251 +0200 +@@ -511,6 +511,5 @@ + 'concat', + 'copy:deps', + 'sass', +- 'date', + ]); + }; diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index 34730a31020..8f50cec20e9 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -1,27 +1,25 @@ # Template file for 'Signal-Desktop' pkgname=Signal-Desktop -version=1.7.1 +version=1.12.1 revision=1 hostmakedepends="git python nodejs-lts" depends="libnotify libappindicator" short_desc="Signal Private Messenger for Linux" maintainer="Julio Galvan " -license="GPL-3" +license="GPL-3.0-only" homepage="https://github.com/signalapp/Signal-Desktop" distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz" -checksum=188fe8c17ccf49609467ab59ea6321beb7ee71e00da7b419249d205ebf80d13d +checksum=82ca68e0b912db19b4bc4d1bfb8b2d2f76e1d4393c4c1fa8ff950502883b18ac # Due to electron only_for_archs="x86_64 i686" nostrip_files="signal-desktop" - -post_extract() { - sed -i "s/'sass', 'date'/'sass'/g" Gruntfile.js -} +broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/9800/steps/shell_3/logs/stdio" do_build() { npm install -g yarn yarn install --ignore-engines - yarn pack-prod + yarn generate + yarn build-release --dir } do_install() { @@ -32,7 +30,7 @@ do_install() { x86_64*) _ARCH="-";; *) _ARCH="-${XBPS_TARGET_MACHINE%-musl}-";; esac - vcopy dist/linux${_ARCH}unpacked/* usr/share/signal-desktop + vcopy release/linux${_ARCH}unpacked/* usr/share/signal-desktop vmkdir usr/bin ln -s /usr/share/signal-desktop/signal-desktop ${DESTDIR}/usr/bin/ @@ -41,7 +39,7 @@ do_install() { vcopy ${FILESDIR}/signal.desktop usr/share/applications/ vmkdir usr/share/icons/hicolor - for size in 16 24 32 48 64 128 256 512; do + for size in 16 24 32 48 64 128 256 512 1024; do vinstall build/icons/png/${size}x${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps/ signal.png done npm remove -g yarn diff --git a/srcpkgs/abGate/patches/Makefile.patch b/srcpkgs/abGate/patches/Makefile.patch new file mode 100644 index 00000000000..eb30dae273c --- /dev/null +++ b/srcpkgs/abGate/patches/Makefile.patch @@ -0,0 +1,26 @@ +--- Makefile 2018-06-27 09:47:49.602920765 +0000 ++++ - 2018-06-27 09:48:44.684191018 +0000 +@@ -10,7 +10,7 @@ + cp $^ $(BUNDLE) + + abGateQt/libabGateQt.so: +- cd abGateQt; qmake; make ++ cd abGateQt; qmake-qt5 QMAKE_CC=$(CC) QMAKE_CXX=$(CXX) QMAKE_LINK=$(CXX); make CC=$(CC) CXX=$(CXX) LINK=$(CXX) + + gate.so: gate.cpp + g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so +--- Makefile 2018-06-27 09:50:25.705750049 +0000 ++++ - 2018-06-27 09:50:52.610670910 +0000 +@@ -13,10 +13,10 @@ + cd abGateQt; qmake-qt5 QMAKE_CC="$(CC)" QMAKE_CXX="$(CXX)" QMAKE_LINK="$(CXX)"; make CC="$(CC)" CXX="$(CXX)" LINK="$(CXX)" + + gate.so: gate.cpp +- g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so ++ $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so + + gate_gui.so: gate_gui.cpp main_window.cpp main_window.h knob.cpp knob.h toggle.cpp toggle.h preset_widget.cpp preset_widget.h presets.cpp presets.h preset.cpp preset.h gate_const.h plugin_configuration.h +- g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate_gui.cpp main_window.cpp knob.cpp toggle.cpp preset_widget.cpp presets.cpp preset.cpp `pkg-config --cflags gtkmm-2.4 --libs lv2 gthread-2.0` -o gate_gui.so ++ $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate_gui.cpp main_window.cpp knob.cpp toggle.cpp preset_widget.cpp presets.cpp preset.cpp `pkg-config --cflags gtkmm-2.4 --libs lv2 gthread-2.0` -o gate_gui.so + + all: $(BUNDLE) + diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template index 6b77d612276..6cd8e491840 100644 --- a/srcpkgs/abGate/template +++ b/srcpkgs/abGate/template @@ -1,18 +1,18 @@ # Template file for 'abGate' pkgname=abGate -version=1.1.8 +version=1.1.9 revision=1 build_style=gnu-makefile -hostmakedepends="pkg-config" -makedepends="qt-devel gtkmm2-devel lv2" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools" +makedepends="qt5-devel gtkmm2-devel lv2" depends="lv2" short_desc="LV2 Noise Gate plugin" maintainer="Juan RP " -license="GPL-3" +license="LGPL-3.0-or-later" homepage="http://abgate.sourceforge.net/" distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz" -checksum=6313f60b3e137f68b24ce30612187101c63cbdbe6291361656472380b2b8f797 +checksum=898b50cce44dffedd82ec0e6d6d043a9d26534fbf07898d099575ea4c1057721 -pre_build() { - sed -e 's,qmake-qt4,qmake,g' -i Makefile -} +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-devel" +fi diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index 88ea74ceff9..e802ed7cfc6 100644 --- a/srcpkgs/abcm2ps/template +++ b/srcpkgs/abcm2ps/template @@ -1,6 +1,6 @@ # Template file for 'abcm2ps' pkgname=abcm2ps -version=8.13.22 +version=8.13.23 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=9a1379fd93fcf2d87d580c85b43ca1930a4bc412c291be551af1035d08f26c36 +checksum=84f8a24a57ba7a1e5b989b5154c86700be583a79d3c9c2e4e8a63a94ccdc383c pre_configure() { echo CC=${CC} >> custom diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template index d377254a04c..2140c3677bd 100644 --- a/srcpkgs/ack/template +++ b/srcpkgs/ack/template @@ -1,15 +1,15 @@ # Template file for 'ack' pkgname=ack -version=2.22 +version=2.24 revision=1 noarch=yes build_style=perl-module hostmakedepends="perl-File-Next" -makedepends="${hostmakedepends}" -depends="${makedepends}" +makedepends="$hostmakedepends" +depends="$makedepends" short_desc="Tool like grep, optimized for programmers" maintainer="Jan S. " -homepage="https://beyondgrep.com/" license="Artistic-2.0" +homepage="https://beyondgrep.com/" distfiles="${CPAN_SITE}/App/ack-${version}.tar.gz" -checksum=02c441dbbc86bf69c792ae92dc92419a0448c31f69d9703dd1530425c36e0f6c +checksum=72934009ad8fe712deeb2c41960f2746d0a25e3a226ad7c54232c00105e54f00 diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template index 4ea13408959..16efe535899 100644 --- a/srcpkgs/acl/template +++ b/srcpkgs/acl/template @@ -1,17 +1,17 @@ # Template file for 'acl' pkgname=acl -version=2.2.52 -revision=4 +version=2.2.53 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" makedepends="attr-devel" short_desc="Access Control List filesystem support" maintainer="Juan RP " -homepage="http://savannah.nongnu.org/projects/acl" -license="LGPL-2.1" -distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz" -checksum=179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23 +license="LGPL-2.1-or-later" +homepage="https://savannah.nongnu.org/projects/acl" +distfiles="${NONGNU_SITE}/acl/acl-${version}.tar.gz" +checksum=06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7 if [ -z "$CHROOT_READY" ]; then CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include" @@ -21,11 +21,6 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then configure_args="--libdir=/usr/lib32 --libexecdir=/usr/lib32" fi -do_install() { - make DIST_ROOT=${DESTDIR} install install-lib install-dev - rm -rf ${DESTDIR}/usr/share/doc -} - acl-devel_package() { depends="attr-devel acl>=${version}_${revision}" short_desc+=" - development files" @@ -34,6 +29,8 @@ acl-devel_package() { vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove "usr/share/man/man[235]" + vmove usr/lib/pkgconfig + vmove usr/share/doc } } diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template index 9331c0a626f..c7d48818db4 100644 --- a/srcpkgs/acpica-utils/template +++ b/srcpkgs/acpica-utils/template @@ -1,6 +1,6 @@ # Template file for 'acpica-utils' pkgname=acpica-utils -version=20180508 +version=20180629 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=2b81e45cb9cc5116e9bbb39f8822ff90ec44f9f2bf6fa87243e2cd7376c5f4d8 +checksum=70d11f3f2adbdc64a5b33753e1889918af811ec8050722fbee0fdfc3bfd29a4f only_for_archs="i686 i686-musl x86_64 x86_64-musl" do_build() { diff --git a/srcpkgs/adapta-kde/template b/srcpkgs/adapta-kde/template index 4bdc9b64239..7996a053e1d 100644 --- a/srcpkgs/adapta-kde/template +++ b/srcpkgs/adapta-kde/template @@ -1,6 +1,6 @@ # Template file for 'adapta-kde' pkgname=adapta-kde -version=20180512 +version=20180618 revision=1 build_style=fetch noarch=yes @@ -9,7 +9,7 @@ maintainer="Giuseppe Fierro " license="GPL-3.0-or-later" homepage="https://github.com/PapirusDevelopmentTeam/adapta-kde" distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz" -checksum=9a3e04798b537a1ed6be4bcbbede0ef1d4d0b81008e45a54f281adbb2c42050e +checksum=33a23e4fe7f2ed0c3e7f6ef57694d56aa6961d384306ccf5aea56777eb2b094a do_install() { tar xzf ${version}.tar.gz --strip 1 diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index 26fe50ca9f2..f69a10c0460 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -1,6 +1,6 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin -version=29.0.0.171 +version=30.0.0.113 revision=1 # The EULA file _eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf" @@ -8,10 +8,10 @@ _eulacksum=2851b4b39df44a2777c6c07e1f59cbc3055a346d2e775121b9ed38e0a4bf40d2 _url=http://fpdownload.adobe.com/get/flashplayer/pdc/${version} if [ "$XBPS_MACHINE" = "x86_64" ]; then _disttarball="${_url}/flash_player_npapi_linux.x86_64.tar.gz" - _distcksum=83610bf1461cab7b0dea7360ab78328720f2dab1aa70a93bb9e170a05f3f859d + _distcksum=5470bfa42156ba1f307059ff47605474df1c6ad2bd99e0ab2bff8f982c23bb15 else _disttarball="${_url}/flash_player_npapi_linux.i386.tar.gz" - _distcksum=6b084e6f65a35387eacaa2200e998942b0e3afa93bb92fad88cf8102125bf21a + _distcksum=e86d43d797c692fa48b86e6792978331316b3da08cc1372b35cb9afe732ac15e fi distfiles="${_eula} ${_disttarball}" checksum="${_eulacksum} ${_distcksum}" diff --git a/srcpkgs/akonadi-contacts/update b/srcpkgs/akonadi-contacts/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/akonadi-contacts/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/akonadi-mime/update b/srcpkgs/akonadi-mime/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/akonadi-mime/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/akonadi-search/update b/srcpkgs/akonadi-search/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/akonadi-search/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/akonadi5/update b/srcpkgs/akonadi5/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/akonadi5/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/amiri-font/template b/srcpkgs/amiri-font/template new file mode 100644 index 00000000000..fcafb78d68a --- /dev/null +++ b/srcpkgs/amiri-font/template @@ -0,0 +1,22 @@ +# Template file for 'amiri-font' +pkgname=amiri-font +version=0.111 +revision=2 +noarch=yes +wrksrc="Amiri-${version}" +hostmakedepends="unzip" +depends="font-util" +short_desc="Classical Arabic typeface in Naskh style" +maintainer="John " +license="OFL-1.1" +homepage="https://github.com/alif-type/amiri/" +changelog="https://github.com/alif-type/amiri/blob/master/NEWS.md" +distfiles="https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip" +checksum=1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166 +font_dirs="/usr/share/fonts/TTF" + +do_install() { + for _i in *.ttf ; do + vinstall $_i 644 usr/share/fonts/TTF + done +} diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template index 12a5ee63009..300671a1158 100644 --- a/srcpkgs/amp/template +++ b/srcpkgs/amp/template @@ -1,16 +1,15 @@ # Template file for 'amp' pkgname=amp -version=0.3.4 -revision=2 -hostmakedepends="cargo git python3 pkg-config cmake perl" -makedepends="libxcb-devel libressl-devel zlib-devel libcurl-devel libssh2-devel - libgit2-devel" +version=0.4.0 +revision=1 +hostmakedepends="cargo cmake git perl pkg-config python3" +makedepends="libcurl-devel libgit2-devel libxcb-devel" short_desc="A complete text editor for your terminal" maintainer="Wilson Birney " -license="GPL-3" -homepage="https://github.com/jmacdonald/amp" +license="GPL-3.0-or-later" +homepage="https://amp.rs" distfiles="https://github.com/jmacdonald/amp/archive/${version}.tar.gz" -checksum=c950560292984d135ed5c92c87a2969a7b2b2d3ab97c5d4d5f66075edbc95169 +checksum=6bb6f5da2b14776f677a2ca7781eb82532181806975ecd92496c232ef3347266 nocross=yes do_build() { diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template index b2593365331..4336799a654 100644 --- a/srcpkgs/ampache/template +++ b/srcpkgs/ampache/template @@ -1,6 +1,6 @@ # Template file for 'ampache' pkgname=ampache -version=3.8.7 +version=3.8.8 revision=1 noarch=yes create_wrksrc=yes @@ -8,10 +8,10 @@ hostmakedepends="unzip" depends="php mysql" short_desc="Web-based tool for managing your audio/video files" maintainer="Steve Prybylski " -license="AGPL-3" +license="AGPL-3.0-or-later" homepage="http://ampache.org" distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip" -checksum=1327d384e10df6b6de0232ecddb0fe1ba9feb952107e47cfe37d2f0c15cdba34 +checksum=1e99785dcc5a5b0ca364bb670103be1c2b8cd6cb753bee2309faa34d424a01d6 do_install() { vmkdir usr/share/webapps/${pkgname} diff --git a/srcpkgs/android-tools/files/generate_build.rb b/srcpkgs/android-tools/files/generate_build.rb new file mode 100755 index 00000000000..e9319557b62 --- /dev/null +++ b/srcpkgs/android-tools/files/generate_build.rb @@ -0,0 +1,415 @@ +#!/usr/bin/ruby +# This ruby script has been copied from Arch Linux. + +# Android build system is complicated and does not allow to build +# separate parts easily. +# This script tries to mimic Android build rules. + +def expand(dir, files) + files.map{|f| File.join(dir,f)} +end + +# Compiles sources to *.o files. +# Returns array of output *.o filenames +def compile(sources, cflags) + outputs = [] + for s in sources + ext = File.extname(s) + + case ext + when '.c' + cc = 'cc' + lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS' + when '.cpp', '.cc' + cc = 'cxx' + lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS' + else + raise "Unknown extension #{ext}" + end + + output = s + '.o' + outputs << output + puts "build #{output}: #{cc} #{s}\n cflags = #{lang_flags} #{cflags}" + end + + return outputs +end + +# dir - directory where ninja file is located +# lib - static library path relative to dir +def subninja(dir, lib) + puts "subninja #{dir}build.ninja" + return lib.each{|l| dir + l} +end + +# Links object files +def link(output, objects, ldflags) + puts "build #{output}: link #{objects.join(' ')}\n ldflags = #{ldflags} $LDFLAGS" +end + +puts "# This set of commands generated by generate_build.rb script\n\n" +puts "CC = #{ENV['CC'] || 'clang'}" +puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n" +puts "CFLAGS = #{ENV['CFLAGS']}" +puts "CXXFLAGS = #{ENV['CXXFLAGS']}" +puts "LDFLAGS = #{ENV['LDFLAGS']}" +puts "PKGVER = #{ENV['PKGVER']}\n\n" + + +puts """ +rule cc + command = $CC $cflags -c $in -o $out + +rule cxx + command = $CXX $cflags -c $in -o $out + +rule link + command = $CXX $ldflags $LDFLAGS $in -o $out + + +""" + +adbdfiles = %w( + adb.cpp + adb_io.cpp + adb_listeners.cpp + adb_trace.cpp + adb_utils.cpp + bugreport.cpp + line_printer.cpp + sockets.cpp + transport.cpp + transport_local.cpp + transport_usb.cpp + transport_mdns_unsupported.cpp + fdevent.cpp + adb_auth_host.cpp + shell_service_protocol.cpp +) +libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include') + +adbfiles = %w( + console.cpp + socket_spec.cpp + commandline.cpp + adb_client.cpp + services.cpp + file_sync_client.cpp + sysdeps_unix.cpp + sysdeps/errno.cpp + client/main.cpp + client/usb_dispatch.cpp + client/usb_linux.cpp + client/usb_libusb.cpp + sysdeps/posix/network.cpp +) +libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb') + +basefiles = %w( + file.cpp + logging.cpp + parsenetaddress.cpp + stringprintf.cpp + strings.cpp + errors_unix.cpp + test_utils.cpp +) +libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include') + +logfiles = %w( + log_event_write.c + fake_log_device.c + log_event_list.c + logger_write.c + config_write.c + config_read.c + logger_lock.c + local_logger.c + fake_writer.c + logger_name.c + stderr_write.c + logprint.c +) +liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include') + +cutilsfiles = %w( + load_file.c + socket_local_client_unix.c + socket_network_client_unix.c + socket_local_server_unix.c + sockets_unix.cpp + socket_inaddr_any_server_unix.c + sockets.cpp + android_get_control_file.cpp + threads.c + fs_config.cpp + canned_fs_config.c +) +libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include') + +diagnoseusbfiles = %w( + diagnose_usb.cpp +) +libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include') + +libcryptofiles = %w( + android_pubkey.c +) +libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/include') + +# TODO: make subninja working +#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a']) +boringssl = ['boringssl/build/crypto/libcrypto.a'] + +link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, '-lpthread -lusb-1.0') + + +fastbootfiles = %w( + protocol.cpp + engine.cpp + bootimg_utils.cpp + fastboot.cpp + util.cpp + fs.cpp + usb_linux.cpp + socket.cpp + tcp.cpp + udp.cpp +) +libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include') + +sparsefiles = %w( + backed_block.c + output_file.c + sparse.c + sparse_crc32.c + sparse_err.c + sparse_read.cpp +) +libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include') + +f2fsfiles = %w( + f2fs_utils.c + f2fs_ioutils.c + f2fs_dlutils.c +) +f2fs = compile(expand('extras/f2fs_utils', f2fsfiles), '-Iextras/f2fs_utils -If2fs-tools/include -If2fs-tools/mkfs -Icore/libsparse/include -Iselinux/libselinux/include') + +zipfiles = %w( + zip_archive.cc +) +libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include -Icore/libziparchive/include') + +utilfiles = %w( + FileMap.cpp +) +libutil = compile(expand('core/libutils', utilfiles), '-Icore/include') + +ext4files = %w( + make_ext4fs.c + ext4fixup.c + ext4_utils.c + allocate.c + contents.c + extent.c + indirect.c + sha1.c + wipe.c + crc16.c + ext4_sb.c +) +libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include') + +selinuxfiles = %w( + callbacks.c + check_context.c + freecon.c + init.c + label.c + label_file.c + label_support.c + setrans_client.c + regex.c + matchpathcon.c + selinux_config.c + label_backends_android.c + canonicalize_context.c + lsetfilecon.c + policyvers.c + lgetfilecon.c + load_policy.c + seusers.c + sha1.c + booleans.c + disable.c + enabled.c + getenforce.c + setenforce.c +) +libselinux = compile(expand('selinux/libselinux/src', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include') + +libsepolfiles = %w( + policydb_public.c + genbools.c + debug.c + policydb.c + conditional.c + services.c + ebitmap.c + util.c + assertion.c + avtab.c + hashtab.c + sidtab.c + context.c + genusers.c + context_record.c + mls.c + avrule_block.c + symtab.c + policydb_convert.c + write.c + constraint.c + expand.c + hierarchy.c +) +libsepol = compile(expand('selinux/libsepol/src', libsepolfiles), '-Iselinux/libsepol/include') + +link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl') + + +# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955) +libext2fsfiles = %w( + lib/blkid/cache.c + lib/blkid/dev.c + lib/blkid/devname.c + lib/blkid/devno.c + lib/blkid/getsize.c + lib/blkid/llseek.c + lib/blkid/probe.c + lib/blkid/read.c + lib/blkid/resolve.c + lib/blkid/save.c + lib/blkid/tag.c + lib/e2p/feature.c + lib/e2p/hashstr.c + lib/e2p/mntopts.c + lib/e2p/ostype.c + lib/e2p/parse_num.c + lib/e2p/uuid.c + lib/et/com_err.c + lib/et/error_message.c + lib/et/et_name.c + lib/ext2fs/alloc.c + lib/ext2fs/alloc_sb.c + lib/ext2fs/alloc_stats.c + lib/ext2fs/alloc_tables.c + lib/ext2fs/atexit.c + lib/ext2fs/badblocks.c + lib/ext2fs/bb_inode.c + lib/ext2fs/bitmaps.c + lib/ext2fs/bitops.c + lib/ext2fs/blkmap64_ba.c + lib/ext2fs/blkmap64_rb.c + lib/ext2fs/blknum.c + lib/ext2fs/block.c + lib/ext2fs/bmap.c + lib/ext2fs/closefs.c + lib/ext2fs/crc16.c + lib/ext2fs/crc32c.c + lib/ext2fs/csum.c + lib/ext2fs/dirblock.c + lib/ext2fs/dir_iterate.c + lib/ext2fs/expanddir.c + lib/ext2fs/ext2_err.c + lib/ext2fs/ext_attr.c + lib/ext2fs/extent.c + lib/ext2fs/fallocate.c + lib/ext2fs/fileio.c + lib/ext2fs/freefs.c + lib/ext2fs/gen_bitmap64.c + lib/ext2fs/gen_bitmap.c + lib/ext2fs/get_num_dirs.c + lib/ext2fs/getsectsize.c + lib/ext2fs/getsize.c + lib/ext2fs/i_block.c + lib/ext2fs/ind_block.c + lib/ext2fs/initialize.c + lib/ext2fs/inline.c + lib/ext2fs/inline_data.c + lib/ext2fs/inode.c + lib/ext2fs/io_manager.c + lib/ext2fs/ismounted.c + lib/ext2fs/link.c + lib/ext2fs/llseek.c + lib/ext2fs/lookup.c + lib/ext2fs/mkdir.c + lib/ext2fs/mkjournal.c + lib/ext2fs/mmp.c + lib/ext2fs/namei.c + lib/ext2fs/newdir.c + lib/ext2fs/openfs.c + lib/ext2fs/progress.c + lib/ext2fs/punch.c + lib/ext2fs/rbtree.c + lib/ext2fs/read_bb.c + lib/ext2fs/read_bb_file.c + lib/ext2fs/res_gdt.c + lib/ext2fs/rw_bitmaps.c + lib/ext2fs/sparse_io.c + lib/ext2fs/symlink.c + lib/ext2fs/undo_io.c + lib/ext2fs/unix_io.c + lib/ext2fs/valid_blk.c + lib/support/dict.c + lib/support/mkquota.c + lib/support/parse_qtype.c + lib/support/plausible.c + lib/support/prof_err.c + lib/support/profile.c + lib/support/quotaio.c + lib/support/quotaio_tree.c + lib/support/quotaio_v2.c + lib/uuid/gen_uuid.c + lib/uuid/isnull.c + lib/uuid/pack.c + lib/uuid/parse.c + lib/uuid/unpack.c + lib/uuid/unparse.c + misc/create_inode.c +) +libext2fs = compile(expand('e2fsprogs', libext2fsfiles), '-Ie2fsprogs/lib -Icore/libsparse/include') + + +mke2fsfiles = %w( + misc/default_profile.c + misc/mke2fs.c + misc/mk_hugefiles.c + misc/util.c +) +mke2fs = compile(expand('e2fsprogs', mke2fsfiles), '-Ie2fsprogs/lib') + +link('mke2fs.android', mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lpthread -lz') + + +e2fsdroidfiles = %w( + contrib/android/e2fsdroid.c + contrib/android/basefs_allocator.c + contrib/android/block_range.c + contrib/android/hashmap.c + contrib/android/base_fs.c + contrib/android/fsmap.c + contrib/android/block_list.c + contrib/android/perms.c +) +e2fsdroid = compile(expand('e2fsprogs', e2fsdroidfiles), '-Ie2fsprogs/lib -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc') + +link('e2fsdroid', e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, '-lz -lpthread -lpcre2-8') + + +ext2simgfiles = %w( + contrib/android/ext2simg.c +) +ext2simg = compile(expand('e2fsprogs', ext2simgfiles), '-Ie2fsprogs/lib -Icore/libsparse/include') + +link('ext2simg', ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lz -lpthread') diff --git a/srcpkgs/android-tools/patches/android-tools-musl.patch b/srcpkgs/android-tools/patches/android-tools-musl.patch deleted file mode 100644 index e3630ce48c4..00000000000 --- a/srcpkgs/android-tools/patches/android-tools-musl.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff --git core/include/ziparchive/zip_archive.h core/include/ziparchive/zip_archive.h -index 7dc60ae..8886a35 100644 ---- core/include/ziparchive/zip_archive.h -+++ core/include/ziparchive/zip_archive.h -@@ -22,11 +22,12 @@ - - #include - #include --#include - #include - #include - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* Zip compression methods we support */ - enum { -@@ -215,6 +216,8 @@ int GetFileDescriptor(const ZipArchiveHandle handle); - - const char* ErrorCodeString(int32_t error_code); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif // LIBZIPARCHIVE_ZIPARCHIVE_H_ -diff --git core/liblog/log_portability.h core/liblog/log_portability.h -index 3ad2060..2b859c4 100644 ---- core/liblog/log_portability.h -+++ core/liblog/log_portability.h -@@ -17,7 +17,6 @@ - #ifndef _LIBLOG_PORTABILITY_H__ - #define _LIBLOG_PORTABILITY_H__ - --#include - #include - - /* Helpful private sys/cdefs.h like definitions */ - -diff --git core/include/private/android_filesystem_config.h core/include/private/android_filesystem_config.h -index c220a0c..d38f971 100644 ---- core/include/private/android_filesystem_config.h -+++ core/include/private/android_filesystem_config.h -@@ -22,7 +22,6 @@ - #ifndef _ANDROID_FILESYSTEM_CONFIG_H_ - #define _ANDROID_FILESYSTEM_CONFIG_H_ - --#include - #include - #include - -@@ -230,7 +229,10 @@ struct fs_path_config { - - /* Rules for directories and files has moved to system/code/libcutils/fs_config.c */ - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - - /* - * Used in: -@@ -247,7 +249,9 @@ void fs_config(const char *path, int dir, const char *target_out_path, - - ssize_t fs_config_generate(char *buffer, size_t length, const struct fs_path_config *pc); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif - #endif -diff --git core/base/file.cpp core/base/file.cpp -index da1adba..7ba6d23 100644 ---- core/base/file.cpp -+++ core/base/file.cpp -@@ -111,7 +111,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path, - - bool WriteStringToFile(const std::string& content, const std::string& path) { - int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW | O_BINARY; -- int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, DEFFILEMODE)); -+ int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))); - if (fd == -1) { - return false; - } -diff --git core/adb/sysdeps.h core/adb/sysdeps.h -index 75dcc86..2dba172 100644 ---- core/adb/sysdeps.h -+++ core/adb/sysdeps.h -@@ -757,18 +757,7 @@ static __inline__ int adb_thread_setname(const std::string& name) { - #ifdef __APPLE__ - return pthread_setname_np(name.c_str()); - #else -- const char *s = name.c_str(); -- -- // pthread_setname_np fails rather than truncating long strings. -- const int max_task_comm_len = 16; // including the null terminator -- if (name.length() > (max_task_comm_len - 1)) { -- char buf[max_task_comm_len]; -- strncpy(buf, name.c_str(), sizeof(buf) - 1); -- buf[sizeof(buf) - 1] = '\0'; -- s = buf; -- } -- -- return pthread_setname_np(pthread_self(), s) ; -+ return 0; - #endif - } - -diff --git core/adb/diagnose_usb.cpp core/adb/diagnose_usb.cpp -index 0f067b0..1138f8d 100644 ---- core/adb/diagnose_usb.cpp -+++ core/adb/diagnose_usb.cpp -@@ -32,28 +32,7 @@ static const char kPermissionsHelpUrl[] = "http://developer.android.com/tools/de - // Returns a message describing any potential problems we find with udev, or nullptr if we can't - // find plugdev information (i.e. udev is not installed). - static const char* GetUdevProblem() { --#if defined(__linux__) -- errno = 0; -- group* plugdev_group = getgrnam("plugdev"); -- -- if (plugdev_group == nullptr) { -- if (errno != 0) { -- perror("failed to read plugdev group info"); -- } -- // We can't give any generally useful advice here, just let the caller print the help URL. -- return nullptr; -- } -- -- // getgroups(2) indicates that the group_member() may not check the egid so we check it -- // additionally just to be sure. -- if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) { -- // The user is in plugdev so the problem is likely with the udev rules. -- return "verify udev rules"; -- } -- return "udev requires plugdev group membership"; --#else - return nullptr; --#endif - } - - // Short help text must be a single line, and will look something like: -diff --git core/fastboot/socket.cpp core/fastboot/socket.cpp -index 14ecd93..aff905c 100644 ---- core/fastboot/socket.cpp -+++ core/fastboot/socket.cpp -@@ -31,6 +31,8 @@ - #include - #include - -+#include -+ - Socket::Socket(cutils_socket_t sock) : sock_(sock) {} - - Socket::~Socket() { diff --git a/srcpkgs/android-tools/patches/android-tools-uchar.patch b/srcpkgs/android-tools/patches/android-tools-uchar.patch deleted file mode 100644 index 2656c43948f..00000000000 --- a/srcpkgs/android-tools/patches/android-tools-uchar.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- core/include/cutils/jstring.h.orig 2017-04-13 09:40:53.139449328 +0200 -+++ core/include/cutils/jstring.h 2017-04-13 09:39:36.520748834 +0200 -@@ -19,6 +19,7 @@ - - #include - #include -+#include - - #ifdef __cplusplus - extern "C" { diff --git a/srcpkgs/android-tools/patches/android-tools.patch b/srcpkgs/android-tools/patches/android-tools.patch deleted file mode 100644 index 5089eb7f1c0..00000000000 --- a/srcpkgs/android-tools/patches/android-tools.patch +++ /dev/null @@ -1,822 +0,0 @@ -diff --git a/Makefile b/Makefile -new file mode 100644 -index 000000000000..4644fc0b62ad ---- /dev/null -+++ Makefile -@@ -0,0 +1,47 @@ -+all: -+ $(MAKE) -C core/libcutils all -+ $(MAKE) -C libselinux all -+ $(MAKE) -C core/libziparchive all -+ $(MAKE) -C extras/ext4_utils all -+ $(MAKE) -C core/libsparse all -+ $(MAKE) -C core/libutils all -+ $(MAKE) -C core/liblog all -+ $(MAKE) -C core/base all -+ $(MAKE) -C gtest all -+ $(MAKE) -C extras/f2fs_utils all -+ $(MAKE) -C core/adb all -+ $(MAKE) -C core/fastboot all -+ -+install: all -+ $(MAKE) -C core/adb install -+ $(MAKE) -C core/fastboot install -+ -+clean: -+ $(MAKE) -C core/libcutils clean -+ $(MAKE) -C libselinux clean -+ $(MAKE) -C core/libziparchive clean -+ $(MAKE) -C extras/ext4_utils clean -+ $(MAKE) -C core/libsparse clean -+ $(MAKE) -C core/libutils clean -+ $(MAKE) -C core/liblog clean -+ $(MAKE) -C core/adb libdiagnose_usb -+ $(MAKE) -C core/base clean -+ $(MAKE) -C gtest clean -+ $(MAKE) -C extras/f2fs_utils clean -+ $(MAKE) -C core/adb clean -+ $(MAKE) -C core/fastboot clean -+ -+mrproper: -+ $(MAKE) -C core/libcutils mrproper -+ $(MAKE) -C libselinux mrproper -+ $(MAKE) -C core/libziparchive mrproper -+ $(MAKE) -C extras/ext4_utils mrproper -+ $(MAKE) -C core/libsparse mrproper -+ $(MAKE) -C core/libutils mrproper -+ $(MAKE) -C core/liblog mrproper -+ $(MAKE) -C core/adb libdiagnose_usb -+ $(MAKE) -C core/base mrproper -+ $(MAKE) -C gtest mrproper -+ $(MAKE) -C extras/f2fs_utils mrproper -+ $(MAKE) -C core/adb mrproper -+ $(MAKE) -C core/fastboot mrproper -diff --git core/adb/Makefile core/adb/Makefile -new file mode 100644 -index 0000000..8ef539b ---- /dev/null -+++ core/adb/Makefile -@@ -0,0 +1,97 @@ -+adb_version := $(shell git -C . rev-parse --short=12 HEAD 2>/dev/null)-android -+ -+SRCS+= \ -+ adb_client.cpp \ -+ client/main.cpp \ -+ console.cpp \ -+ commandline.cpp \ -+ file_sync_client.cpp \ -+ line_printer.cpp \ -+ services.cpp \ -+ shell_service_protocol.cpp \ -+ -+LIBADB_SRCS= \ -+ adb.cpp \ -+ adb_auth.cpp \ -+ adb_io.cpp \ -+ adb_listeners.cpp \ -+ adb_trace.cpp \ -+ adb_utils.cpp \ -+ fdevent.cpp \ -+ sockets.cpp \ -+ transport.cpp \ -+ transport_local.cpp \ -+ transport_usb.cpp \ -+ adb_auth_host.cpp \ -+ get_my_path_linux.cpp \ -+ sysdeps_unix.cpp \ -+ usb_linux.cpp \ -+ -+LIBDIAGNOSE_USB_SRCS= \ -+ diagnose_usb.cpp -+ -+ -+override CXXFLAGS+= \ -+ -I. \ -+ -I../include \ -+ -I../base/include \ -+ -D_Nonnull="" \ -+ -D_Nullable="" \ -+ -D_GNU_SOURCE \ -+ -Wall \ -+ -Wextra \ -+ -Wno-unused-parameter \ -+ -Wno-missing-field-initializers \ -+ -Wvla \ -+ -DADB_REVISION='"$(adb_version)"' \ -+ -std=gnu++14 \ -+ -DADB_HOST=1 \ -+ -fpermissive \ -+ -fvisibility=hidden -+ -+ -+LIBS= \ -+ ./libadb.a \ -+ ./libdiagnose_usb.a \ -+ ../base/libbase.a \ -+ ../libcutils/libcutils.a \ -+ ../liblog/liblog.a -+ -+override LDFLAGS+= -lssl -lcrypto -lpthread -+ -+OBJS= $(SRCS:.cpp=.o) -+LIBADB_OBJS= $(LIBADB_SRCS:.cpp=.o) -+LIBDIAGNOSE_USB_OBJS= $(LIBDIAGNOSE_USB_SRCS:.cpp=.o) -+ -+BIN= adb -+ -+all: $(BIN) -+ -+adb: $(OBJS) libadb libdiagnose_usb -+ $(CXX) -o $@ $(OBJS) $(LIBS) $(LDFLAGS) -+ -+ -+libadb: libadb.a -+ -+libadb.a: $(LIBADB_OBJS) -+ $(AR) rcs $@ $(LIBADB_OBJS) -+ -+libdiagnose_usb: libdiagnose_usb.a -+ -+libdiagnose_usb.a: $(LIBDIAGNOSE_USB_OBJS) -+ $(AR) rcs $@ $(LIBDIAGNOSE_USB_OBJS) -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+install: adb -+ install -Dm755 adb $(DESTDIR)$(PREFIX)/bin/adb -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) $(LIBADB_OBJS) $(LIBDIAGNOSE_USB_OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) *.a -+ -diff --git core/base/Makefile core/base/Makefile -new file mode 100644 -index 0000000..d3e7436 ---- /dev/null -+++ core/base/Makefile -@@ -0,0 +1,37 @@ -+SRCS+= \ -+ file.cpp \ -+ logging.cpp \ -+ parsenetaddress.cpp \ -+ stringprintf.cpp \ -+ strings.cpp \ -+ test_utils.cpp \ -+ errors_unix.cpp -+ -+override CXXFLAGS+= \ -+ -I./include \ -+ -I../include \ -+ -D__GLIBC__ \ -+ -Wall \ -+ -Wextra \ -+ -Werror \ -+ -std=gnu++14 -+ -+OBJS= $(SRCS:.cpp=.o) -+ -+BIN= libbase.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/base/errors_unix.cpp core/base/errors_unix.cpp -index 296995e..3b983d3 100644 ---- core/base/errors_unix.cpp -+++ core/base/errors_unix.cpp -@@ -17,6 +17,7 @@ - #include "android-base/errors.h" - - #include -+#include - - namespace android { - namespace base { -diff --git core/base/logging.cpp core/base/logging.cpp -index 1741871..0aaae2e 100644 ---- core/base/logging.cpp -+++ core/base/logging.cpp -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git core/fastboot/Makefile core/fastboot/Makefile -new file mode 100644 -index 0000000..6d81f7c ---- /dev/null -+++ core/fastboot/Makefile -@@ -0,0 +1,70 @@ -+fastboot_version := $(shell git -C . rev-parse --short=12 HEAD 2>/dev/null)-android -+ -+SRCS+= \ -+ bootimg_utils.cpp \ -+ engine.cpp \ -+ fastboot.cpp \ -+ fs.cpp\ -+ protocol.cpp \ -+ socket.cpp \ -+ tcp.cpp \ -+ udp.cpp \ -+ util.cpp \ -+ usb_linux.cpp \ -+ util_linux.cpp -+ -+ -+override CXXFLAGS+= \ -+ -I../mkbootimg/ \ -+ -I../base/include \ -+ -I../libsparse/include \ -+ -I../include \ -+ -I../adb \ -+ -I../../gtest/include \ -+ -I../../extras/ext4_utils \ -+ -I../../extras/f2fs_utils \ -+ -Wall \ -+ -Wextra \ -+ -Werror \ -+ -Wunreachable-code \ -+ -DFASTBOOT_REVISION='"$(fastboot_version)"' \ -+ -std=gnu++14 -+ -+LIBS= \ -+ ../libziparchive/libziparchive.a \ -+ ../../extras/ext4_utils/libext4_utils.a \ -+ ../libsparse/libsparse.a \ -+ ../libutils/libutils.a \ -+ ../liblog/liblog.a \ -+ ../adb/libdiagnose_usb.a \ -+ ../base/libbase.a \ -+ ../libcutils/libcutils.a \ -+ ../../gtest/libgtest.a \ -+ ../../extras/f2fs_utils/libf2fs.a \ -+ ../libcutils/libcutils.a \ -+ ../../libselinux/libselinux.a -+ -+override LDFLAGS+= -lz -lpcre -lpthread -+ -+OBJS= $(SRCS:.cpp=.o) -+ -+BIN= fastboot -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(CXX) -o $@ $(OBJS) $(LIBS) $(LDFLAGS) -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+install: fastboot -+ install -Dm755 fastboot $(DESTDIR)$(PREFIX)/bin/fastboot -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/include/cutils/atomic.h core/include/cutils/atomic.h -index ded972a..2ff6fce 100644 ---- core/include/cutils/atomic.h -+++ core/include/cutils/atomic.h -@@ -19,7 +19,12 @@ - - #include - #include -+#ifdef __cplusplus -+#include -+using namespace std; -+#else - #include -+#endif - - #ifndef ANDROID_ATOMIC_INLINE - #define ANDROID_ATOMIC_INLINE static inline -@@ -114,6 +119,7 @@ int32_t android_atomic_or(int32_t value, volatile int32_t* addr) - return atomic_fetch_or_explicit(a, value, memory_order_release); - } - -+#ifndef __cplusplus - /* - * Perform an atomic load with "acquire" or "release" ordering. - * -@@ -208,6 +214,7 @@ int android_atomic_release_cas(int32_t oldvalue, int32_t newvalue, - memory_order_release, - memory_order_relaxed)); - } -+#endif - - /* - * Fence primitives. -diff --git core/include/log/log.h core/include/log/log.h -index e606a84..963347a 100644 ---- core/include/log/log.h -+++ core/include/log/log.h -@@ -38,6 +38,7 @@ - #include - - #ifdef __cplusplus -+#include - extern "C" { - #endif - -diff --git core/libcutils/Makefile core/libcutils/Makefile -new file mode 100644 -index 0000000..ec9c573 ---- /dev/null -+++ core/libcutils/Makefile -@@ -0,0 +1,59 @@ -+CSRCS+= \ -+ config_utils.c \ -+ fs_config.c \ -+ canned_fs_config.c \ -+ hashmap.c \ -+ iosched_policy.c \ -+ load_file.c \ -+ native_handle.c \ -+ open_memstream.c \ -+ process_name.c \ -+ record_stream.c \ -+ sched_policy.c \ -+ strdup16to8.c \ -+ strdup8to16.c \ -+ strlcpy.c \ -+ threads.c \ -+ fs.c \ -+ multiuser.c \ -+ socket_inaddr_any_server_unix.c \ -+ socket_local_client_unix.c \ -+ socket_local_server_unix.c \ -+ socket_loopback_client_unix.c \ -+ socket_loopback_server_unix.c \ -+ socket_network_client_unix.c \ -+ str_parms.c \ -+ ashmem-host.c \ -+ trace-host.c \ -+ dlmalloc_stubs.c -+ -+CXXSRCS+= \ -+ sockets_unix.cpp \ -+ sockets.cpp -+ -+override CFLAGS+= -I../include -+ -+override CXXFLAGS+= -I../include -+ -+COBJS= $(CSRCS:.c=.o) -+CXXOBJS= $(CXXSRCS:.cpp=.o) -+BIN= libcutils.a -+ -+all: $(BIN) -+ -+$(BIN): $(COBJS) $(CXXOBJS) -+ $(AR) rcs $@ $(COBJS) $(CXXOBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(COBJS) $(CXXOBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libcutils/fs.c core/libcutils/fs.c -index 3f14de7..175df6a 100644 ---- core/libcutils/fs.c -+++ core/libcutils/fs.c -@@ -79,7 +79,7 @@ static int fs_prepare_path_impl(const char* path, mode_t mode, uid_t uid, gid_t - create: - create_result = prepare_as_dir - ? TEMP_FAILURE_RETRY(mkdir(path, mode)) -- : TEMP_FAILURE_RETRY(open(path, O_CREAT | O_CLOEXEC | O_NOFOLLOW | O_RDONLY)); -+ : TEMP_FAILURE_RETRY(open(path, O_CREAT | O_CLOEXEC | O_NOFOLLOW | O_RDONLY, mode)); - if (create_result == -1) { - if (errno != EEXIST) { - ALOGE("Failed to %s(%s): %s", -diff --git core/liblog/Makefile core/liblog/Makefile -new file mode 100644 -index 0000000..75a0af3 ---- /dev/null -+++ core/liblog/Makefile -@@ -0,0 +1,39 @@ -+SRCS+= \ -+ log_event_list.c \ -+ log_event_write.c \ -+ logger_write.c \ -+ config_write.c \ -+ logger_name.c \ -+ logger_lock.c \ -+ fake_log_device.c \ -+ fake_writer.c \ -+ event_tag_map.c -+ -+ -+override CFLAGS+= \ -+ -I../include \ -+ -DLIBLOG_LOG_TAG=1005 \ -+ -DSNET_EVENT_LOG_TAG=1397638484 \ -+ -DFAKE_LOG_DEVICE=1 \ -+ -Werror \ -+ -fvisibility=hidden -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= liblog.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libpackagelistparser/Makefile core/libpackagelistparser/Makefile -new file mode 100644 -index 0000000..38a0158 ---- /dev/null -+++ core/libpackagelistparser/Makefile -@@ -0,0 +1,20 @@ -+SRCS+= \ -+ packagelistparser.c -+ -+override CFLAGS+= -I../include -+override CFLAGS+= -I./include -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libpackagelistparser.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+clean: -+ rm -rf *.o -diff --git core/libsparse/Makefile core/libsparse/Makefile -new file mode 100644 -index 0000000..418c028 ---- /dev/null -+++ core/libsparse/Makefile -@@ -0,0 +1,31 @@ -+SRCS+= \ -+ backed_block.c \ -+ output_file.c \ -+ sparse.c \ -+ sparse_crc32.c \ -+ sparse_err.c \ -+ sparse_read.c -+ -+override CFLAGS+= \ -+ -I./include \ -+ -Werror -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libsparse.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libutils/Makefile core/libutils/Makefile -new file mode 100644 -index 0000000..82a22b9 ---- /dev/null -+++ core/libutils/Makefile -@@ -0,0 +1,50 @@ -+SRCS+= \ -+ CallStack.cpp \ -+ FileMap.cpp \ -+ JenkinsHash.cpp \ -+ LinearTransform.cpp \ -+ Log.cpp \ -+ NativeHandle.cpp \ -+ Printer.cpp \ -+ PropertyMap.cpp \ -+ RefBase.cpp \ -+ SharedBuffer.cpp \ -+ Static.cpp \ -+ StopWatch.cpp \ -+ String8.cpp \ -+ String16.cpp \ -+ SystemClock.cpp \ -+ Threads.cpp \ -+ Timers.cpp \ -+ Tokenizer.cpp \ -+ Unicode.cpp \ -+ VectorImpl.cpp \ -+ misc.cpp \ -+ Looper.cpp \ -+ ProcessCallStack.cpp -+ -+override CXXFLAGS+= \ -+ -I../include \ -+ -I../../safe-iop/include \ -+ -DLIBUTILS_NATIVE=1 \ -+ -std=gnu++14 -+ -+OBJS= $(SRCS:.cpp=.o) -+ -+BIN= libutils.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libziparchive/Makefile core/libziparchive/Makefile -new file mode 100644 -index 0000000..4eef274 ---- /dev/null -+++ core/libziparchive/Makefile -@@ -0,0 +1,34 @@ -+SRCS+= \ -+ zip_archive.cc \ -+ zip_archive_stream_entry.cc \ -+ zip_writer.cc \ -+ -+override CXXFLAGS+= \ -+ -I./include \ -+ -I../include \ -+ -I../base/include \ -+ -DZLIB_CONST \ -+ -Werror \ -+ -fno-strict-aliasing \ -+ -std=gnu++14 \ -+ -Wall -+ -+OBJS= $(SRCS:.cc=.o) -+ -+BIN= libziparchive.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libziparchive/zip_writer.cc core/libziparchive/zip_writer.cc -index 1ebed30..5c622d0 100644 ---- core/libziparchive/zip_writer.cc -+++ core/libziparchive/zip_writer.cc -@@ -24,6 +24,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git extras/ext4_utils/Makefile extras/ext4_utils/Makefile -new file mode 100644 -index 0000000..000aaca ---- /dev/null -+++ extras/ext4_utils/Makefile -@@ -0,0 +1,38 @@ -+SRCS+= \ -+ make_ext4fs.c \ -+ ext4fixup.c \ -+ ext4_utils.c \ -+ allocate.c \ -+ contents.c \ -+ extent.c \ -+ indirect.c \ -+ sha1.c \ -+ wipe.c \ -+ crc16.c \ -+ ext4_sb.c -+ -+override CFLAGS+= \ -+ -I../../core/libsparse/include \ -+ -I../../core/include \ -+ -I../../libselinux/include \ -+ -fno-strict-aliasing -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libext4_utils.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git extras/f2fs_utils/Makefile extras/f2fs_utils/Makefile -new file mode 100644 -index 0000000..d81ac9a ---- /dev/null -+++ extras/f2fs_utils/Makefile -@@ -0,0 +1,34 @@ -+SRCS+= \ -+ f2fs_utils.c \ -+ f2fs_ioutils.c \ -+ f2fs_dlutils.c -+ -+ -+override CFLAGS+= \ -+ -I../../f2fs-tools/include \ -+ -I../../f2fs-tools/mkfs \ -+ -I../../core/libsparse/include \ -+ -I../../libselinux/include \ -+ -Wno-unused-parameter -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libf2fs.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -+ -+ -diff --git extras/f2fs_utils/f2fs_utils.c extras/f2fs_utils/f2fs_utils.c -index 6254c08..05ec599 100644 ---- extras/f2fs_utils/f2fs_utils.c -+++ extras/f2fs_utils/f2fs_utils.c -@@ -53,7 +53,7 @@ static void reset_f2fs_info() { - config.fd = -1; - if (f2fs_sparse_file) { - sparse_file_destroy(f2fs_sparse_file); -- f2fs_sparse_file = NULL; -+ f2fs_sparse_file = 0; - } - } - -@@ -73,6 +73,6 @@ int make_f2fs_sparse_fd(int fd, long long len, - sparse_file_write(f2fs_sparse_file, fd, /*gzip*/0, /*sparse*/1, /*crc*/0); - sparse_file_destroy(f2fs_sparse_file); - flush_sparse_buffs(); -- f2fs_sparse_file = NULL; -+ f2fs_sparse_file = 0; - return 0; - } -diff --git libselinux/Makefile libselinux/Makefile -new file mode 100644 -index 0000000..52ef5cc ---- /dev/null -+++ libselinux/Makefile -@@ -0,0 +1,31 @@ -+SRCS+= \ -+ src/callbacks.c \ -+ src/check_context.c \ -+ src/freecon.c \ -+ src/init.c \ -+ src/label.c \ -+ src/label_file.c \ -+ src/label_android_property.c \ -+ src/label_support.c -+ -+override CFLAGS+= -I./include -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libselinux.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git gtest/Makefile gtest/Makefile -new file mode 100644 -index 0000000..49a50aa ---- /dev/null -+++ gtest/Makefile -@@ -0,0 +1,36 @@ -+SRCS+= \ -+ src/gtest-all.cc \ -+ src/gtest-filepath.cc \ -+ src/gtest-printers.cc \ -+ src/gtest-typed-test.cc \ -+ src/gtest_main.cc \ -+ src/gtest-death-test.cc \ -+ src/gtest-port.cc \ -+ src/gtest-test-part.cc \ -+ src/gtest.cc -+ -+ -+override CXXFLAGS+= \ -+ -I./include \ -+ -I. -+ -+OBJS= $(SRCS:.cc=.o) -+ -+BIN= libgtest.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.cc -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -+ diff --git a/srcpkgs/android-tools/patches/gcc-fixes.patch b/srcpkgs/android-tools/patches/gcc-fixes.patch new file mode 100644 index 00000000000..fc0e60fa06e --- /dev/null +++ b/srcpkgs/android-tools/patches/gcc-fixes.patch @@ -0,0 +1,30 @@ +--- core/adb/sysdeps.h ++++ core/adb/sysdeps.h +@@ -66,6 +66,11 @@ + #endif + #endif + ++#ifndef __clang__ ++#define _Nonnull ++#define _Nullable ++#endif ++ + #ifdef _WIN32 + + // Clang-only nullability specifiers +--- core/libcutils/include/cutils/trace.h ++++ core/libcutils/include/cutils/trace.h +@@ -18,7 +18,13 @@ + #define _LIBS_CUTILS_TRACE_H + + #include ++// https://gcc.gnu.org/PR60932 ++#ifdef __cplusplus ++#include ++using namespace std; ++#else + #include ++#endif + #include + #include + #include diff --git a/srcpkgs/android-tools/patches/musl-fixes.patch b/srcpkgs/android-tools/patches/musl-fixes.patch new file mode 100644 index 00000000000..235ef68854e --- /dev/null +++ b/srcpkgs/android-tools/patches/musl-fixes.patch @@ -0,0 +1,199 @@ +Patch has been taken from Arch Linux with some minor modifications for +needed to build android-tools with musl libc. + +diff -upr core.orig/adb/client/usb_libusb.cpp core/adb/client/usb_libusb.cpp +--- core.orig/adb/client/usb_libusb.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/adb/client/usb_libusb.cpp 2018-02-25 10:35:06.661418453 +0100 +@@ -21,6 +21,7 @@ + #include + + #include ++#include + #include + #include + #include +@@ -28,7 +29,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff -upr core.orig/adb/diagnose_usb.cpp core/adb/diagnose_usb.cpp +--- core.orig/adb/diagnose_usb.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/adb/diagnose_usb.cpp 2018-02-25 10:35:06.658085109 +0100 +@@ -45,9 +45,7 @@ static std::string GetUdevProblem() { + return ""; + } + +- // getgroups(2) indicates that the GNU group_member(3) may not check the egid so we check it +- // additionally just to be sure. +- if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) { ++ if (getegid() == plugdev_group->gr_gid) { + // The user is in plugdev so the problem is likely with the udev rules. + return "user in plugdev group; are your udev rules wrong?"; + } +diff -upr core.orig/adb/sysdeps/posix/network.cpp core/adb/sysdeps/posix/network.cpp +--- core.orig/adb/sysdeps/posix/network.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/adb/sysdeps/posix/network.cpp 2018-02-25 10:35:06.661418453 +0100 +@@ -21,6 +21,7 @@ + #include + + #include ++#include + + #include "adb_unique_fd.h" + +diff -upr core.orig/base/errors_unix.cpp core/base/errors_unix.cpp +--- core.orig/base/errors_unix.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/base/errors_unix.cpp 2018-02-25 10:35:06.654751766 +0100 +@@ -17,6 +17,7 @@ + #include "android-base/errors.h" + + #include ++#include + + namespace android { + namespace base { +diff -upr core.orig/base/file.cpp core/base/file.cpp +--- core.orig/base/file.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/base/file.cpp 2018-02-25 10:35:06.654751766 +0100 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -upr core.orig/base/logging.cpp core/base/logging.cpp +--- core.orig/base/logging.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/base/logging.cpp 2018-02-25 10:35:06.654751766 +0100 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + // For getprogname(3) or program_invocation_short_name. + #if defined(__ANDROID__) || defined(__APPLE__) +@@ -89,7 +90,7 @@ static thread_id GetThreadId() { + } + + namespace { +-#if defined(__GLIBC__) ++#if defined(__linux__) + const char* getprogname() { + return program_invocation_short_name; + } +diff -upr core.orig/fastboot/fs.cpp core/fastboot/fs.cpp +--- core.orig/fastboot/fs.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/fastboot/fs.cpp 2018-02-25 10:35:06.651418422 +0100 +@@ -108,7 +108,7 @@ static int generate_ext4_image(const cha + static constexpr int block_size = 4096; + const std::string exec_dir = android::base::GetExecutableDirectory(); + +- const std::string mke2fs_path = exec_dir + "/mke2fs"; ++ const std::string mke2fs_path = exec_dir + "/mke2fs.android"; + std::vector mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"}; + + std::string block_size_str = std::to_string(block_size); +diff -upr core.orig/fastboot/socket.cpp core/fastboot/socket.cpp +--- core.orig/fastboot/socket.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/fastboot/socket.cpp 2018-02-25 10:35:06.651418422 +0100 +@@ -28,6 +28,8 @@ + + #include "socket.h" + ++#include ++ + #include + #include + +diff -upr core.orig/libsparse/sparse_read.cpp core/libsparse/sparse_read.cpp +--- core.orig/libsparse/sparse_read.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/libsparse/sparse_read.cpp 2018-02-25 10:35:06.621418331 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + + #include +diff -upr selinux.orig/libsepol/src/private.h selinux/libsepol/src/private.h +--- selinux.orig/libsepol/src/private.h 2017-08-13 09:34:17.000000000 +0200 ++++ selinux/libsepol/src/private.h 2018-02-25 10:36:31.765008355 +0100 +@@ -14,7 +14,7 @@ + #endif + + #include +-#include ++#include "dso.h" + + #ifdef __APPLE__ + #define __BYTE_ORDER BYTE_ORDER +diff -upr selinux.orig/libsepol/src/util.c selinux/libsepol/src/util.c +--- selinux.orig/libsepol/src/util.c 2017-08-13 09:34:17.000000000 +0200 ++++ selinux/libsepol/src/util.c 2018-02-25 10:36:31.765008355 +0100 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include "dso.h" + + struct val_to_name { + unsigned int val; +diff -upr e2fsprogs.orig/contrib/android/perms.c e2fsprogs/contrib/android/perms.c +--- e2fsprogs.orig/contrib/android/perms.c 2017-11-29 00:28:33.000000000 +0100 ++++ e2fsprogs/contrib/android/perms.c 2018-02-25 10:37:13.048466147 +0100 +@@ -5,6 +5,7 @@ + #include "support/nls-enable.h" + #include + #include ++#include "private/android_filesystem_capability.h" + + #ifndef XATTR_SELINUX_SUFFIX + # define XATTR_SELINUX_SUFFIX "selinux" +diff -upr e2fsprogs.orig/lib/ext2fs/bitops.h e2fsprogs/lib/ext2fs/bitops.h +--- e2fsprogs.orig/lib/ext2fs/bitops.h 2017-11-29 00:28:33.000000000 +0100 ++++ e2fsprogs/lib/ext2fs/bitops.h 2018-02-25 10:37:13.028466087 +0100 +@@ -233,11 +233,11 @@ extern errcode_t ext2fs_find_first_set_g + #if (__STDC_VERSION__ >= 199901L) + #define _INLINE_ extern inline + #else +-#define _INLINE_ inline ++#define _INLINE_ static inline + #endif + #else /* !INCLUDE_INLINE FUNCS */ + #if (__STDC_VERSION__ >= 199901L) +-#define _INLINE_ inline ++#define _INLINE_ static inline + #else /* not C99 */ + #ifdef __GNUC__ + #define _INLINE_ extern __inline__ +diff -upr e2fsprogs.orig/lib/ext2fs/ext2fs.h e2fsprogs/lib/ext2fs/ext2fs.h +--- e2fsprogs.orig/lib/ext2fs/ext2fs.h 2017-11-29 00:28:33.000000000 +0100 ++++ e2fsprogs/lib/ext2fs/ext2fs.h 2018-02-25 10:37:13.028466087 +0100 +@@ -53,9 +53,7 @@ extern "C" { + */ + #define EXT2_LIB_CURRENT_REV EXT2_DYNAMIC_REV + +-#ifdef HAVE_SYS_TYPES_H + #include +-#endif + + #include + #include +@@ -1736,7 +1734,7 @@ extern const struct ext2_inode *ext2fs_c + #define _INLINE_ extern + #else + #if (__STDC_VERSION__ >= 199901L) +-#define _INLINE_ inline ++#define _INLINE_ static inline + #else + #ifdef __GNUC__ + #define _INLINE_ extern __inline__ diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 0e68193059a..610f05bfcda 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,33 +1,75 @@ # Template file for 'android-tools' pkgname=android-tools -_distver=7.0.0_r5 # NOTE: not all upstream updates has code changes for the parts # of android used by android-tools. Check for diff with: # curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1 -version=${_distver/_/} -revision=6 +version=8.1.0r14 +revision=1 +_distver=${version/r/_r} create_wrksrc=yes -build_style=gnu-makefile -hostmakedepends="git" -makedepends="zlib-devel libressl-devel pcre-devel" +hostmakedepends="ruby cmake ninja perl go" +makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel" short_desc="Android platform tools (adb and fastboot)" maintainer="Eivind Uggedal " -license="Apache-2.0 BSD GPL-2" +license="Apache-2.0 ISC GPL-2 MIT" homepage="http://developer.android.com/tools/help/adb.html" +_baseurl=https://android.googlesource.com/platform +distfiles=" + ${_baseurl}/system/core/+archive/ac8169f45dc9e5332d3ec24d0b14f812668b0c8e.tar.gz>core.tar.gz + ${_baseurl}/system/extras/+archive/e563ed1bca5ea0421f654eef82d758ec25c10bdd.tar.gz>extras.tar.gz + ${_baseurl}/external/selinux/+archive/90efe04c55f82a7ea166c913405758fd91bc9aa9.tar.gz>selinux.tar.gz + ${_baseurl}/external/f2fs-tools/+archive/a3f779d308a10d7e6b87cf0134445e7378de4770.tar.gz>f2fs-tools.tar.gz + ${_baseurl}/external/e2fsprogs/+archive/6bdf355a7c96ddd5eb867778d857de82fca793a5.tar.gz>e2fsprogs.tar.gz + https://boringssl.googlesource.com/boringssl/+archive/a20bb7ff8bb5057065a2e7941249773f9676cf45.tar.gz>boringssl.tar.gz" +# Contents checksums because the tarballs change with every download +checksum="@ce40cf2757bdd87d458655dc00d8ad835c69304ecab88faa7eb7e514712ba98d + @7f697f84f3454658ecc609620be344f3496603605158304f2cd1055f143a07c6 + @4c7d9b0650f47e83f75088c3fbbedab45e9f1a15081fa20f25104558eb81e406 + @ae8c85b3db0f5bdc9b01eacb8b0490e5a34c9d20a9ed962d8b9942b3451c6111 + @e4ab1880f0f043da29a04f1c446155f365933a4e46a9f4e8865ec104f64a982b + @748945a2c1f50c40286c963bd4e7a08a8e5bd450a6dc71a9de1a2b451d614a38" -broken="https://github.com/voidlinux/void-packages/issues/9146" +nocross="error: requested alignment 64 is larger than 8 [-Werror=attributes]" -do_fetch() { - local r - for r in system/core system/extras external/libselinux external/f2fs-tools external/gtest external/safe-iop; do - git clone -b android-${_distver} \ - https://android.googlesource.com/platform/$r \ - ${pkgname}-${version}/$(basename $r) +do_extract() { + local tarball p + for p in ${distfiles}; do + tarball=${p##*>} + mkdir -p ${wrksrc}/${tarball/.*} + tar -x --no-same-permissions --no-same-owner -f \ + ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${tarball} \ + -C ${wrksrc}/${tarball/.*} done } -post_install() { - vlicense gtest/COPYING +pre_configure() { + PKGVER=${_distver} ${FILESDIR}/generate_build.rb > build.ninja + + mkdir -p boringssl/build + cd boringssl/build + + cmake -GNinja \ + -DBUILD_SHARED_LIBS=FALSE \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + .. + ninja +} + +do_build() { + ninja +} + +do_install() { + for i in adb fastboot mke2fs.android e2fsdroid ext2simg \ + core/mkbootimg/mkbootimg ;do + vbin $i + done + vlicense boringssl/LICENSE boringssl.LICENSE + vlicense boringssl/third_party/fiat/LICENSE fiat.LICENSE + vlicense boringssl/third_party/googletest/LICENSE gtest.LICENSE + vlicense boringssl/third_party/android-cmake/LICENSE android-cmake.LICENSE vsv adb } diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template index 293372c7463..b35d4f4643a 100644 --- a/srcpkgs/anki/template +++ b/srcpkgs/anki/template @@ -1,16 +1,16 @@ # Template file for 'anki' pkgname=anki -version=2.0.50 +version=2.0.52 revision=1 noarch=yes depends="python-PyQt4-webkit python-httplib2 python-SQLAlchemy" pycompile_dirs="/usr/share/anki/anki /usr/share/anki/aqt" short_desc="Spaced repetition flashcard program" maintainer="Steve Prybylski " -license="AGPL-3" -homepage="http://ankisrs.net" -distfiles="http://ankisrs.net/downloads/current/${pkgname}-${version}-source.tgz" -checksum=37b2c601762ea8bfc7b9fc3e3067b82b0ad48c27b58076f6fd636f52930b1816 +license="AGPL-3.0-or-later" +homepage="https://apps.ankiweb.net" +distfiles="https://apps.ankiweb.net/downloads/current/anki-${version}-source.tgz" +checksum=d4d8c0dd473b512faa63e167d7bb89592530699d2365f1d3a737a733efeb5e7a do_install() { vmkdir usr/share/anki diff --git a/srcpkgs/annie/template b/srcpkgs/annie/template index a5250a2d502..e654e73d95a 100644 --- a/srcpkgs/annie/template +++ b/srcpkgs/annie/template @@ -1,6 +1,6 @@ # Template file for 'annie' pkgname=annie -version=0.7.3 +version=0.7.5 revision=1 build_style=go go_import_path="github.com/iawia002/annie" @@ -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=98f00e5b6db971a55fa38512f93c4dec26599ef26a16e08cdaa5a0ad65e32bd0 +checksum=bf74a5e626ec0319fea990fc5665a2710232c069b8fcbc5ea136433076eade57 post_install() { vlicense LICENSE diff --git a/srcpkgs/ansi/template b/srcpkgs/ansi/template index 5bd014e7ddf..844147a75e3 100644 --- a/srcpkgs/ansi/template +++ b/srcpkgs/ansi/template @@ -1,15 +1,16 @@ # Template file for 'ansi' pkgname=ansi -version=1.0.0 +version=1.1.0 revision=1 +noarch=yes depends="bash" short_desc="ANSI escape codes in pure Bash" maintainer="maxice8 " license="MIT" homepage="https://github.com/fidian/ansi" +changelog="https://raw.githubusercontent.com/fidian/ansi/master/CHANGELOG.md" distfiles="https://github.com/fidian/ansi/archive/${version}.tar.gz" -checksum=753c982458b43381eb918b3eeb55689874797b3aaba48cf66b347a67f665d210 -noarch=yes +checksum=0930acff725a505e430c68784e12731e8329998d60efcd759a7ff52e6baac959 do_install() { vbin ansi diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 8d4bd02c20e..f63c7df3ce7 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=2.5.4 +version=2.6.0 revision=1 noarch=yes build_style=python2-module @@ -10,10 +10,10 @@ depends="${hostmakedepends} python-cryptography python-Jinja2 python-paramiko python-yaml" short_desc="Simple deployment, configuration management and execution framework" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz" -checksum=33a76684c47d1857d6e917af4f2eafac87521161f8181037edaa159a60deaeb3 +checksum=3550bf16bf2c34cc88bf3870e91b836e44c1c288d148968c4d855dae2560faf5 post_install() { for f in examples/*; do diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template index b8c273d31ce..c41ae938380 100644 --- a/srcpkgs/antibody/template +++ b/srcpkgs/antibody/template @@ -1,6 +1,6 @@ # Template file for 'antibody' pkgname=antibody -version=3.5.0 +version=3.5.1 revision=1 build_style=go go_import_path=github.com/getantibody/antibody @@ -10,7 +10,7 @@ maintainer="SolitudeSF " license="MIT" homepage="https://getantibody.github.io/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=0c774cf2d7e29293b1ca2ad1c05d4c8a4226a2956be1f7c50cb2c8456a88810d +checksum=ee0f73041a4e4b6dad8a6704430f84cd58e0894fee547a6c302a80f49833175b post_install() { vlicense LICENSE.md diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template index d92fa4c5fa8..1fe0af3ceec 100644 --- a/srcpkgs/apache-tomcat/template +++ b/srcpkgs/apache-tomcat/template @@ -1,6 +1,6 @@ # Template file for 'apache-tomcat' pkgname=apache-tomcat -version=8.5.29 +version=9.0.8 revision=1 wrksrc=${pkgname}-${version}-src hostmakedepends="openjdk apache-ant" @@ -14,8 +14,8 @@ short_desc="An open source implementation of the Java Servlet" maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://tomcat.apache.org" -distfiles="http://mirrors.advancedhosters.com/apache/tomcat/tomcat-8/v${version}/src/apache-tomcat-${version}-src.tar.gz" -checksum=713ed9ddb554fe8277b20c9a2a8e03032e80fc068a74402a372506b7721aeba1 +distfiles="http://mirrors.gigenet.com/apache/tomcat/tomcat-9/v$version/src/$pkgname-$version-src.tar.gz" +checksum=446a615d642570d6f52f4e354e04a55a719fd2ecd204fefe14506999114fa4b0 do_build() { ant diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template index 93aa388e3c4..4fb39dcf758 100644 --- a/srcpkgs/apk-tools/template +++ b/srcpkgs/apk-tools/template @@ -1,7 +1,7 @@ # Template file for 'apk-tools' pkgname=apk-tools -version=2.9.1 -revision=3 +version=2.10.0 +revision=1 build_style=gnu-makefile make_build_args="LUAAPK=" hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="http://git.alpinelinux.org/cgit/apk-tools" distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2" -checksum=24fd166d2bec2f38af32e7ce4c464c8987273094d7a652e463594b1b803ff16e +checksum=429b225e3d5c10b6d6299af37814c2ec6ac82272b0c8ffafaf69dcb4430ae076 CFLAGS=-Wno-error do_install() { diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd index adfed209b6e..d34d6644918 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd +++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd @@ -29,7 +29,7 @@ profile dhcpcd /{usr/,}bin/dhcpcd { /{var/,}run/dhcpcd.unpriv.sock rw, /{var/,}run/udev/data/* r, - /sys/devices/*/*/{*/,}net/*/uevent r, + /sys/devices/**/net/eth*/uevent r, /sys/devices/virtual/net/*/uevent r, /{usr/,}bin/dash ix, @@ -39,51 +39,13 @@ profile dhcpcd /{usr/,}bin/dhcpcd { /usr/lib/ld-*.so m, /usr/lib/libc-*.so m, - # Transition to a child profile for hooks - /usr/libexec/dhcpcd-run-hooks Cx -> dhcpcd_run_hooks, + # Trust hooks and run the wrapper unconfined + /usr/libexec/dhcpcd-run-hooks CUx, /var/db/dhcpcd-*.lease rw, /var/db/dhcpcd/** rw, /{usr/,}bin/dhcpcd mrix, - # Child profile for hooks - profile dhcpcd_run_hooks { - #include - #include - - capability sys_admin, - capability sys_tty_config, - - /etc/chrony.conf rw, - /etc/ntpd.conf rw, - /etc/resolv.conf rw, - /etc/wpa_supplicant/wpa_supplicant*.conf r, - - /{var/,}run/dhcpcd/ rw, - /{var/,}run/dhcpcd/{ntp,resolv}.conf.** rw, - /{var/,}run/dhcpcd/{ntp,resolv}.conf/ rw, - /{var/,}run/dhcpcd/{ntp,resolv}.conf/*.dhcp rw, - - /usr/bin/cat mrix, - /usr/bin/chmod mrix, - /usr/bin/cmp mrix, - /usr/bin/dash mr, - /usr/bin/hostname-coreutils mrix, - /usr/bin/mkdir mrix, - /usr/bin/rm mrix, - /usr/bin/sed mrix, - /usr/bin/util-linux-logger mrix, - /usr/bin/wpa_supplicant CUx, - /usr/bin/wpa_cli CUx, - /usr/bin/resolvconf CUx, - - /usr/libexec/dhcpcd-hooks/ r, - /usr/libexec/dhcpcd-hooks/* r, - /usr/libexec/dhcpcd-run-hooks r, - - /usr/share/dhcpcd/hooks/* r, - } - # Site-specific additions and overrides. See local/README for details. #include } diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 8a441b3c561..1cce3572211 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # Template file for 'apparmor' pkgname=apparmor version=2.13.0 -revision=1 +revision=3 _short_ver=${version%\.*} wrksrc="${pkgname}-v${_short_ver}" configure_args="--prefix=/usr --with-perl --with-python" diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template new file mode 100644 index 00000000000..1426205b5c2 --- /dev/null +++ b/srcpkgs/arc-theme/template @@ -0,0 +1,16 @@ +# Template file for 'arc-theme' +pkgname=arc-theme +version=20180114 +revision=1 +noarch=yes +build_style=gnu-configure +configure_script="./autogen.sh" +hostmakedepends="automake pkg-config sassc" +makedepends="gtk+3-devel" +depends="gnome-themes-standard gtk-engine-murrine" +short_desc="Flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell" +maintainer="jtalowell " +license="GPL-3.0-or-later" +homepage="https://github.com/NicoHood/arc-theme" +distfiles="https://github.com/NicoHood/arc-theme/archive/${version}.tar.gz" +checksum="74179ad6a8f0b297e74eeabb26586584f76615eccdf90afb065a90623802e7bc" diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index 7c6bba348a3..58d3cc5c41d 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,11 +1,12 @@ # Template file for 'aria2' pkgname=aria2 version=1.34.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - --with-bashcompletiondir=/usr/share/bash-completion/completions" + --with-bashcompletiondir=/usr/share/bash-completion/completions + --enable-libaria2" hostmakedepends="pkg-config" makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel zlib-devel" @@ -18,3 +19,21 @@ homepage="https://aria2.github.io/" #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 + +libaria2_package() { + short_desc="Multi-Protocol/multi-source download library" + pkg_install() { + vmove "usr/lib/libaria2.so.*" + } +} + +libaria2-devel_package() { + short_desc="Multi-Protocol/multi-source download library - development files" + depends="libaria2>=${version}_${revision} ${makedepends}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.la" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/ark/update b/srcpkgs/ark/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/ark/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template index 72e5f7e1c4a..0dcaf72606e 100644 --- a/srcpkgs/armadillo/template +++ b/srcpkgs/armadillo/template @@ -1,16 +1,16 @@ # Template file for 'armadillo' pkgname=armadillo -version=8.400.0 -revision=2 +version=8.500.1 +revision=1 build_style=cmake hostmakedepends="pkg-config openblas-devel" makedepends="openblas-devel superlu-devel" short_desc="C++ linear algebra library" maintainer="Julien Dehos " -license="BSD" +license="Apache-2.0" homepage="http://arma.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz" -checksum=5cb6bc2f457a9d6a0758cfb15c418d48289909daccd79d0e428452029285dd9b +checksum=ace40efbe2df4b418ec713c71bbd20cedfa92a55015f810639319dec477aa12e # automatically link to openblas (so you just have to compile with # "-larmadillo" instead of "-larmadillo -lopenblas") diff --git a/srcpkgs/arpack-ng/template b/srcpkgs/arpack-ng/template index bea2d38332f..c5ac7007e90 100644 --- a/srcpkgs/arpack-ng/template +++ b/srcpkgs/arpack-ng/template @@ -1,23 +1,22 @@ # Template file for 'arpack-ng' pkgname=arpack-ng -version=3.5.0 +version=3.6.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool gcc-fortran" makedepends="lapack-devel" short_desc="Collection of Fortran77 subroutines" maintainer="Diogo Leal " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/opencollab/arpack-ng" distfiles="https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz" -checksum=50f7a3e3aec2e08e732a487919262238f8504c3ef927246ec3495617dde81239 +checksum=c753f929d3f1092d84bb0883a8ffe2551a8cb94d5ab891e63f596a876e44c351 pre_configure() { - export FFLAGS="-fPIC" ./bootstrap } post_install() { - vlicense COPYING LICENSE + vlicense COPYING } arpack-ng-devel_package() { diff --git a/srcpkgs/atari800/template b/srcpkgs/atari800/template index 9cebec5b7da..49d19b3fb00 100644 --- a/srcpkgs/atari800/template +++ b/srcpkgs/atari800/template @@ -1,14 +1,9 @@ # Template file for 'atari800' pkgname=atari800 -version=3.1.0 -revision=4 -build_style=gnu-configure -short_desc="Emulator of Atari 800/800XL/130XE/5200 with various extensions" -maintainer="Jakub Skrzypnik " -makedepends="SDL_mixer-devel SDL_ttf-devel SDL_image-devel SDL_sound-devel SDL_net-devel readline-devel MesaLib-devel" -license="GPL-2" +version=4.0.0 +revision=1 build_wrksrc="src" -homepage="http://atari800.sourceforge.net" +build_style=gnu-configure configure_args=" --disable-sdltest --with-video=sdl --with-sound=sdl --with-x --with-readline @@ -21,8 +16,14 @@ configure_args=" --enable-monitortrace --enable-monitorprofile --enable-monitorhints --enable-monitorbreakpoints --enable-monitorbreak --enable-monitorasm --enable-bufferedlog --enable-newcycleexact" +makedepends="SDL_image-devel SDL_mixer-devel SDL_net-devel SDL_sound-devel + SDL_ttf-devel readline-devel" +short_desc="Emulator of Atari 800/800XL/130XE/5200 with various extensions" +maintainer="Jakub Skrzypnik " +license="GPL-2" +homepage="https://atari800.github.io" distfiles="${SOURCEFORGE_SITE}/atari800/atari800/${version}/atari800-${version}.tar.gz" -checksum="901b02cce92ddb0b614f8034e6211f24cbfc2f8fb1c6581ba0097b1e68f91e0c" +checksum=08e9b989ddb2785265d242ff92b416a2b53c285c7309f3fc3f5e94889cb69eb5 pre_configure() { # Do not strip bins. diff --git a/srcpkgs/attr/patches/escape-left-brace-regex.patch b/srcpkgs/attr/patches/escape-left-brace-regex.patch new file mode 100644 index 00000000000..5c91bba818a --- /dev/null +++ b/srcpkgs/attr/patches/escape-left-brace-regex.patch @@ -0,0 +1,11 @@ +--- test/run ++++ test/run +@@ -106,7 +106,7 @@ for (;;) { + if (defined $line) { + # Substitute %VAR and %{VAR} with environment variables. + $line =~ s[%(\w+)][$ENV{$1}]eg; +- $line =~ s[%{(\w+)}][$ENV{$1}]eg; ++ $line =~ s[%\{(\w+)}][$ENV{$1}]eg; + } + if (defined $line) { + if ($line =~ s/^\s*< ?//) { diff --git a/srcpkgs/attr/patches/xattr_h_portability.patch b/srcpkgs/attr/patches/xattr_h_portability.patch deleted file mode 100644 index 14e97638217..00000000000 --- a/srcpkgs/attr/patches/xattr_h_portability.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- include/xattr.h.orig 2013-03-01 20:24:44.620880695 +0100 -+++ include/xattr.h 2013-03-01 20:26:28.802885344 +0100 -@@ -31,33 +31,37 @@ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern int setxattr (const char *__path, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - extern int lsetxattr (const char *__path, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - extern int fsetxattr (int __filedes, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - - extern ssize_t getxattr (const char *__path, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - extern ssize_t lgetxattr (const char *__path, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - extern ssize_t fgetxattr (int __filedes, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - - extern ssize_t listxattr (const char *__path, char *__list, -- size_t __size) __THROW; -+ size_t __size); - extern ssize_t llistxattr (const char *__path, char *__list, -- size_t __size) __THROW; -+ size_t __size); - extern ssize_t flistxattr (int __filedes, char *__list, -- size_t __size) __THROW; -+ size_t __size); - --extern int removexattr (const char *__path, const char *__name) __THROW; --extern int lremovexattr (const char *__path, const char *__name) __THROW; --extern int fremovexattr (int __filedes, const char *__name) __THROW; -- --__END_DECLS -+extern int removexattr (const char *__path, const char *__name); -+extern int lremovexattr (const char *__path, const char *__name); -+extern int fremovexattr (int __filedes, const char *__name); -+ -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template index 8ee2447e361..cf2c075fbf6 100644 --- a/srcpkgs/attr/template +++ b/srcpkgs/attr/template @@ -1,19 +1,19 @@ # Template file for 'attr' pkgname=attr -version=2.4.47 -revision=7 +version=2.4.48 +revision=1 bootstrap=yes build_style=gnu-configure checkdepends="perl" configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" short_desc="Extended attribute support library for ACL support" maintainer="Juan RP " +license="LGPL-2.1-or-later" homepage="http://savannah.nongnu.org/projects/attr" -license="LGPL-2.1" -distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz" -checksum=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 +distfiles="${NONGNU_SITE}/attr/attr-${version}.tar.gz" +checksum=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 make_check_args="-j1" # Tests broken when ran in parallel -make_check_target="tests" +conf_files="/etc/xattr.conf" # The included libtool is rotten and only works with bash; easiest fix. export CONFIG_SHELL=/bin/bash @@ -23,8 +23,6 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then fi pre_check() { - sed -i 's:{(:\\{(:' test/run - # Either the test wasn't updated or the package misconfigures/miscompiles # the error message in musl based systems # EXPECTED: Operation not supported @@ -34,23 +32,19 @@ pre_check() { esac } -do_install() { - make DIST_ROOT=${DESTDIR} install install-lib install-dev -} - attr-devel_package() { - depends="attr>=${version}_${revision}" + depends="attr-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove "usr/lib/*.so" - vmove usr/share/man/man2 vmove usr/share/man/man3 - vmove usr/share/man/man5 vmove usr/share/doc + vmove usr/lib/pkgconfig } } + attr-progs_package() { short_desc+=" - utilities" pkg_install() { diff --git a/srcpkgs/avfs-devel b/srcpkgs/avfs-devel new file mode 120000 index 00000000000..aeb8440d2d2 --- /dev/null +++ b/srcpkgs/avfs-devel @@ -0,0 +1 @@ +avfs \ No newline at end of file diff --git a/srcpkgs/avfs/template b/srcpkgs/avfs/template new file mode 100644 index 00000000000..dcf9c49665b --- /dev/null +++ b/srcpkgs/avfs/template @@ -0,0 +1,33 @@ +# Template file for 'avfs' +pkgname=avfs +version=1.0.5 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="fuse-devel liblzma-devel" +depends="perl" +short_desc="Virtual filesystem that allows browsing compressed files" +maintainer="John " +license="GPL-2.0-only, LGPL-2.0-only" +homepage="http://avf.sourceforge.net/" +distfiles="$SOURCEFORGE_SITE/avf/avfs-${version}.tar.bz2" +checksum=e5ce6b1f4193c37148b1b8a021f4f3d05e88f725cf11b16b95a58e8fdae50176 + +libavfs_package() { + short_desc+=" - library" + pkg_install() { + vmove "usr/lib/*.so.*" + vmove usr/lib/avfs + } +} + +avfs-devel_package() { + short_desc+=" - development files" + depends="avfs>=${version}_${revision}" + pkg_install() { + vmove usr/bin/avfs-config + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template index 231f998a01d..60c591b00cf 100644 --- a/srcpkgs/baloo5/template +++ b/srcpkgs/baloo5/template @@ -1,7 +1,7 @@ # Template file for 'baloo5' pkgname=baloo5 version=5.43.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" wrksrc="${pkgname%5}-${version}" @@ -10,22 +10,23 @@ makedepends="kfilemetadata5-devel kidletime-devel kio-devel lmdb-devel" depends="hicolor-icon-theme" short_desc="A framework for searching and managing metadata" maintainer="Denis Revin " -license="LGPL-2" +license="LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/frameworks/baloo5" distfiles="http://download.kde.org/stable/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" checksum=d78a17895b212eb3d081990393787a6687fddc8f1be0de26149f608f0b37bf24 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kcoreaddons" configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" fi baloo5-devel_package() { short_desc+=" - development" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/cmake - vmove usr/lib/*.so + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template index 972b96026a7..3a6cfdc908f 100644 --- a/srcpkgs/balsa/template +++ b/srcpkgs/balsa/template @@ -1,19 +1,17 @@ # Template file for 'balsa'. pkgname=balsa -version=2.5.5 -revision=2 +version=2.5.6 +revision=1 build_style=gnu-configure -configure_args="--without-nm --without-gtkspell --without-gnome --with-ssl - --with-libsecret --with-gpgme --with-sqlite --with-html-widget=webkit" -hostmakedepends="pkg-config intltool automake gettext-devel" -makedepends=" - iso-codes libressl-devel sqlite-devel enchant-devel libnotify-devel libesmtp-devel - gtk+3-devel gmime-devel webkitgtk-devel pcre-devel gpgme-devel libsecret-devel - gnutls-devel" -depends="hicolor-icon-theme desktop-file-utils" +configure_args="--without-gnome --with-libsecret --with-gpgme --with-sqlite + --with-html-widget=webkit" +hostmakedepends="automake gettext-devel intltool pkg-config" +makedepends="enchant-devel gmime-devel gnutls-devel gpgme-devel iso-codes + libesmtp-devel libnotify-devel libsecret-devel webkitgtk-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="An email client for GNOME" maintainer="Juan RP " +license="GPL-2.0-or-later" homepage="http://pawsa.fedorapeople.org/balsa/" -license="GPL-2" distfiles="http://pawsa.fedorapeople.org/balsa/balsa-${version}.tar.bz2" -checksum=ff2bb1150581d0ba10af5fb8f843072299899fa6efdb68a7f510f7b679409c5c +checksum=7d5aa5a12e54d385da77660dc5908299146ba4ab108e3c353b713e4435e3669e diff --git a/srcpkgs/bctoolbox-devel b/srcpkgs/bctoolbox-devel new file mode 120000 index 00000000000..55d091559b4 --- /dev/null +++ b/srcpkgs/bctoolbox-devel @@ -0,0 +1 @@ +bctoolbox \ No newline at end of file diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template new file mode 100644 index 00000000000..8b1e81eec03 --- /dev/null +++ b/srcpkgs/bctoolbox/template @@ -0,0 +1,24 @@ +# Template file for 'bctoolbox' +pkgname=bctoolbox +version=0.6.0 +revision=2 +build_style=cmake +configure_args="-DENABLE_TESTS_COMPONENT=OFF" +makedepends="mbedtls-devel" +short_desc="Library to create and run audio and video streams" +maintainer="maxice8 " +license="GPL-2.0-only" +homepage="https://github.com/BelledonneCommunications/bctoolbox" +distfiles="https://github.com/BelledonneCommunications/bctoolbox/archive/${version}.tar.gz" +checksum=299dedcf8f1edea79964314504f0d24e97cdf24a289896fc09bc69c38eb9f9be + +bctoolbox-devel_package() { + depends="bctoolbox-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/bctoolbox/cmake + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template index 5455c120ae1..3ca7c382d59 100644 --- a/srcpkgs/bfs/template +++ b/srcpkgs/bfs/template @@ -1,6 +1,6 @@ # Template file for 'bfs' pkgname=bfs -version=1.2.1 +version=1.2.2 revision=1 build_style=gnu-makefile short_desc="Breadth-first version of the UNIX find command" @@ -8,7 +8,7 @@ maintainer="maxice8 " license="0BSD" homepage="https://github.com/tavianator/bfs" distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz" -checksum=e3e7fb7d8d7508b0b9e789b32c492d962b5726f9b6b7951cf3359c97d47b2f82 +checksum=60eba3829242317ddb9ffc722ee2af518175c5cc3cfc4bf8a4c8c85c8184c090 post_install() { vlicense COPYING diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index eccb2e6d1fb..3f906cc9c07 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -1,6 +1,6 @@ # Template file for 'bijiben' pkgname=bijiben -version=3.28.2 +version=3.28.3 revision=1 build_style=meson hostmakedepends="automake gobject-introspection intltool itstool pkg-config" @@ -10,7 +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" -#changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS" +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=5a6ed663d0cc54725f6fb9c8e7626f12ccd34740f99eadfc11d5fb2bafc62dfc +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=22d2a5f03dbaa9e8c5d186863289f185249c51f610bfa1fb5c3ed766a813e951 diff --git a/srcpkgs/binpac b/srcpkgs/binpac new file mode 120000 index 00000000000..52815503047 --- /dev/null +++ b/srcpkgs/binpac @@ -0,0 +1 @@ +bro \ No newline at end of file diff --git a/srcpkgs/binpac-devel b/srcpkgs/binpac-devel new file mode 120000 index 00000000000..52815503047 --- /dev/null +++ b/srcpkgs/binpac-devel @@ -0,0 +1 @@ +bro \ No newline at end of file diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index b277cec9c43..a4a34fdd724 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin -version=0.16.0 -revision=6 +version=0.16.1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config yasm" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="MIT" homepage="https://bitcoin.org/" distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" -checksum=8cbec0397d932cab7297a8c23c918392f6eebd410646b4b954787de9f4a3ee40 +checksum=69b49ff2e3372d9342338f9f5c367b1ae03b57b4ae7fd6d71d8de5e847ba78fe conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0 if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template index 098c2a641ae..06bec29e92e 100644 --- a/srcpkgs/blackbox/template +++ b/srcpkgs/blackbox/template @@ -1,6 +1,6 @@ # Template file for 'blackbox' pkgname=blackbox -version=1.20170611 +version=1.20180618 revision=1 noarch=yes depends="bash" @@ -9,7 +9,7 @@ maintainer="Daniel A. Maierhofer " license="MIT" homepage="https://github.com/StackExchange/blackbox" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=dcdc7a9b7c9fd7144c90baa5f48041af434ed4c8f77c8e41f1017789a2f9c017 +checksum=dae06417d2aeaba41cf0f0f7bd8c07c7f65914c926b61f6047b389847e53794e do_install() { vbin bin/_blackbox_common.sh diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/disable_werror.patch new file mode 100644 index 00000000000..635956f2aa9 --- /dev/null +++ b/srcpkgs/blender/patches/disable_werror.patch @@ -0,0 +1,13 @@ +diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt +index f22688f..c32aad1 100644 +--- a/intern/cycles/CMakeLists.txt ++++ b/intern/cycles/CMakeLists.txt +@@ -227,8 +227,6 @@ endif() + + # Warnings + if(CMAKE_COMPILER_IS_GNUCXX) +- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") +- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") + ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") + unset(_has_cxxflag_float_conversion) + unset(_has_cxxflag_double_promotion) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 8566a01fbf9..998f354fe07 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.79b -revision=1 +revision=2 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel diff --git a/srcpkgs/bluez-alsa/files/bluez-alsa/run b/srcpkgs/bluez-alsa/files/bluez-alsa/run new file mode 100644 index 00000000000..106d8c00620 --- /dev/null +++ b/srcpkgs/bluez-alsa/files/bluez-alsa/run @@ -0,0 +1,9 @@ +#!/bin/sh + +dir=/var/run/bluealsa +user=_bluez_alsa +group=_bluez_alsa + +[ ! -d "${dir}" ] && mkdir "${dir}" && chown $user:$group ${dir} +exec chpst -u $user:$group bluealsa + diff --git a/srcpkgs/bluez-alsa/template b/srcpkgs/bluez-alsa/template new file mode 100644 index 00000000000..e17254478c3 --- /dev/null +++ b/srcpkgs/bluez-alsa/template @@ -0,0 +1,25 @@ +# Template file for 'bluez-alsa' +pkgname=bluez-alsa +version=1.2.0 +revision=1 +build_style=gnu-configure +configure_args="--enable--aac --disable-hcitop --enable-debug" +hostmakedepends="pkg-config automake libtool" +makedepends="alsa-lib-devel fdk-aac-devel libbluetooth-devel libglib-devel + ortp-devel sbc-devel" +short_desc="Bluetooth Audio ALSA Backend" +maintainer="Toyam Cox " +license="MIT" +homepage="https://github.com/Arkq/bluez-alsa" +distfiles="https://github.com/Arkq/bluez-alsa/archive/v${version}.tar.gz" +checksum=0a7a27e8cf135ec6bb30ea1a2365736681ced7d8293003c274fa78319f936838 +system_accounts="_bluez_alsa" + +pre_configure() { + autoreconf -fi +} + +post_install() { + vlicense LICENSE.txt + vsv bluez-alsa +} diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index f56cecc2c07..ecb72f7432e 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,25 +1,26 @@ # Template file for 'bluez' pkgname=bluez -version=5.49 +version=5.50 revision=1 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --disable-systemd --enable-sixaxis --enable-threads --enable-library" -hostmakedepends="automake libtool pkg-config flex" -makedepends="libglib-devel eudev-libudev-devel dbus-devel - cups-devel libical-devel readline-devel" -conf_files="/etc/bluetooth/main.conf" -system_groups="bluetooth" +hostmakedepends="automake flex libtool pkg-config" +makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel + readline-devel" short_desc="Bluetooth tools and daemons" maintainer="Juan RP " -homepage="http://www.bluez.org/" license="GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="http://www.bluez.org/" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" -checksum=33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95 +checksum=5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911 +conf_files="/etc/bluetooth/main.conf" +system_groups="bluetooth" pre_configure() { autoreconf -fi } + post_install() { vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth vsv bluetoothd @@ -31,6 +32,7 @@ libbluetooth_package() { vmove "usr/lib/libbluetooth.so.*" } } + libbluetooth-devel_package() { depends="libbluetooth>=${version}_${revision}" short_desc="Development files to use the BlueZ Linux Bluetooth library" @@ -40,6 +42,7 @@ libbluetooth-devel_package() { vmove "usr/lib/*.so" } } + bluez-cups_package() { short_desc="CUPS printer backend for Bluetooth printers" pkg_install() { diff --git a/srcpkgs/blur-effect/template b/srcpkgs/blur-effect/template new file mode 100644 index 00000000000..7e03783d879 --- /dev/null +++ b/srcpkgs/blur-effect/template @@ -0,0 +1,13 @@ +# Template file for 'blur-effect' +pkgname=blur-effect +version=1.1.3 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="glew-devel gdk-pixbuf-devel" +short_desc="Off-screen image blurring utility using OpenGL ES 3.0" +maintainer="John " +license="GPL-3.0-only" +homepage="https://github.com/sonald/blur-effect" +distfiles="https://github.com/sonald/blur-effect/archive/${version}.tar.gz" +checksum=80baead168e117cdbd7dd915dac94b8055e63dc05ec5797f3030acfaf19e5654 diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template index 37b11d56387..535cd20f832 100644 --- a/srcpkgs/brasero/template +++ b/srcpkgs/brasero/template @@ -1,7 +1,7 @@ # Template file for 'brasero' pkgname=brasero version=3.12.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-caches $(vopt_if gir introspection)" hostmakedepends="pkg-config intltool cdrtools gnome-doc-utils itstool @@ -14,7 +14,7 @@ short_desc="Application to burn CD/DVD for the Gnome Desktop" maintainer="Juan RP " homepage="http://www.gnome.org/projects/brasero" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041 # Package build options diff --git a/srcpkgs/bro/files/bro/run b/srcpkgs/bro/files/bro/run new file mode 100644 index 00000000000..90eb6a59c0c --- /dev/null +++ b/srcpkgs/bro/files/bro/run @@ -0,0 +1,10 @@ +#!/bin/sh + +BROLOGDIR="/var/log/bro" + +[ -r conf ] && . ./conf + +[ -d ${BROLOGDIR} ] || mkdir -p ${BROLOGDIR} + +cd /var/log/bro +exec bro -i ${INTF:=eth0} ${BROPOLICY} diff --git a/srcpkgs/bro/patches/musl.patch b/srcpkgs/bro/patches/musl.patch new file mode 100644 index 00000000000..e8a2c6da9d5 --- /dev/null +++ b/srcpkgs/bro/patches/musl.patch @@ -0,0 +1,74 @@ +https://github.com/danielguerra69/docker-bro-1 + +--- aux/binpac/lib/binpac.h.in.orig ++++ aux/binpac/lib/binpac.h.in +@@ -4,6 +4,7 @@ + #define binpac_h + + #include ++#include + + #cmakedefine HOST_BIGENDIAN + #ifdef HOST_BIGENDIAN + +--- src/OSFinger.h.orig ++++ src/OSFinger.h +@@ -166,3 +166,57 @@ + #define MATCHFUZZY 0x2 + + #endif ++ ++// For musl-libc ++#ifndef TCPOPT_EOL ++# define TCPOPT_EOL 0 ++#endif ++ ++#ifndef TCPOPT_NOP ++# define TCPOPT_NOP 1 ++#endif ++ ++#ifndef TCPOPT_MAXSEG ++# define TCPOPT_MAXSEG 2 ++#endif ++ ++#ifndef TCPOLEN_MAXSEG ++# define TCPOLEN_MAXSEG 4 ++#endif ++ ++#ifndef TCPOPT_WINDOW ++# define TCPOPT_WINDOW 3 ++#endif ++ ++#ifndef TCPOLEN_WINDOW ++# define TCPOLEN_WINDOW 3 ++#endif ++ ++#ifndef TCPOPT_SACK_PERMITTED ++# define TCPOPT_SACK_PERMITTED 4 /* Experimental */ ++#endif ++ ++#ifndef TCPOLEN_SACK_PERMITTED ++# define TCPOLEN_SACK_PERMITTED 2 ++#endif ++ ++#ifndef TCPOPT_SACK ++# define TCPOPT_SACK 5 /* Experimental */ ++#endif ++ ++#ifndef TCPOPT_TIMESTAMP ++# define TCPOPT_TIMESTAMP 8 ++#endif ++ ++#ifndef TCPOLEN_TIMESTAMP ++# define TCPOLEN_TIMESTAMP 10 ++#endif ++ ++#ifndef TCPOLEN_TSTAMP_APPA ++# define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ ++#endif ++ ++#ifndef TCPOPT_TSTAMP_HDR ++# define TCPOPT_TSTAMP_HDR \ ++ (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) ++#endif + diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template new file mode 100644 index 00000000000..c5ff0445a5a --- /dev/null +++ b/srcpkgs/bro/template @@ -0,0 +1,48 @@ +# Template file for 'bro' +pkgname=bro +version=2.5.4 +revision=1 +build_style=cmake +nocross="Needs to build part of itself to run, can't be built separately yet." +hostmakedepends="flex pkg-config python3" +makedepends="bind-devel geoip-devel libpcap-devel libressl-devel jemalloc-devel" +short_desc="Advanced framework for network traffic analysis" +maintainer="Andrew Benson " +license="BSD-3-Clause" +homepage="https://www.bro.org" +distfiles="https://www.bro.org/downloads/bro-${version}.tar.gz" +checksum=80daea433fa654f2602cf67b19b9121ff6ad57761bad73cc29020c4f490c5f1f + +case "$XBPS_TARGET_MACHINE" in + *-musl) + makedepends+=" musl-fts-devel" + ;; +esac + +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + *-musl) + sed -i '/set(broxygen/i link_libraries("-lfts")' src/broxygen/CMakeLists.txt + ;; + esac +} + +post_install() { + vsv bro + vlicense COPYING +} + +binpac_package() { + short_desc+=" - protocol parser compiler" + pkg_install() { + vmove /usr/bin/binpac + } +} + +binpac-devel_package() { + short_desc+=" - protocol parser compiler library" + pkg_install() { + vmove /usr/include + vmove "/usr/lib/*.a" + } +} diff --git a/srcpkgs/brotli/template b/srcpkgs/brotli/template index ac527471cde..94afa913f90 100644 --- a/srcpkgs/brotli/template +++ b/srcpkgs/brotli/template @@ -1,6 +1,6 @@ # Template file for 'brotli' pkgname=brotli -version=1.0.4 +version=1.0.5 revision=1 build_style=cmake short_desc="Generic-purpose lossless compression algorithm" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/google/brotli" distfiles="https://github.com/google/${pkgname}/archive/v${version}.tar.gz" -checksum=2268a3dff1cc36e18549e89a51ee0cd9513908a977d56d6a1f9d4c61c2af37c3 +checksum=3d5bedd48edb909fe3b87cb99f7d139b987ef6f1616b7e22d74e928270a2fd20 post_install() { vlicense LICENSE diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index a752d5eaa33..b347f409cce 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -1,8 +1,8 @@ # Template file for 'btrfs-progs' pkgname=btrfs-progs -version=4.16.1 +version=4.17 revision=1 -wrksrc=${pkgname}-v${version} +wrksrc="${pkgname}-v${version}" build_style=gnu-configure configure_args="--disable-backtrace --disable-python" hostmakedepends="asciidoc automake libtool pkg-config xmlto" @@ -13,8 +13,8 @@ maintainer="Juan RP " license="GPL-2.0-only, LGPL-3.0-or-later" homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" -checksum=013403fb67b17975b21408fa9eb7523b0ecf94f84f8a4397cf972e8e254d2246 -make_check_target="test" +checksum=82ca0ecf76350a1e3c6543fe220c0910e240511e663d51fc79c32bd0052c117c +make_check_target=test pre_configure() { NOCONFIGURE=1 ./autogen.sh @@ -27,13 +27,8 @@ pre_build() { } pre_check() { - # This test requires fallocate but the testsuite detection methods still can't - # detect it properly so it keeps failing even when util-linux is added to checkdepends - mv tests/fsck-tests/025-file-extents/test.sh{,.broken} - - # This one requires perl regex on grep binary which is disabled it fails with - # grep: support for the -P option is not compiled into this --disable-perl-regexp binary - mv tests/mkfs-tests/013-reserved-1M-for-single/test.sh{,.broken} + # Requires losetup which is part of util-linux, but even with it installed it fails + rm -rf -- tests/mkfs-tests/017-small-backing-size-thin-provision-device } post_install() { diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template index b22968fd06f..521c9168fa5 100644 --- a/srcpkgs/bubblewrap/template +++ b/srcpkgs/bubblewrap/template @@ -1,9 +1,9 @@ # Template file for 'bubblewrap' pkgname=bubblewrap version=0.2.1 -revision=2 +revision=3 build_style=gnu-configure -hostmakedepends="automake pkg-config" +hostmakedepends="automake libxslt docbook-xsl pkg-config" makedepends="libcap-devel" short_desc="Unprivileged sandboxing tool" maintainer="Duncaen " diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template index caf5dc23cc7..903392d2737 100644 --- a/srcpkgs/cabal-install/template +++ b/srcpkgs/cabal-install/template @@ -1,16 +1,16 @@ # Template file for 'cabal-install' pkgname=cabal-install -version=2.0.0.1 +version=2.2.0.0 revision=1 hostmakedepends="ghc curl" makedepends="gmp-devel libffi-devel zlib-devel" depends="ghc" short_desc="Command-line interface for Cabal and Hackage" maintainer="Leah Neukirchen " -license="3-clause-BSD" -homepage="http://hackage.haskell.org/package/cabal-install" -distfiles="http://hackage.haskell.org/packages/archive/${pkgname}/${version}/${pkgname}-${version}.tar.gz" -checksum=f991e36f3adaa1c7e2f0c422a2f2a4ab21b7041c82a8896f72afc9843a0d5d99 +license="BSD-3-Clause" +homepage="https://hackage.haskell.org/package/cabal-install" +distfiles="https://hackage.haskell.org/packages/archive/${pkgname}/${version}/${pkgname}-${version}.tar.gz" +checksum=c856a2dd93c5a7b909597c066b9f9ca27fbda1a502b3f96077b7918c0f64a3d9 nopie_files="/usr/bin/cabal" do_build() { diff --git a/srcpkgs/calendarsupport/update b/srcpkgs/calendarsupport/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/calendarsupport/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 35b34f9d02d..7e4ebdf7d8b 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,6 +1,6 @@ # Template file for 'calibre' pkgname=calibre -version=3.25.0 +version=3.26.1 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=cdb63e07a2e32a60e8658d87991cfd7a27991339a67b5bb42753e52297ec0f05 +checksum=4016d2f8206e5e3724dbebb0a0fbea1f2d22e48f3bbb7f217c8372f34a02a344 nocross=yes pycompile_dirs="/usr/lib/calibre/" diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index be83edf8fac..19fee01a7ee 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.1.0 -revision=4 +revision=5 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON" hostmakedepends="automoc4 perl pkg-config extra-cmake-modules" @@ -16,7 +16,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2 poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel" license="GPL-2.0-or-later LGPL-2.0-or-later GFDL-1.2-or-later" homepage="http://www.calligra-suite.org/" -distfiles="http://download.kde.org/stable/calligra/${version}/calligra-${version}.tar.xz" +distfiles="${KDE_SITE}/calligra/${version}/calligra-${version}.tar.xz" checksum=6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870 replaces="calligra-braindump>=0 calligra-flow>=0" @@ -105,6 +105,7 @@ calligra-sheets_package() { } calligra-words_package() { short_desc+=" - Word Processor" + depends="calligra-plugins" pkg_install() { cd ${wrksrc}/build/words make DESTDIR=$PKGDESTDIR install diff --git a/srcpkgs/cantata/patches/musl.patch b/srcpkgs/cantata/patches/musl.patch index 0d048eb879c..0e76404f954 100644 --- a/srcpkgs/cantata/patches/musl.patch +++ b/srcpkgs/cantata/patches/musl.patch @@ -8,4 +8,23 @@ #include #include "udisksdeviceinterface.h" - +--- gui/main.cpp.orig 2018-06-16 10:09:13.072771604 +0200 ++++ gui/main.cpp 2018-06-16 10:10:00.840162507 +0200 +@@ -260,7 +260,7 @@ + qInstallMessageHandler(cantataQtMsgHandler); + } + +-#if defined Q_OS_LINUX && defined __GNUC__ ++#if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__ + #include + #include + #include +@@ -340,7 +340,7 @@ + + int main(int argc, char *argv[]) + { +- #if defined Q_OS_LINUX && defined __GNUC__ ++ #if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__ + signal(SIGSEGV, sigHandler); + #endif + QThread::currentThread()->setObjectName("GUI"); diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template index ef7dbd1b524..4b80427ae05 100644 --- a/srcpkgs/cantata/template +++ b/srcpkgs/cantata/template @@ -1,6 +1,6 @@ # Template file for 'cantata' pkgname=cantata -version=2.2.0 +version=2.3.1 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" @@ -13,7 +13,7 @@ makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel depends="media-player-info" short_desc="Qt client for the music player daemon (MPD)" maintainer="LockeAnarchist " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/cdrummond/cantata" distfiles="https://github.com/CDrummond/cantata/releases/download/v${version}/${pkgname}-${version}.tar.bz2" -checksum=c84691eb17711118d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 +checksum=5b1e563ec125d57296495d0f8f97eeecf0b2260aa50b35bae7cab221d7914eb4 diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template new file mode 100644 index 00000000000..c079d41947f --- /dev/null +++ b/srcpkgs/catfish/template @@ -0,0 +1,15 @@ +# Template file for 'catfish' +pkgname=catfish +version=1.4.5 +revision=1 +noarch=yes +build_style=python3-module +pycompile_module="catfish catfish_lib" +hostmakedepends="intltool python3-distutils-extra python3-gobject" +depends="desktop-file-utils gtk+3 hicolor-icon-theme python3-gobject python3-pexpect" +short_desc="Versatile file searching tool" +maintainer="cr6git " +license="GPL-2.0-or-later" +homepage="http://www.twotoasts.de/index.php/catfish/" +distfiles="https://launchpad.net/catfish-search/${version%.*}/${version}/+download/catfish-${version}.tar.gz" +checksum=ad2304561b6eb0dea7c230241428f1017122fba403657d03a70e1f1ddc752c37 diff --git a/srcpkgs/catimg/template b/srcpkgs/catimg/template new file mode 100644 index 00000000000..651e25b7b72 --- /dev/null +++ b/srcpkgs/catimg/template @@ -0,0 +1,15 @@ +# Template file for 'catimg' +pkgname=catimg +version=2.4.0 +revision=1 +build_style=cmake +short_desc="Insanely fast image printing in your terminal" +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/posva/catimg" +distfiles="https://github.com/posva/catimg/archive/v${version}.tar.gz" +checksum=3eb475a9463976362470b4aad09442ff1157723e3fc342b125b4b41a055e8fe7 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/cbatticon-gtk3/template b/srcpkgs/cbatticon-gtk3/template index 0fe0bb2f9fc..5aaa5480818 100644 --- a/srcpkgs/cbatticon-gtk3/template +++ b/srcpkgs/cbatticon-gtk3/template @@ -1,17 +1,17 @@ # Template file for 'cbatticon-gtk3' pkgname=cbatticon-gtk3 -version=1.6.7 +version=1.6.8 revision=1 +wrksrc="cbatticon-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="gtk+-devel gtk+3-devel libnotify-devel" -maintainer="cr6git " +makedepends="gtk+-devel libnotify-devel" short_desc="Lightweight and fast battery icon that sits in your systray - GTK3" +maintainer="cr6git " +license="GPL-2.0-only" homepage="https://github.com/valr/cbatticon" -license="GPL-2" distfiles="https://github.com/valr/cbatticon/archive/${version}.tar.gz" -checksum=d0c33320a8e4421ade0f3cfaf3548a6f620ebc275339019cb5ff1ed87c2256e8 -wrksrc="cbatticon-${version}" +checksum=369f3fb20bd97e4aec5acf5915d8a5c9651033fc71b793913fd86f19d5feb4a0 provides="cbatticon-${version}_${revision}" replaces="cbatticon-gtk2>=0" diff --git a/srcpkgs/ccnet/template b/srcpkgs/ccnet/template index cf05bbcc4c9..e8c0fee2c16 100644 --- a/srcpkgs/ccnet/template +++ b/srcpkgs/ccnet/template @@ -1,7 +1,7 @@ # Template file for 'ccnet' pkgname=ccnet version=6.1.8 -revision=1 +revision=3 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libsearpc-codegen libtool pkg-config vala" diff --git a/srcpkgs/cdm/patches/fix-bashisms.patch b/srcpkgs/cdm/patches/fix-bashisms.patch new file mode 100644 index 00000000000..a81f665c948 --- /dev/null +++ b/srcpkgs/cdm/patches/fix-bashisms.patch @@ -0,0 +1,18 @@ +Source: maxice8 +Upstream: to be upstreamed +Reason: fixes running it with POSIX shells + +--- src/profile.sh ++++ src/profile.sh +@@ -1,8 +1,8 @@ + # To avoid potential situation where cdm(1) crashes on every TTY, here we + # default to execute cdm(1) on tty1 only, and leave other TTYs untouched. +-if [[ "$(tty)" == '/dev/tty1' ]]; then +- [[ -n "$CDM_SPAWN" ]] && return ++if [ "$(tty)" = '/dev/tty1' ]; then ++ [ -n "$CDM_SPAWN" ] && return + # Avoid executing cdm(1) when X11 has already been started. +- [[ -z "$DISPLAY$SSH_TTY$(pgrep xinit)" ]] && exec cdm ++ [ -z "$DISPLAY$SSH_TTY$(pgrep xinit)" ] && exec cdm + fi + diff --git a/srcpkgs/cdm/template b/srcpkgs/cdm/template index 6caa024c47b..5d409f36376 100644 --- a/srcpkgs/cdm/template +++ b/srcpkgs/cdm/template @@ -1,7 +1,7 @@ # Template file for 'cdm' pkgname=cdm version=0.7 -revision=1 +revision=2 short_desc="Console Display Manager" maintainer="Andrea Brancaleoni " depends="dialog xinit kbd xdpyinfo" diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template index 267666de304..9a0062d01fe 100644 --- a/srcpkgs/cegui/template +++ b/srcpkgs/cegui/template @@ -1,7 +1,7 @@ # Template file for 'cegui' pkgname=cegui version=0.8.7 -revision=7 +revision=8 build_style=cmake hostmakedepends="graphviz doxygen dejavu-fonts-ttf gd glm perl pkg-config" makedepends="libxml2-devel boost-devel glu-devel glew-devel glfw-devel diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template new file mode 100644 index 00000000000..10ee2a5af3c --- /dev/null +++ b/srcpkgs/cgrps/template @@ -0,0 +1,16 @@ +# Template file for 'cgrps' +pkgname=cgrps +version=0.7.0 +revision=1 +build_style=go +go_import_path=github.com/k1LoW/cgrps +short_desc="Set of commands for checking cgroups" +maintainer="maxice8 " +license="MIT" +homepage="https://github.com/k1LoW/cgrps" +distfiles="https://github.com/k1LoW/cgrps/archive/v${version}.tar.gz" +checksum=728d95bdcf6a4d2805b7b4262af26440d66408dceea92873d443fc059bb22613 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template index 4ea58e9b18f..0ea4850ebd2 100644 --- a/srcpkgs/choosenim/template +++ b/srcpkgs/choosenim/template @@ -1,8 +1,8 @@ # Template file for 'choosenim' pkgname=choosenim version=0.3.2 -revision=1 -hostmakedepends="git nim libressl-devel" +revision=2 +hostmakedepends="git nim" makedepends="libressl-devel zlib-devel" depends="gcc" short_desc="The Nim toolchain installer" @@ -12,6 +12,10 @@ homepage="https://github.com/dom96/choosenim" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=2478fcc75c5a147f63f755f700601ce25f8e2ca964b39ac3cb0d903d2fa22a2b +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" libressl-devel" +fi + do_build() { local arch args case "$XBPS_TARGET_MACHINE" in @@ -21,12 +25,12 @@ do_build() { esac if [ -n "$arch" ]; then cat > nim.cfg < - - -- 'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml' -+ 'file://@datadir@/backgrounds/gnome/adwaita-timed.xml' - <_summary>Picture URI - <_description> - URI to use for the background image. Not that the backend only supports ---- schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2014-10-01 03:54:35.830124486 +0000 -+++ schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2014-10-01 03:58:35.266015393 +0000 -@@ -97,7 +97,7 @@ - - - -- 'gnome' -+ 'Adwaita' - <_summary>Icon Theme - <_description> - Icon theme to use for the panel, nautilus etc. diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template index 013be632718..bc47da33719 100644 --- a/srcpkgs/cinnamon-desktop/template +++ b/srcpkgs/cinnamon-desktop/template @@ -1,30 +1,25 @@ # Template file for 'cinnamon-desktop' pkgname=cinnamon-desktop -version=3.6.2 +version=3.8.1 revision=1 short_desc="Library with common API for various Cinnamon modules" -build_style=gnu-configure -configure_args=" --disable-static" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool" -makedepends="gdk-pixbuf-devel gtk+3-devel libXrandr-devel xkeyboard-config - libxkbfile-devel pulseaudio-devel pam-devel accountsservice-devel" +build_style=meson +hostmakedepends="glib-devel gobject-introspection intltool pkg-config" +makedepends="accountsservice-devel gtk+3-devel libxkbfile-devel pam-devel + pulseaudio-devel" depends="xkeyboard-config" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=76b053eea02c61df22d35ccec6ba83de25246b794cbc024dce636dcb1e74c812 +checksum=239c8a210de18468919d9cbc379535e55628559e396cb321100ccab4ee0d04d0 +nocross=yes build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} - cinnamon-desktop-devel_package() { depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template index bfe8db42741..10f92278a1d 100644 --- a/srcpkgs/cinnamon-menus/template +++ b/srcpkgs/cinnamon-menus/template @@ -1,17 +1,18 @@ # Template file for 'cinnamon-menus' pkgname=cinnamon-menus -version=3.6.0 +version=3.8.2 revision=1 -short_desc="Cinnamon menu specifications" build_style=gnu-configure configure_args=" --disable-static" -hostmakedepends="automake libtool gnome-common pkg-config intltool gobject-introspection glib-devel" +hostmakedepends="glib-devel gnome-common gobject-introspection intltool + pkg-config" makedepends="libglib-devel" +short_desc="Cinnamon menu specifications" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=ac005b0b46fb6285f82b2f80683c7d5cdd719cb7548a4dc3e36f0cd717e38d00 +checksum=21de1b1b7367afcd7ccf9bc54633f495f30c26819da459de78b4a79fe4134725 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index cc7c3427866..d3cc9e907af 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -1,30 +1,35 @@ # Template file for 'cinnamon-screensaver' pkgname=cinnamon-screensaver -version=3.6.1 -revision=2 +version=3.8.2 +revision=1 short_desc="The Cinnamon screensaver" build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-mit-ext" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool python3-devel" -makedepends="dbus-glib-devel libgnomekbd-devel cinnamon-desktop-devel - libXxf86misc-devel pam-devel webkit2gtk-devel python3-devel" -depends="cinnamon-translations desktop-file-utils hicolor-icon-theme - python3-gobject xapps python3-setproctitle python3-xapp" +hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection + intltool pkg-config python3-devel" +makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel + libgnomekbd-devel pam-devel python3-devel webkit2gtk-devel" +depends="cinnamon-translations hicolor-icon-theme python3-gobject + python3-setproctitle python3-xapp xapps" conf_files="/etc/pam.d/${pkgname}" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=aeb3edb07f6e9a0f9aa0e291c82c26b12335dfe78fea6a32edb4ff1d049ca728 +checksum=6f07d2a13d81794d4654d04a9cb9c80ed02fccf7031747a2dfe4bf3f455ac2ca nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio pycompile_version="$py3_ver" pycompile_dirs="/usr/share/cinnamon-screensaver" +do_check() { + : +} + pre_configure() { NOCONFIGURE=1 ./autogen.sh } + post_install() { vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname} } diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template index 26f05b24fb8..0c889a2c7a2 100644 --- a/srcpkgs/cinnamon-session/template +++ b/srcpkgs/cinnamon-session/template @@ -1,27 +1,18 @@ # Template file for 'cinnamon-session' pkgname=cinnamon-session -version=3.6.1 +version=3.8.1 revision=1 short_desc="The Cinnamon session handler" -build_style=gnu-configure -configure_args="--disable-static --disable-schemas-compile" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel dbus-glib-devel glib-devel intltool" +build_style=meson +hostmakedepends="pkg-config gobject-introspection + gettext-devel dbus-glib-devel glib-devel intltool xmlto" makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel - elogind-devel GConf-devel libXtst-devel" + elogind-devel GConf-devel libXtst-devel xapps-devel" depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=1de855afe097c2fe4d63f0edd4f8876ace2d73620edb65b3c665e91e5a115d9e +checksum=c5ddf1ee820a2d76f0515905b85a998e80fcbc586c1fd41ad2652aa18e1755fe -if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then - # Fix gcc6 build for -Wformat-nonliteral - CFLAGS="-Wno-error=format-nonliteral" -fi - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index ad5e9bb24af..f3f46d1de00 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,27 +1,31 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon -version=3.6.2 -revision=3 +version=3.8.4 +revision=1 short_desc="The Cinnamon Settings Daemon" build_style=gnu-configure configure_args=" --disable-static --disable-schemas-compile --disable-gconf" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel dbus-glib-devel intltool xmlto docbook-xml" -makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel - libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel nss-devel - pulseaudio-devel libcanberra-devel colord-devel cups-devel polkit-devel - libgnomekbd-devel libxklavier-devel xorgproto elogind-devel libgudev-devel" +hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common + gobject-introspection intltool pkg-config" +makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel + libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel + nss-devel polkit-devel pulseaudio-devel upower-devel" depends="desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" +changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=60f4de4eb1e05d720605dbd6f90bb841039be00ca1ad4f2bedaf39725ea34339 +checksum=3c1f63d4d3acc6ee6d38d5d384d49333af1470458e8b53dace3483d1b27135e5 pre_configure() { NOCONFIGURE=1 ./autogen.sh } +do_check() { + : +} + cinnamon-settings-daemon-devel_package() { short_desc+=" - development files" depends="libglib-devel" diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template index d8a999d2dab..2dcf451e6f9 100644 --- a/srcpkgs/cinnamon-translations/template +++ b/srcpkgs/cinnamon-translations/template @@ -1,15 +1,16 @@ # Template file for 'cinnamon-translations' pkgname=cinnamon-translations -version=3.6.4 +version=3.8.2 revision=1 noarch=yes build_style=gnu-makefile short_desc="Translations for Cinnamon and Nemo" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" +changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=8f993ae34e3f176dc3182c2e95d1dfa1bb4e0dfd8a71933e3670718834aeec62 +checksum=f5d187578025d8d02832ba4f24c721a73ef0e24ff758d64272ee2a40c827127e do_install() { vmkdir /usr/share/locale diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index 27225c483d5..114e1918185 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,14 +1,14 @@ # Template file for 'cinnamon' pkgname=cinnamon -version=3.6.7 +version=3.8.6 revision=2 wrksrc="Cinnamon-${version}" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-compile-warnings=no" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool xmlto docbook-xml gtk-doc autoconf-archive" +hostmakedepends="automake libtool pkg-config gobject-introspection + gettext-devel glib-devel intltool xmlto gtk-doc autoconf-archive" makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel @@ -19,15 +19,18 @@ depends=" cinnamon-session>=${version%.*} muffin>=${version%.*} cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*} cinnamon-translations>=${version%.*} nemo>=${version%.*} - gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet - python-cairo python-dbus python-pam python-pexpect python-inotify python-lxml python-Pillow - polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus" + gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds + network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus + python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" +changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=ddd29e1a2e044dfa54a5c57b21f9704512845824a101eca37266109560c70d08 +checksum=b4d4a50713a9e373e987c25c9f9ffa8ba63b0673cfedf6aa93dd394359a094cc +nocross="gobject-introspection" +pycompile_version="$py3_ver" pycompile_dirs=" /usr/share/cinnamon/cinnamon-slideshow /usr/share/cinnamon/cinnamon-settings-users @@ -38,13 +41,14 @@ pycompile_dirs=" /usr/share/cinnamon/cinnamon-json-makepot /usr/share/cinnamon/cinnamon-desktop-editor" +do_check() { + : +} + pre_configure() { # Add polkit agent to required components sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session - # fix for the python2 PAM module - sed -i 's:import PAM:import pam:' files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py - # Use pkexec instead of gksu sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template index cba71ae34aa..a50641a46a4 100644 --- a/srcpkgs/cjs/template +++ b/srcpkgs/cjs/template @@ -1,23 +1,34 @@ # Template file for 'cjs' pkgname=cjs -version=3.6.1 +version=3.8.0 revision=1 short_desc="Javascript for Cinnamon" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config gobject-introspection glib-devel" -makedepends="mozjs38-devel dbus-glib-devel readline-devel gobject-introspection" +makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz" -checksum=874b473cff62e2adaeca2135f0b2eab5efe1e397ce24ea816d92aafef1a5c845 +checksum=9018ec1ffc0c2c81c9678a23e3e57db56251b4bbf6b2a10e79aa75e83ca86d66 pre_configure() { NOCONFIGURE=1 ./autogen.sh } +do_check() { + : +# TOTAL: 729 +# PASS: 707 +# SKIP: 14 +# XFAIL: 0 +# FAIL: 3 +# XPASS: 0 +# ERROR: 5 +} + cjs-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 520439e024a..cd9ffdc18da 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,6 +1,6 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.11.3 +version=3.11.4 revision=1 wrksrc="cmake-${version}" build_style=configure @@ -14,8 +14,8 @@ short_desc="Cross-platform, open-source build system - Qt GUI" 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%.*}/cmake-$version.tar.gz" -checksum=287135b6beb7ffc1ccd02707271080bbf14c21d80c067ae2c0040e5f3508c39a +distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" +checksum=8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5 nocross=yes do_install() { diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index fa1282ca998..ba382647a9c 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.11.3 +version=3.11.4 revision=1 build_style=configure makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel @@ -9,8 +9,8 @@ short_desc="Cross-platform, open-source build system" 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=287135b6beb7ffc1ccd02707271080bbf14c21d80c067ae2c0040e5f3508c39a +distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" +checksum=8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5 make_check_target=test if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/cmocka-devel b/srcpkgs/cmocka-devel new file mode 120000 index 00000000000..112e5178a06 --- /dev/null +++ b/srcpkgs/cmocka-devel @@ -0,0 +1 @@ +cmocka \ No newline at end of file diff --git a/srcpkgs/cmocka/template b/srcpkgs/cmocka/template new file mode 100644 index 00000000000..2f12e4b1345 --- /dev/null +++ b/srcpkgs/cmocka/template @@ -0,0 +1,29 @@ +# Template file for 'cmocka' +pkgname=cmocka +version=1.1.1 +revision=1 +build_style=cmake +configure_args="-DUNIT_TESTING=ON" +hostmakedepends="doxygen" +short_desc="Unit testing framework in C" +maintainer="maxice8 " +license="Apache-2.0" +homepage="https://cmocka.org/" +distfiles="https://cmocka.org/files/${version%.*}/cmocka-${version}.tar.xz" +checksum=f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389 + +case "$XBPS_TARGET_MACHINE" in + aarch64*) broken="conflicting definitions of uinptr_t" +esac + +cmocka-devel_package() { + depends="cmocka-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/cmake + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} diff --git a/srcpkgs/cmus-sndio b/srcpkgs/cmus-sndio new file mode 120000 index 00000000000..c299fe288cf --- /dev/null +++ b/srcpkgs/cmus-sndio @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus/patches/sndio.diff b/srcpkgs/cmus/patches/sndio.diff new file mode 100644 index 00000000000..5e0a30502df --- /dev/null +++ b/srcpkgs/cmus/patches/sndio.diff @@ -0,0 +1,27 @@ +--- configure.orig 2018-05-02 14:46:09.900968269 +0200 ++++ configure 2018-05-02 14:46:30.935113630 +0200 +@@ -20,12 +20,8 @@ + + check_sndio() + { +- case `uname -s` in +- OpenBSD) +- check_library SNDIO "" "-lsndio" +- return $? +- esac +- return 1 ++ check_library SNDIO "" "-lsndio" ++ return $? + } + + check_compat() +--- sndio.c.orig 2018-05-02 14:52:24.031553732 +0200 ++++ sndio.c 2018-05-02 14:52:32.410611635 +0200 +@@ -20,7 +20,6 @@ + + #include + #include +-#include + #include + #include + #include diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index c4085db5e2b..2fc99535d21 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -1,18 +1,18 @@ # Template file for 'cmus' pkgname=cmus version=2.7.1 -revision=3 -short_desc="Small, fast and powerful console music player" -maintainer="Juan RP " -license="GPL-2" -homepage="http://cmus.github.io" -distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz" -checksum=8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165 - +revision=4 hostmakedepends="pkg-config" makedepends="ncurses-devel faad2-devel libflac-devel libao-devel libmad-devel libmodplug-devel libmp4v2-devel libmpcdec-devel pulseaudio-devel - opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel" + opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel + sndio-devel" +short_desc="Small, fast and powerful console music player" +maintainer="Juan RP " +license="GPL-2.0-or-later" +homepage="https://cmus.github.io" +distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz" +checksum=8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165 do_configure() { ./configure prefix=/usr @@ -95,3 +95,10 @@ cmus-wavpack_package() { vmove usr/lib/cmus/ip/wavpack.so } } +cmus-sndio_package() { + short_desc+=" - sndio output plugin" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/lib/cmus/op/sndio.so + } +} diff --git a/srcpkgs/compton-conf/template b/srcpkgs/compton-conf/template index fcc311daece..d95889d03ac 100644 --- a/srcpkgs/compton-conf/template +++ b/srcpkgs/compton-conf/template @@ -1,16 +1,16 @@ # Template file for 'compton-conf' pkgname=compton-conf -version=0.3.0 -revision=2 +version=0.4.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" -makedepends="lxqt-build-tools liblxqt-devel libconfig-devel" -depends="compton-git desktop-file-utils" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="qt5-tools-devel libconfig-devel" +depends="compton desktop-file-utils" short_desc="LXQt GUI configuration tool for compton" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/compton-conf/releases/download/${version}/compton-conf-${version}.tar.xz" -checksum=7cd239d7542816ee002e6ab2b7e1211102e5ddc6588cc8eaf3d7c0462ff1e6f7 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/compton-conf/releases/download/${version}/compton-conf-${version}.tar.xz" +checksum=91c9153a2b15bd4680c77923515a84b9bed374da15eec733541e396e94e87e60 replaces="lxqt-common>=0" diff --git a/srcpkgs/compton-git/template b/srcpkgs/compton-git/template deleted file mode 100644 index bc92dfe43a7..00000000000 --- a/srcpkgs/compton-git/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'compton-git' -pkgname=compton-git -version=20170430 -revision=3 -build_style="gnu-makefile" -hostmakedepends="pkg-config asciidoc git" -makedepends="dbus-devel libXcomposite-devel libXrandr-devel pcre-devel - libconfig-devel MesaLib-devel libXinerama-devel" -depends="desktop-file-utils" -maintainer="Juan RP " -homepage="https://github.com/chjj/compton" -license="MIT" -short_desc="A compositor for X (fork of xcompmgr-dana)" -_githash=316eac0613bf342ff91cc645a6c3c80e6b9083fb -distfiles="${homepage}/archive/${_githash}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=b0bb9dfcf47d21d6711c9544f01a92b8491b77d79c6462ec1ddfb4c7a930e9df -wrksrc="compton-${_githash}" - -provides="compton-${version}_${revision}" -replaces="compton>=0" - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/compton/template b/srcpkgs/compton/template new file mode 100644 index 00000000000..3c5384a8344 --- /dev/null +++ b/srcpkgs/compton/template @@ -0,0 +1,26 @@ +# Template file for 'compton' +pkgname=compton +version=0.0.20180521 +revision=1 +_githash=9b24550814b7c69065f90039b0a5d0a2281b9f81 +wrksrc="compton-${_githash}" +build_style=gnu-makefile +hostmakedepends="pkg-config asciidoc" +makedepends="dbus-devel libXcomposite-devel libXrandr-devel pcre-devel + libconfig-devel MesaLib-devel libXinerama-devel" +depends="desktop-file-utils" +short_desc="Compositor for X11 (fork of xcompmgr-dana)" +maintainer="Juan RP " +license="MIT" +homepage="https://github.com/yshui/compton/" +distfiles="https://github.com/yshui/compton/archive/${_githash}.tar.gz" +checksum=f9818fe0ff3f012802ff123f0ca8d8b38e3e5e1775dc95126bd28c8ff4101e7e +replaces="compton-git>=0" + +pre_build() { + export COMPTON_VERSION="v0.1_beta2" +} +post_install() { + vsconf compton.sample.conf + vlicense LICENSE +} diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index 84249f6a911..36015fa6754 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -1,6 +1,6 @@ # Template file for 'consul' pkgname=consul -version=1.1.0 +version=1.2.0 revision=1 build_style=go go_import_path="github.com/hashicorp/${pkgname}" @@ -9,4 +9,4 @@ maintainer="iaroki " license="MPL-2.0" homepage="https://www.consul.io/" distfiles="https://github.com/hashicorp/consul/archive/v${version}.tar.gz" -checksum=8e2539561eb07b2623d9828587e68f5ef46cee882227c7331ff26dddcdc0e9df +checksum=949a3904eb881133633a1b63d675c14db610c1271b450e0ecdcf6b18a9dce0d7 diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template index 5ea126fd57e..4c5977aa77c 100644 --- a/srcpkgs/containerd/template +++ b/srcpkgs/containerd/template @@ -1,18 +1,18 @@ # Template file for 'containerd' pkgname=containerd -version=1.0.3 -revision=2 +version=1.1.0 +revision=1 build_style=go go_import_path=github.com/containerd/containerd -hostmakedepends="git" -makedepends="libbtrfs-devel" +hostmakedepends="git pkg-config" +makedepends="libbtrfs-devel libseccomp-devel" depends="runc" short_desc="An open and reliable container runtime" maintainer="Paul Knopf " license="Apache-2.0" homepage="https://github.com/containerd/containerd" distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz" -checksum=299e3a93eac232c1259fe058e724bfc274741b13b9de96116d1f61619bb2789e +checksum=08f057ece7e518b14cce2e9737228a5a899a7b58b78248a03e02f4a6c079eeaf make_dirs="/var/lib/containerd 0755 root root" do_build() { diff --git a/srcpkgs/corebird/template b/srcpkgs/corebird/template index ebb696b5e90..e926a9eadfa 100644 --- a/srcpkgs/corebird/template +++ b/srcpkgs/corebird/template @@ -1,11 +1,12 @@ # Template build for 'corebird'. pkgname=corebird version=1.7.4 -revision=3 +revision=4 build_style=meson hostmakedepends="pkg-config vala" makedepends="gtk+3-devel libgee08-devel sqlite-devel gspell-devel libsoup-devel json-glib-devel gettext-devel gst-plugins-base1-devel" +depends="dconf" short_desc="Native Gtk+ Twitter Client" maintainer="Enno Boland " license="GPL-3.0-or-later" diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template index e6c04c02fe5..7d08a8921ea 100644 --- a/srcpkgs/cpp-hocon/template +++ b/srcpkgs/cpp-hocon/template @@ -1,7 +1,7 @@ # Template file for 'cpp-hocon' pkgname=cpp-hocon -version=0.1.6 -revision=3 +version=0.1.7 +revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel leatherman libcurl-devel" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="Apache-2.0" homepage="https://github.com/puppetlabs/cpp-hocon" distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=98beb111068e54c8f0ae49be95c1ebd35c4cbb25098a999a7a569d6f835deaea +checksum=1d771de9342e74115a27355c80a81a510c7851cb1269bac1dd2582c84425652c diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index 09b7a8491e1..77034db7bc3 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.26 -revision=1 +revision=2 short_desc="Cross toolchain for ARM64 LE target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index 8de12c4ee6d..35223c42ffd 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.26 -revision=1 +revision=2 short_desc="Cross toolchain for ARMv5 TE target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template index 042b252b18f..30f00675008 100644 --- a/srcpkgs/cross-arm-linux-musleabihf/template +++ b/srcpkgs/cross-arm-linux-musleabihf/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.26 -revision=1 +revision=2 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index 9eab1967503..0cd941d75c9 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.26 -revision=1 +revision=2 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 148fc78d365..cc8aa595f63 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -11,7 +11,7 @@ _archflags="-march=i686" pkgname=cross-${_triplet} version=0.26 -revision=1 +revision=2 short_desc="Cross toolchain for i686 target (musl)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index b8ecf225168..9019a920972 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.26 -revision=1 +revision=2 short_desc="Cross toolchain for x86_64 with musl" maintainer="Juan RP " homepage="http://www.voidlinux.eu" diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index be398ffe18c..81c2685f21f 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,7 +1,7 @@ # Template file for 'cryptsetup' pkgname=cryptsetup version=2.0.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality) --enable-cryptsetup-reencrypt" diff --git a/srcpkgs/culmus/template b/srcpkgs/culmus/template index b46680499b6..c463de82452 100644 --- a/srcpkgs/culmus/template +++ b/srcpkgs/culmus/template @@ -1,12 +1,12 @@ # Template file for 'culmus' pkgname=culmus version=0.132 -revision=1 -noarch="yes" +revision=2 +noarch=yes depends="font-util" short_desc="A collection of Type1 and TrueType free Hebrew fonts" -maintainer="DirectorX " -license="GPL-2" +maintainer="DirectorX " +license="GPL-2.0-or-later" homepage="http://culmus.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=b13e7463ede5e56da79892e6a22eaca8ae3e0fc34a30fcf7417412a45dee072c diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml index 2e91ca644f7..e6b78cff3fc 100644 --- a/srcpkgs/darcs/files/stack.yaml +++ b/srcpkgs/darcs/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.3 +resolver: lts-11.15 extra-deps: - fgl-5.5.4.0 - graphviz-2999.19.0.0 diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template index 213f0d7aa53..091d2983900 100644 --- a/srcpkgs/darcs/template +++ b/srcpkgs/darcs/template @@ -1,18 +1,18 @@ # Template file for 'darcs' pkgname=darcs -version=2.14.0 +version=2.14.1 revision=1 -nocross=yes build_style=haskell-stack hostmakedepends="unzip" makedepends="zlib-devel libcurl-devel ncurses-devel" short_desc="Change-focused cross-platform version control system" maintainer="Leah Neukirchen " -license="GPL-2.0" +license="GPL-2.0-or-later" homepage="http://darcs.net/" distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=19fa0882a1485f03ab0552d6f01d538c2b286c4a38a1fe502e9cf2a78f782803 +checksum=61ddbc99acaf06df3a114437064e9241e0da467c23d1d3fb520a782eee32cd35 nopie_files="/usr/bin/darcs" +nocross=yes post_install() { vinstall contrib/darcs_completion 644 etc/bash_completion.d diff --git a/srcpkgs/dde-qt-dbus-factory-devel b/srcpkgs/dde-qt-dbus-factory-devel new file mode 120000 index 00000000000..16fd6abcb8e --- /dev/null +++ b/srcpkgs/dde-qt-dbus-factory-devel @@ -0,0 +1 @@ +dde-qt-dbus-factory \ No newline at end of file diff --git a/srcpkgs/dde-qt-dbus-factory/template b/srcpkgs/dde-qt-dbus-factory/template new file mode 100644 index 00000000000..3d48396229f --- /dev/null +++ b/srcpkgs/dde-qt-dbus-factory/template @@ -0,0 +1,36 @@ +# Template file for 'dde-qt-dbus-factory' +pkgname=dde-qt-dbus-factory +version=1.0.2 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake python" +makedepends="qt5-devel" +short_desc="Auto-generated Qt5 D-Bus code used by DDE" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/dde-qt-dbus-factory" +changelog="https://github.com/linuxdeepin/dde-qt-dbus-factory/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/dde-qt-dbus-factory/archive/${version}.tar.gz" +checksum=f8df3040f366fac105d1affaa1af5db8c38b2db4e3b089b8b403e622cf62125c + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-devel dde-qt-dbus-factory-devel" +fi + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + sed -i -e 's/os.path.join(project_root, "bin", "qdbusxml2cpp-fix")/os.path.join("\/usr", "bin", "qdbusxml2cpp-fix")/' libdframeworkdbus/generate_code.py + fi +} + +dde-qt-dbus-factory-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vbin bin/qdbusxml2cpp-fix + } +} diff --git a/srcpkgs/deadbeef-fb/update b/srcpkgs/deadbeef-fb/update new file mode 100644 index 00000000000..cc43bfab7e8 --- /dev/null +++ b/srcpkgs/deadbeef-fb/update @@ -0,0 +1 @@ +pattern="^v\K[\d.]+(?=)" diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index 19160e4ebf6..eb0ddbce920 100644 --- a/srcpkgs/debootstrap/template +++ b/srcpkgs/debootstrap/template @@ -1,6 +1,6 @@ # Template file for 'debootstrap' pkgname=debootstrap -version=1.0.102 +version=1.0.104 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="f0b9d471dc84e1e13ec8050a6095d79d41d037d1b9024404234ae08b7debf5a6 +checksum="1bea11bdfa83e7c8c287882e2597a7bbf619c4cc52ec62070797daac36c18bf3 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0" do_install() { diff --git a/srcpkgs/deepin-calculator/template b/srcpkgs/deepin-calculator/template new file mode 100644 index 00000000000..40d96abfdb7 --- /dev/null +++ b/srcpkgs/deepin-calculator/template @@ -0,0 +1,19 @@ +# Template file for 'deepin-calculator' +pkgname=deepin-calculator +version=1.0.4 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-host-tools" +makedepends="dtkwidget-devel qt5-svg-devel" +depends="qt5integration" +short_desc="Easy to use Calculator for Deepin" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-calculator" +changelog="https://github.com/linuxdeepin/deepin-calculator/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-calculator/archive/${version}.tar.gz" +checksum=732dc5daa6b35a09d13be05649b6a21e44e42d864869da168f1ca98ce166c9bd + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel" +fi diff --git a/srcpkgs/deepin-draw/template b/srcpkgs/deepin-draw/template new file mode 100644 index 00000000000..912ffed8381 --- /dev/null +++ b/srcpkgs/deepin-draw/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-draw' +pkgname=deepin-draw +version=1.0.0 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-host-tools" +makedepends="qt5-svg-devel dtkwidget-devel libexif-devel libraw-devel + freeimage-devel xcb-util-devel dtkwm-devel" +depends="deepin-picker qt5integration" +short_desc="Deepin Painting Tool" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-draw" +changelog="https://github.com/linuxdeepin/deepin-draw/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-draw/archive/${version}.tar.gz" +checksum=4a9430d9e52b3708da7e9e88a8106686333cd80ff3a3b127d1549d5ee111c6f4 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel" +fi diff --git a/srcpkgs/deepin-editor/template b/srcpkgs/deepin-editor/template new file mode 100644 index 00000000000..6fa65d8f728 --- /dev/null +++ b/srcpkgs/deepin-editor/template @@ -0,0 +1,22 @@ +# Template file for 'deepin-editor' +pkgname=deepin-editor +version=0.0.5 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="dtkwidget-devel dtkwm-devel libxcb-devel kcodecs-devel + xcb-util-devel qt5-svg-devel qt5-x11extras-devel libXtst-devel + syntax-highlighting-devel polkit-qt5-devel" +depends="qt5integration" +short_desc="Simple editor for Deepin" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-editor" +changelog="https://github.com/linuxdeepin/deepin-editor/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-editor/archive/${version}.tar.gz" +checksum=3518e669b7203073fdc65e70cd68a8f0662a962d3bca5f72d42317961f6f45ec + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel kcodecs-devel + syntax-highlighting-devel" +fi diff --git a/srcpkgs/deepin-icon-theme/template b/srcpkgs/deepin-icon-theme/template new file mode 100644 index 00000000000..eb2279f8c87 --- /dev/null +++ b/srcpkgs/deepin-icon-theme/template @@ -0,0 +1,18 @@ +# Template file for 'deepin-icon-theme' +pkgname=deepin-icon-theme +version=15.12.58 +revision=1 +noarch=yes +build_style=gnu-makefile +depends="papirus-icon-theme" +short_desc="Deepin Icon Theme" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-icon-theme" +changelog="https://github.com/linuxdeepin/deepin-icon-theme/blob/master/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-icon-theme/archive/${version}.tar.gz" +checksum=302a1664f059b1cd199c89940dfa2baddae8de8bb5dbdc4111b95710e871e7e6 + +do_build() { + : +} diff --git a/srcpkgs/deepin-image-viewer/template b/srcpkgs/deepin-image-viewer/template new file mode 100644 index 00000000000..9160d0ee689 --- /dev/null +++ b/srcpkgs/deepin-image-viewer/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-image-viewer' +pkgname=deepin-image-viewer +version=1.2.22 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="qt5-svg-devel qt5-x11extras-devel libraw-devel libexif-devel + freeimage-devel dtkwidget-devel" +depends="qt5-plugin-sqlite qt5integration" +short_desc="Deepin Image Viewer" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-image-viewer" +changelog="https://github.com/linuxdeepin/deepin-image-viewer/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-image-viewer/archive/${version}.tar.gz" +checksum=504afc7f907818be6a91a0338c877c542ea7ceb897e755058518909a02a0ed30 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel" +fi diff --git a/srcpkgs/deepin-menu/template b/srcpkgs/deepin-menu/template new file mode 100644 index 00000000000..b979a8ad93b --- /dev/null +++ b/srcpkgs/deepin-menu/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-menu' +pkgname=deepin-menu +version=3.3.8 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="dtkwidget-devel qt5-declarative-devel dde-qt-dbus-factory-devel + qt5-x11extras-devel" +depends="python" +short_desc="Unified menu service for Deepin Desktop Environment" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-menu/" +changelog="https://github.com/linuxdeepin/deepin-menu/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-menu/archive/${version}.tar.gz" +checksum=ba4087a1812810a8610b0699cd7e9546744959d240a3c2a6983d3a823b8436a6 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-devel" +fi diff --git a/srcpkgs/deepin-movie-reborn-devel b/srcpkgs/deepin-movie-reborn-devel new file mode 120000 index 00000000000..85b9a40f39d --- /dev/null +++ b/srcpkgs/deepin-movie-reborn-devel @@ -0,0 +1 @@ +deepin-movie-reborn \ No newline at end of file diff --git a/srcpkgs/deepin-movie-reborn/patches/cross.patch b/srcpkgs/deepin-movie-reborn/patches/cross.patch new file mode 100644 index 00000000000..8439ce5dc6f --- /dev/null +++ b/srcpkgs/deepin-movie-reborn/patches/cross.patch @@ -0,0 +1,10 @@ +--- src/backends/mpv/mpv_glwidget.cpp 2018-05-04 10:15:32.000000000 +0200 ++++ - 2018-05-22 22:08:57.552655817 +0200 +@@ -38,6 +38,7 @@ + #include + DWIDGET_USE_NAMESPACE + ++#include + + static const char* vs_blend = R"( + attribute vec2 position; diff --git a/srcpkgs/deepin-movie-reborn/patches/locale.patch b/srcpkgs/deepin-movie-reborn/patches/locale.patch new file mode 100644 index 00000000000..b7837db82f1 --- /dev/null +++ b/srcpkgs/deepin-movie-reborn/patches/locale.patch @@ -0,0 +1,11 @@ +--- src/libdmr/player_engine.cpp 2018-05-04 10:15:32.000000000 +0200 ++++ - 2018-05-05 14:43:52.094245514 +0200 +@@ -48,6 +48,8 @@ + auto *l = new QVBoxLayout(this); + l->setContentsMargins(0, 0, 0, 0); + ++ setlocale(LC_NUMERIC, "C"); ++ + _current = new MpvProxy(this); + if (_current) { + connect(_current, &Backend::stateChanged, this, &PlayerEngine::onBackendStateChanged); diff --git a/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch b/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch new file mode 100644 index 00000000000..de5543fdb32 --- /dev/null +++ b/srcpkgs/deepin-movie-reborn/patches/musl-basename.patch @@ -0,0 +1,13 @@ +--- compositing_manager.cpp 2018-02-16 23:26:46.157644103 +0100 ++++ src/libdmr/compositing_manager.cpp 2018-02-16 23:31:57.378630531 +0100 +@@ -46,6 +46,10 @@ + #undef Bool + #include + ++#if !defined(__GLIBC__) ++#include ++#endif ++ + typedef const char * glXGetScreenDriver_t (Display *dpy, int scrNum); + + static glXGetScreenDriver_t *GetScreenDriver; diff --git a/srcpkgs/deepin-movie-reborn/template b/srcpkgs/deepin-movie-reborn/template new file mode 100644 index 00000000000..ae36d2c8ff9 --- /dev/null +++ b/srcpkgs/deepin-movie-reborn/template @@ -0,0 +1,38 @@ +# Template file for 'deepin-movie-reborn' +pkgname=deepin-movie-reborn +version=3.2.7 +revision=1 +build_style=cmake +hostmakedepends="pkg-config qt5-host-tools qt5-qmake" +makedepends="dtkwidget-devel ffmpegthumbnailer-devel libdvdnav-devel mpv-devel + pulseaudio-devel qt5-declarative-devel qt5-plugin-mysql qt5-plugin-odbc + qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-svg-devel qt5-tools-devel + qt5-x11extras-devel xcb-util-wm-devel" +depends="qt5integration" +short_desc="Deepin Movie Player" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-movie-reborn" +changelog="https://github.com/linuxdeepin/deepin-movie-reborn/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-movie-reborn/archive/${version}.tar.gz" +checksum=25371d8407060aa791489b3c73127a1333d3396875dacc6074336dc77e8fb39a + +CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" + +case $XBPS_TARGET_MACHINE in + arm*) broken="https://travis-ci.org/void-linux/void-packages/jobs/394936356";; +esac + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" dtkcore-devel" +fi + +deepin-movie-reborn-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/lib/pkgconfig + vmove usr/include + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/deepin-music-devel b/srcpkgs/deepin-music-devel new file mode 120000 index 00000000000..6374d6b3e74 --- /dev/null +++ b/srcpkgs/deepin-music-devel @@ -0,0 +1 @@ +deepin-music \ No newline at end of file diff --git a/srcpkgs/deepin-music/template b/srcpkgs/deepin-music/template new file mode 100644 index 00000000000..67473159bdf --- /dev/null +++ b/srcpkgs/deepin-music/template @@ -0,0 +1,31 @@ +# Template file for 'deepin-music' +pkgname=deepin-music +version=3.1.8.3 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="dtkwidget-devel ffmpeg-devel libcue-devel pulseaudio-devel + qt5-multimedia-devel qt5-svg-devel qt5-x11extras-devel taglib-devel" +depends="deepin-menu qt5-plugin-sqlite qt5integration" +short_desc="Deepin Music Player" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-music/" +changelog="https://github.com/linuxdeepin/deepin-music/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-music/archive/${version}.tar.gz" +checksum=8bd61bcf9f24e9078f7ce37a942ac7db150f83c80a61f910e545da4839074a83 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel qt5-multimedia-devel qt5-x11extras-devel" +fi + +deepin-music-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/qt5/mkspecs + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/deepin-picker/template b/srcpkgs/deepin-picker/template new file mode 100644 index 00000000000..366052cf568 --- /dev/null +++ b/srcpkgs/deepin-picker/template @@ -0,0 +1,19 @@ +# Template file for 'deepin-picker' +pkgname=deepin-picker +version=1.6.2 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-host-tools" +makedepends="dtkwidget-devel qt5-svg-devel qt5-x11extras-devel xcb-util-devel + libXtst-devel" +short_desc="Simple color picker" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-picker" +changelog="https://github.com/linuxdeepin/deepin-picker/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-picker/archive/${version}.tar.gz" +checksum=ef3cad26ff421f0d1f3f587e1dc824b1521c0467911f9d975c0ea6b268f984c8 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel" +fi diff --git a/srcpkgs/deepin-screenshot/template b/srcpkgs/deepin-screenshot/template new file mode 100644 index 00000000000..417d6a901fb --- /dev/null +++ b/srcpkgs/deepin-screenshot/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-screenshot' +pkgname=deepin-screenshot +version=4.0.16 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake qt5-host-tools pkg-config" +makedepends="qt5-svg-devel xcb-util-devel dtkwidget-devel dtkwm-devel + qt5-x11extras-devel libXtst-devel" +depends="qt5integration" +short_desc="Deepin Screenshot App" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-screenshot" +changelog="https://github.com/linuxdeepin/deepin-screenshot/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-screenshot/archive/${version}.tar.gz" +checksum=f710a58c66594affe7ab3b01903eebd0ca82b38f24d8f95c6bb2b1f4de517104 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-x11extras-devel" +fi diff --git a/srcpkgs/deepin-system-monitor/template b/srcpkgs/deepin-system-monitor/template new file mode 100644 index 00000000000..aa581d86fea --- /dev/null +++ b/srcpkgs/deepin-system-monitor/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-system-monitor' +pkgname=deepin-system-monitor +version=1.4.4 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-host-tools" +makedepends="dtkwm-devel dtkwidget-devel qt5-x11extras-devel libpcap-devel + procps-ng-devel libxcb-devel libXtst-devel xcb-util-devel" +depends="qt5integration" +short_desc="User-friendly system monitor for Deepin" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/manateelazycat/deepin-system-monitor" +changelog="https://github.com/linuxdeepin/deepin-system-monitor/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/manateelazycat/deepin-system-monitor/archive/${version}.tar.gz" +checksum=b78fe39ea19b9c7523036ef95e5bfc602ac953573597725ce956044aaabbe4c5 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-x11extras-devel" +fi diff --git a/srcpkgs/deepin-terminal/patches/glib.patch b/srcpkgs/deepin-terminal/patches/glib.patch new file mode 100644 index 00000000000..142ff0b0992 --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/glib.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt 2018-05-24 16:03:56.376621081 +0200 ++++ - 2018-05-24 16:07:49.217575585 +0200 +@@ -10,7 +10,7 @@ + find_package(Vala) + ensure_vala_version("0.22.0" MINIMUM) + find_package(PkgConfig) +-find_package(GLib "2.48" REQUIRED) ++find_package(GLib REQUIRED) + find_package(JsonGlib) + find_package(Libsecret) + find_package(FontConfig) diff --git a/srcpkgs/deepin-terminal/patches/musl.patch b/srcpkgs/deepin-terminal/patches/musl.patch new file mode 100644 index 00000000000..4576a2ad6b9 --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/musl.patch @@ -0,0 +1,10 @@ +--- 3rdparty/zssh-1.5c/openpty.c 2018-05-14 05:47:46.000000000 +0200 ++++ - 2018-05-24 15:26:26.729972575 +0200 +@@ -9,6 +9,7 @@ + */ + + #include "zssh.h" ++#include + + #define GL_SLAVENAMELEN 50 + static char gl_slavename[GL_SLAVENAMELEN + 1] = {0}; diff --git a/srcpkgs/deepin-terminal/patches/remove-vendor.patch b/srcpkgs/deepin-terminal/patches/remove-vendor.patch new file mode 100644 index 00000000000..8aa78a3eb5b --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/remove-vendor.patch @@ -0,0 +1,52 @@ +--- masterdir/builddir/deepin-terminal-3.0.0/CMakeLists.txt 2018-05-14 05:47:46.000000000 +0200 ++++ CMakeLists.txt 2018-05-24 15:11:43.457568178 +0200 +@@ -24,6 +24,7 @@ + pkg_check_modules(WNCK REQUIRED libwnck-3.0) + pkg_check_modules(FONTCONFIG REQUIRED fontconfig) + pkg_check_modules(GLIB REQUIRED glib-2.0) ++pkg_check_modules(VTE REQUIRED vte-2.91) + + OPTION(TEST_BUILD "Build with native testing" ON) + +@@ -44,14 +45,6 @@ + ) + endif() + +-ExternalProject_Add(Vte-0.29 +- SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1 +- CONFIGURE_COMMAND ./configure --enable-static +- BUILD_COMMAND make +- INSTALL_COMMAND "" +- BUILD_IN_SOURCE 1 +- ) +- + ExternalProject_Add(zssh-1.5c + SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/zssh-1.5c + CONFIGURE_COMMAND ./configure +@@ -79,7 +72,7 @@ + ${RSVG_INCLUDE_DIRS} + ${JsonGlib_INCLUDE_DIRS} + ${LIBSECRET_INCLUDE_DIRS} +- ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src ++ ${VTE_INCLUDE_DIRS} + ) + find_library(VTE_LIB NAMES libvte-2.91.a tcmalloc_minimal) + include_directories(${INCLUDE_PATHS}) +@@ -96,6 +89,7 @@ + ${XTST_LIBRARIES} + ${FONTCONFIG_LIBRARY} + ${M_LIBRARIES} ++ ${VTE_LIBRARIES} + stdc++ + m + z +@@ -137,8 +131,7 @@ + librsvg-2.0 + ) + add_executable(${target} ${VALA_C} ${CMAKE_SOURCE_DIR}/project_path.c ${CMAKE_SOURCE_DIR}/lib/font.c) +-target_link_libraries(${target} ${LIBS} ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src/.libs/libvte-2.91.a) +-add_dependencies(${target} Vte-0.29) ++target_link_libraries(${target} ${LIBS}) + + FILE(GLOB children LIST_DIRECTORIES true po/*) + SET(dirlist "") diff --git a/srcpkgs/deepin-terminal/template b/srcpkgs/deepin-terminal/template new file mode 100644 index 00000000000..c9e7ba73601 --- /dev/null +++ b/srcpkgs/deepin-terminal/template @@ -0,0 +1,18 @@ +# Template file for 'deepin-terminal' +pkgname=deepin-terminal +version=3.0.0 +revision=1 +build_style=cmake +configure_args="-DTEST_BUILD=OFF" +hostmakedepends="glib-devel gobject-introspection gperf intltool pkg-config + vala" +makedepends="json-glib-devel libgee08-devel librsvg-devel libsecret-devel + libwnck-devel vala-devel vte3-devel glib-devel gdk-pixbuf-devel" +depends="deepin-menu expect" +short_desc="Deepin Terminal" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-terminal" +distfiles="https://github.com/linuxdeepin/deepin-terminal/archive/${version}.tar.gz" +checksum=a01b2a8679523916586eff30ea4768ee6f1e2094826513971d2ef00db0471460 +nocross=yes diff --git a/srcpkgs/deepin-voice-recorder/template b/srcpkgs/deepin-voice-recorder/template new file mode 100644 index 00000000000..8925962aaa6 --- /dev/null +++ b/srcpkgs/deepin-voice-recorder/template @@ -0,0 +1,19 @@ +# Template file for 'deepin-voice-recorder' +pkgname=deepin-voice-recorder +version=1.3.7 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="qt5-multimedia-devel dtkwidget-devel ffmpeg-devel pulseaudio-devel" +depends="qt5integration gst-plugins-good1" +short_desc="Deepin voice recorder" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-voice-recorder/" +changelog="https://raw.githubusercontent.com/linuxdeepin/deepin-voice-recorder/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-voice-recorder/archive/${version}.tar.gz" +checksum=c5abf504ec67e379cd9a54a36104812e19f7dcf3ff1ac737468ac322407e1de0 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-multimedia-devel" +fi diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 3618b039b1c..4665e1b8ec4 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,19 +1,19 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=7.0.2 +version=7.0.6 revision=1 -lib32disabled=yes build_style=configure configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run" hostmakedepends="ntp pkg-config" makedepends="eudev-libudev-devel" -conf_files="/etc/dhcpcd.conf" short_desc="RFC2131 compliant DHCP client" maintainer="Juan RP " license="BSD-2-Clause" -homepage="http://roy.marples.name/projects/dhcpcd" -distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" -checksum=c52bfae93d327004081a33e867dec50ea580e0d399bbfd662978bfd73c84f405 +homepage="https://roy.marples.name/projects/dhcpcd" +distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" +checksum=727aa7ca972ab45ccad9238ae102604cca94ada87989305d04d81196d78ac341 +lib32disabled=yes +conf_files=/etc/dhcpcd.conf pre_install() { # make wpa_supplicant log to syslog rather than stdout diff --git a/srcpkgs/dht-node/template b/srcpkgs/dht-node/template index 50f36aca7b2..8227faf93c0 100644 --- a/srcpkgs/dht-node/template +++ b/srcpkgs/dht-node/template @@ -1,7 +1,7 @@ # Template file for 'dht-node' pkgname=dht-node -version=0.1.0 -revision=8 +version=0.2.0 +revision=1 build_style=go go_import_path="github.com/ipfs/dht-node" go_build_tags="netgo" @@ -11,8 +11,7 @@ maintainer="lemmi " license="MIT" homepage="http://github.com/ipfs/dht-node" distfiles="https://github.com/ipfs/dht-node/archive/v${version}.tar.gz" -checksum=2f6fd9091d5727fdba5c9defa2a57b27c723cdad732e24580d79635f86b84575 -broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9017/steps/shell_3/logs/stdio" +checksum=06ce87dc4c62b0f960eaa7e0d3c2d1adc1c5335361391faa5c7587bc2e4b59c1 post_install() { vlicense LICENSE diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template index 7cb81f3703b..2e81206cee6 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -1,19 +1,19 @@ # Template file for 'dialog' pkgname=dialog _distver=1.3 -_date=20171209 -version=${_distver}.${_date} +_date=20180621 +version="${_distver}.${_date}" revision=1 -wrksrc=${pkgname}-${_distver}-${_date} +wrksrc="${pkgname}-${_distver}-${_date}" build_style=gnu-configure configure_args="--with-ncursesw --disable-nls" makedepends="ncurses-devel" short_desc="A tool to display dialog boxes from shell scripts" -maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://invisible-island.net/dialog/" -distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${_distver}-${_date}.tgz" -checksum=20139442119e2eff5c35236e8e5e313c901539008d9cccf8c8ab3851b41267e6 +maintainer="maxice8 " +license="LGPL-2.1-only" +homepage="https://invisible-island.net/dialog/" +distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz" +checksum=4a4859e2b22d24e46c1a529b5a5605b95503aa04da4432f7bbd713e3e867587a post_install() { rm -r ${DESTDIR}/usr/lib diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template index 05f4acbed21..edace42d2a4 100644 --- a/srcpkgs/direnv/template +++ b/srcpkgs/direnv/template @@ -1,16 +1,16 @@ # Template file for 'direnv' pkgname=direnv -version=2.16.0 +version=2.17.0 revision=1 build_style=go -go_import_path="github.com/direnv/direnv" +go_import_path=github.com/direnv/direnv short_desc="An environment switcher for the shell" maintainer="Diogo Leal " license="MIT" homepage="https://direnv.net/" -#changelog="https://raw.githubusercontent.com/direnv/direnv/master/CHANGELOG.md" +changelog="https://raw.githubusercontent.com/direnv/direnv/master/CHANGELOG.md" distfiles="https://github.com/direnv/direnv/archive/v${version}.tar.gz" -checksum=a17eb4e3ba7600699541a0ac1d7e820b6faf1f2dcda02f791f6e69548d7bb0aa +checksum=1402cfbd9988cfe86d0ded47bd9732a061581f04bdb6275f156d8654e4d09a3a post_install() { vlicense LICENSE.md diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template index fe4ef716e9d..ae28bc622e0 100644 --- a/srcpkgs/discord-ptb/template +++ b/srcpkgs/discord-ptb/template @@ -1,6 +1,6 @@ # Template file for 'discord-ptb' pkgname="discord-ptb" -version=0.0.8 +version=0.0.9 revision=1 wrksrc="DiscordPTB" depends="alsa-lib dbus-glib gtk+3 GConf libnotify nss libXtst libcxx libatomic" @@ -13,7 +13,7 @@ maintainer="Abel Graham " license="proprietary" homepage="https://discordapp.com/" distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz" -checksum=81db9f2b39c980cdc2537831c3bbd60aba615f423b76d9eed0788459f99e6bd2 +checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520 do_install() { local package_location="usr/lib/$pkgname" item diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template index ea16b4c03c0..b000cc7ab9c 100644 --- a/srcpkgs/dislocker/template +++ b/srcpkgs/dislocker/template @@ -1,7 +1,7 @@ # Template file for 'dislocker' pkgname=dislocker version=0.7.1 -revision=3 +revision=4 build_style=cmake configure_args="-DLIB_INSTALL_DIR=lib" makedepends="mbedtls-devel fuse-devel" diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template index dcfbeeb55fb..0adbac5de18 100644 --- a/srcpkgs/dispcalGUI/template +++ b/srcpkgs/dispcalGUI/template @@ -1,6 +1,6 @@ # Template file for 'dispcalGUI' pkgname=dispcalGUI -version=3.5.3.0 +version=3.6.0.0 revision=1 _name="DisplayCAL" wrksrc="${_name}-${version}" @@ -14,7 +14,7 @@ maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://displaycal.net/" distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz" -checksum=a0a960fadb8cd1cf8e0c776a186a858ad71a0ce04ad97ae302227d207f93b358 +checksum=6ff81011f8d4f28ea25dc3d2d61dd216d4670e4637172f87e9e3c74c1a471a1c pre_configure() { sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template index bb2f02503d6..2c5d2684137 100644 --- a/srcpkgs/dnscrypt-proxy/template +++ b/srcpkgs/dnscrypt-proxy/template @@ -1,19 +1,20 @@ # Template file for 'dnscrypt-proxy' pkgname=dnscrypt-proxy -version=2.0.14 +version=2.0.15 revision=1 build_style=go short_desc="DNS proxy that encrypts queries" -go_import_path="github.com/jedisct1/dnscrypt-proxy" +go_import_path=github.com/jedisct1/dnscrypt-proxy go_package="${go_import_path}/dnscrypt-proxy" maintainer="Juan RP " license="ISC" homepage="https://github.com/jedisct1/dnscrypt-proxy" -#changelog="https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/ChangeLog" +changelog="https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/ChangeLog" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=291541c0a5c24189c4d76349ac2685823aaed808d02afd608cfc69c80f452d9d +checksum=84c9d94776422b539a2473e586e0cd4d3c65b059a1ec0531e916ebb1d44cce60 conf_files="/etc/dnscrypt-proxy.toml" system_accounts="dnscrypt_proxy" +make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy" post_install() { vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index ff44d981650..ac48185ec1e 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,13 +1,13 @@ # Template file for 'docker' pkgname=docker version=18.05.0 -revision=2 +revision=3 _subversion='-ce' _version="$version$_subversion" wrksrc="$pkgname$_subversion-$_version" -build_wrksrc="components/engine" +build_wrksrc=components/engine hostmakedepends="git go pkg-config curl cmake" -makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel libapparmor-devel" +makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel $(vopt_if apparmor libapparmor-devel)" short_desc="Pack, ship and run any application as a lightweight container" maintainer="Andrea Brancaleoni " license="Apache-2.0" @@ -25,8 +25,15 @@ system_groups="docker" _docker_components="runc containerd tini proxy dockercli" +build_options="apparmor" +desc_option_apparmor="apparmor linux kernel security module support" +case "$XBPS_TARGET_MACHINE" in + *-musl) ;; + *) build_options_default="apparmor" +esac + do_build() { - AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v$_version \ + AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp $(vopt_if apparmor apparmor)' DOCKER_GITCOMMIT=v$_version \ hack/make.sh dynbinary } diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 9a485476b1e..92fb92583af 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=11 +revision=12 wrksrc="dolphin-${version}" build_style=cmake nopie=yes diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch new file mode 100644 index 00000000000..dd9362162c0 --- /dev/null +++ b/srcpkgs/dracut/patches/force_poweroff.patch @@ -0,0 +1,19 @@ +diff --git modules.d/99base/dracut-lib.sh modules.d/99base/dracut-lib.sh +index 99cb9dbc..3df77257 100755 +--- modules.d/99base/dracut-lib.sh ++++ modules.d/99base/dracut-lib.sh +@@ -1154,11 +1154,11 @@ emergency_shell() + + case "$_emergency_action" in + reboot) +- reboot || exit 1;; ++ reboot -f || exit 1;; + poweroff) +- poweroff || exit 1;; ++ poweroff -f || exit 1;; + halt) +- halt || exit 1;; ++ halt -f || exit 1;; + esac + } + diff --git a/srcpkgs/dragon/template b/srcpkgs/dragon/template new file mode 100644 index 00000000000..2704ed83374 --- /dev/null +++ b/srcpkgs/dragon/template @@ -0,0 +1,18 @@ +# Template file for 'dragon' +pkgname=dragon +version=1.0.0 +revision=1 +build_style=gnu-makefile +hostmakedepends="pkg-config" +makedepends="gtk+3-devel" +short_desc="Simple drag-and-drop source/sink for X" +maintainer="Daniel Lewan " +license="GPL-3.0-or-later" +homepage="https://github.com/mwh/${pkgname}" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=484ca4bd56c35fa504cda2aa56fb5e904fd7934496c051026640ea79f6463655 + +do_install() { + vbin dragon + vdoc README +} diff --git a/srcpkgs/dtkcore-devel b/srcpkgs/dtkcore-devel new file mode 120000 index 00000000000..40e0fc1af19 --- /dev/null +++ b/srcpkgs/dtkcore-devel @@ -0,0 +1 @@ +dtkcore \ No newline at end of file diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template new file mode 100644 index 00000000000..bec1e1230f7 --- /dev/null +++ b/srcpkgs/dtkcore/template @@ -0,0 +1,32 @@ +# Template file for 'dtkcore' +pkgname=dtkcore +version=2.0.8.1 +revision=1 +build_style=qmake +configure_args="LIB_INSTALL_DIR=/usr/lib/" +hostmakedepends="qt5-qmake pkg-config" +makedepends="qt5-devel gsettings-qt-devel" +short_desc="Base devlopment tool of all C++/Qt work on Deepin" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/dtkcore" +changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz" +checksum=af40389f2865c9eb9cfabbef1a895bcc4be5a74e68f87815dd263bb4f9052c16 + +if [ "$CROSS_BUILD" ];then + hostmakedepends+=" qt5-devel gsettings-qt-devel" +fi + +dtkcore-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/qt5 + vmove usr/lib/pkgconfig + vmove usr/lib/dtk2 + vmove usr/lib/cmake + } +} diff --git a/srcpkgs/dtkwidget-devel b/srcpkgs/dtkwidget-devel new file mode 120000 index 00000000000..beb56e0f1db --- /dev/null +++ b/srcpkgs/dtkwidget-devel @@ -0,0 +1 @@ +dtkwidget \ No newline at end of file diff --git a/srcpkgs/dtkwidget/patches/01.patch b/srcpkgs/dtkwidget/patches/01.patch new file mode 100644 index 00000000000..d8d0398367f --- /dev/null +++ b/srcpkgs/dtkwidget/patches/01.patch @@ -0,0 +1,323 @@ +diff --git a/debian/libdtkwidget2.symbols debian/libdtkwidget2.symbols +index b801671..fbd6bca 100644 +--- a/debian/libdtkwidget2.symbols ++++ debian/libdtkwidget2.symbols +@@ -1373,12 +1373,10 @@ libdtkwidget.so.2 libdtkwidget2 #MINVER# + _ZN3Dtk6Widget14DTabBarPrivate11makeVisibleEi@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate11qt_metacastEPKc@Base 2.0.7.2 +- _ZN3Dtk6Widget14DTabBarPrivate11resizeEventEP12QResizeEvent@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate11tabInsertedEi@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate13dragMoveEventEP14QDragMoveEvent@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate13layoutWidgetsEi@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate13startTabFlashEv@Base 2.0.7.2 +- _ZN3Dtk6Widget14DTabBarPrivate13updateTabSizeEv@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate14autoScrollTabsERK6QPoint@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate14dragEnterEventEP15QDragEnterEvent@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate14dragLeaveEventEP15QDragLeaveEvent@Base 2.0.7.2 +@@ -3721,7 +3719,6 @@ libdtkwidget.so.2 libdtkwidget2 #MINVER# + _ZNK3Dtk6Widget14DTabBarPrivate11tabSizeHintEi@Base 2.0.7.2 + _ZNK3Dtk6Widget14DTabBarPrivate15initStyleOptionEP15QStyleOptionTabi@Base 2.0.7.2 + _ZNK3Dtk6Widget14DTabBarPrivate15minimumSizeHintEv@Base 2.0.7.2 +- _ZNK3Dtk6Widget14DTabBarPrivate18maximumTabSizeHintEi@Base 2.0.7.2 + _ZNK3Dtk6Widget14DTabBarPrivate18minimumTabSizeHintEi@Base 2.0.7.2 + _ZNK3Dtk6Widget14DWaterProgress10metaObjectEv@Base 2.0.7.2 + _ZNK3Dtk6Widget14DWaterProgress5valueEv@Base 2.0.7.2 +diff --git a/src/widgets/dtabbar.cpp src/widgets/dtabbar.cpp +index 28ff328..7d1173b 100644 +--- a/src/widgets/dtabbar.cpp ++++ src/widgets/dtabbar.cpp +@@ -24,7 +24,6 @@ + #include "dthememanager.h" + + #include +-#include + #include + #include + #include +@@ -44,6 +43,8 @@ + #undef private + #undef protected + ++#include "dapplication.h" ++ + DWIDGET_BEGIN_NAMESPACE + + inline static bool verticalTabs(QTabBar::Shape shape) +@@ -230,11 +231,9 @@ class DTabBarPrivate : public QTabBar, public DObjectPrivate + void dragMoveEvent(QDragMoveEvent *e) override; + void dropEvent(QDropEvent *e) override; + void showEvent(QShowEvent *e) override; +- void resizeEvent(QResizeEvent *e) override; + + QSize tabSizeHint(int index) const override; + QSize minimumTabSizeHint(int index) const override; +- virtual QSize maximumTabSizeHint(int index) const; + + void tabInserted(int index) override; + void tabRemoved(int index) override; +@@ -258,7 +257,6 @@ class DTabBarPrivate : public QTabBar, public DObjectPrivate + void stopAutoScrollTabs(); + void ensureScrollTabsAnimation(); + +- void updateTabSize(); + void startTabFlash(); + + void setDragingFromOther(bool v); +@@ -737,28 +735,6 @@ void DTabBarPrivate::ensureScrollTabsAnimation() + }); + } + +-void DTabBarPrivate::updateTabSize() +-{ +- QTabBarPrivate *d = reinterpret_cast(qGetPtrHelper(d_ptr)); +- +- bool is_vertical = verticalTabs(d->shape); +- +- for (int i = 0; i < d->tabList.count(); ++i) { +- QTabBarPrivate::Tab &tab = d->tabList[i]; +- const QSize &size_hint = tabSizeHint(i); +- const QSize old_size = tab.rect.size(); +- +- if (is_vertical) { +- tab.rect.setWidth(qMax(size_hint.width(), width())); +- } else { +- tab.rect.setHeight(qMax(size_hint.height(), height())); +- } +- +- if (tab.rect.size() != old_size) +- layoutTab(i); +- } +-} +- + void DTabBarPrivate::startTabFlash() + { + QVariantAnimation *animation = new QVariantAnimation(this); +@@ -1202,27 +1178,27 @@ void DTabBarPrivate::showEvent(QShowEvent *e) + QTabBar::showEvent(e); + } + +-void DTabBarPrivate::resizeEvent(QResizeEvent *e) ++QSize DTabBarPrivate::tabSizeHint(int index) const + { +- updateTabSize(); ++ D_QC(DTabBar); ++ ++ if (qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1)) ++ return q->tabSizeHint(index); + +- QTabBar::resizeEvent(e); ++ return q->DTabBar::tabSizeHint(index); + } + +-QSize DTabBarPrivate::tabSizeHint(int index) const ++QSize DTabBarPrivate::minimumTabSizeHint(int index) const + { + D_QC(DTabBar); + +- QSize size = QTabBar::tabSizeHint(index); +- +- if (index >= tabMaximumSize.count()) +- return size; ++ const QSize &min = qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1) ? q->minimumTabSizeHint(index) : q->DTabBar::minimumTabSizeHint(index); + +- const QSize &min = tabMinimumSize.at(index); +- const QSize &max = tabMaximumSize.at(index); ++ if (min.isValid()) ++ return min; + +- size.setWidth(qMax(size.width(), min.width())); +- size.setHeight(qMax(size.height(), min.height())); ++ QSize size = QTabBar::tabSizeHint(index); ++ const QSize &max = qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1) ? q->maximumTabSizeHint(index) : q->DTabBar::maximumTabSizeHint(index); + + if (max.isValid()) { + size.setWidth(qMin(size.width(), max.width())); +@@ -1232,47 +1208,34 @@ QSize DTabBarPrivate::tabSizeHint(int index) const + return size; + } + +-QSize DTabBarPrivate::minimumTabSizeHint(int index) const +-{ +- const QSize &min = tabMinimumSize.value(index); +- +- if (min.isValid()) +- return min; +- +- return QTabBar::minimumTabSizeHint(index); +-} +- +-QSize DTabBarPrivate::maximumTabSizeHint(int index) const +-{ +- const QSize &max = tabMaximumSize.value(index); +- +- if (max.isValid()) +- return max; +- +- return QTabBar::tabSizeHint(index); +-} +- + void DTabBarPrivate::tabInserted(int index) + { +- tabMaximumSize.insert(index, QSize()); +- tabMinimumSize.insert(index, QSize()); ++ D_Q(DTabBar); + +- QTabBar::tabInserted(index); ++ if (qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1)) ++ q->tabInserted(index); ++ else ++ q->DTabBar::tabInserted(index); + } + + void DTabBarPrivate::tabRemoved(int index) + { +- tabMaximumSize.removeAt(index); +- tabMinimumSize.removeAt(index); ++ D_Q(DTabBar); + +- QTabBar::tabInserted(index); ++ if (qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1)) ++ q->tabRemoved(index); ++ else ++ q->DTabBar::tabRemoved(index); + } + + void DTabBarPrivate::tabLayoutChange() + { +- updateTabSize(); ++ D_Q(DTabBar); + +- QTabBar::tabLayoutChange(); ++ if (qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1)) ++ q->tabLayoutChange(); ++ else ++ q->DTabBar::tabLayoutChange(); + } + + void DTabBarPrivate::initStyleOption(QStyleOptionTab *option, int tabIndex) const +@@ -1296,14 +1259,28 @@ void DTabBar::setTabMinimumSize(int index, const QSize &size) + { + D_D(DTabBar); + ++ if (d->tabMinimumSize.at(index) == size) ++ return; ++ + d->tabMinimumSize[index] = size; ++ ++ QTabBarPrivate *dd = reinterpret_cast(qGetPtrHelper(d->d_ptr)); ++ ++ dd->layoutDirty = true; + } + + void DTabBar::setTabMaximumSize(int index, const QSize &size) + { + D_D(DTabBar); + ++ if (d->tabMaximumSize.at(index) == size) ++ return; ++ + d->tabMaximumSize[index] = size; ++ ++ QTabBarPrivate *dd = reinterpret_cast(qGetPtrHelper(d->d_ptr)); ++ ++ dd->layoutDirty = true; + } + + bool DTabBar::visibleAddButton() const +@@ -1865,6 +1842,76 @@ void DTabBar::insertFromMimeDataOnDragEnter(int index, const QMimeData *source) + startTabFlash(insertTab(index, source->text())); + } + ++void DTabBar::tabInserted(int index) ++{ ++ D_D(DTabBar); ++ ++ d->tabMaximumSize.insert(index, QSize()); ++ d->tabMinimumSize.insert(index, QSize()); ++ ++ d->QTabBar::tabInserted(index); ++} ++ ++void DTabBar::tabLayoutChange() ++{ ++ D_D(DTabBar); ++ ++ d->QTabBar::tabLayoutChange(); ++} ++ ++void DTabBar::tabRemoved(int index) ++{ ++ D_D(DTabBar); ++ ++ d->tabMaximumSize.removeAt(index); ++ d->tabMinimumSize.removeAt(index); ++ ++ d->QTabBar::tabRemoved(index); ++} ++ ++QSize DTabBar::tabSizeHint(int index) const ++{ ++ D_DC(DTabBar); ++ ++ QSize size = d->QTabBar::tabSizeHint(index); ++ ++ QTabBarPrivate *dd = reinterpret_cast(qGetPtrHelper(d->d_ptr)); ++ bool is_vertical = verticalTabs(dd->shape); ++ ++ if (is_vertical) { ++ size.setWidth(qMax(size.width(), d->width())); ++ } else { ++ size.setHeight(qMax(size.height(), d->height())); ++ } ++ ++ const QSize &min = qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1) ? minimumTabSizeHint(index) : DTabBar::minimumTabSizeHint(index); ++ const QSize &max = qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1) ? maximumTabSizeHint(index) : DTabBar::maximumTabSizeHint(index); ++ ++ size.setWidth(qMax(size.width(), min.width())); ++ size.setHeight(qMax(size.height(), min.height())); ++ ++ if (max.isValid()) { ++ size.setWidth(qMin(size.width(), max.width())); ++ size.setHeight(qMin(size.height(), max.height())); ++ } ++ ++ return size; ++} ++ ++QSize DTabBar::minimumTabSizeHint(int index) const ++{ ++ D_DC(DTabBar); ++ ++ return d->tabMinimumSize.value(index); ++} ++ ++QSize DTabBar::maximumTabSizeHint(int index) const ++{ ++ D_DC(DTabBar); ++ ++ return d->tabMaximumSize.value(index); ++} ++ + DTabBarPrivate *DTabBar::d_func() + { + return dynamic_cast(d_d_ptr.data()); +diff --git a/src/widgets/dtabbar.h src/widgets/dtabbar.h +index 16b71f1..aca8eb8 100644 +--- a/src/widgets/dtabbar.h ++++ src/widgets/dtabbar.h +@@ -195,6 +195,14 @@ public Q_SLOTS: + virtual void insertFromMimeData(int index, const QMimeData *source); + virtual void insertFromMimeDataOnDragEnter(int index, const QMimeData *source); + ++ virtual void tabInserted(int index); ++ virtual void tabLayoutChange(); ++ virtual void tabRemoved(int index); ++ ++ virtual QSize tabSizeHint(int index) const; ++ virtual QSize minimumTabSizeHint(int index) const; ++ virtual QSize maximumTabSizeHint(int index) const; ++ + private: + DTabBarPrivate* d_func(); + const DTabBarPrivate* d_func() const; diff --git a/srcpkgs/dtkwidget/patches/02.patch b/srcpkgs/dtkwidget/patches/02.patch new file mode 100644 index 00000000000..f43993e0545 --- /dev/null +++ b/srcpkgs/dtkwidget/patches/02.patch @@ -0,0 +1,35 @@ +diff --git a/src/widgets/dtabbar.cpp src/widgets/dtabbar.cpp +index 7d1173b..d034c69 100644 +--- a/src/widgets/dtabbar.cpp ++++ src/widgets/dtabbar.cpp +@@ -1850,6 +1850,8 @@ void DTabBar::tabInserted(int index) + d->tabMinimumSize.insert(index, QSize()); + + d->QTabBar::tabInserted(index); ++ ++ Q_EMIT tabIsInserted(index); + } + + void DTabBar::tabLayoutChange() +@@ -1867,6 +1869,8 @@ void DTabBar::tabRemoved(int index) + d->tabMinimumSize.removeAt(index); + + d->QTabBar::tabRemoved(index); ++ ++ Q_EMIT tabIsRemoved(index); + } + + QSize DTabBar::tabSizeHint(int index) const +diff --git a/src/widgets/dtabbar.h src/widgets/dtabbar.h +index aca8eb8..f560ede 100644 +--- a/src/widgets/dtabbar.h ++++ src/widgets/dtabbar.h +@@ -158,6 +158,8 @@ class DTabBar : public QWidget, public DObject + void currentChanged(int index); + void tabCloseRequested(int index); + void tabMoved(int from, int to); ++ void tabIsInserted(int index); ++ void tabIsRemoved(int index); + void tabBarClicked(int index); + void tabBarDoubleClicked(int index); + void tabAddRequested(); diff --git a/srcpkgs/dtkwidget/patches/03.patch b/srcpkgs/dtkwidget/patches/03.patch new file mode 100644 index 00000000000..c7efcfaef58 --- /dev/null +++ b/srcpkgs/dtkwidget/patches/03.patch @@ -0,0 +1,13 @@ +diff --git a/src/widgets/dtabbar.cpp src/widgets/dtabbar.cpp +index d034c69..479bb39 100644 +--- a/src/widgets/dtabbar.cpp ++++ src/widgets/dtabbar.cpp +@@ -1757,6 +1757,8 @@ void DTabBar::dropEvent(QDropEvent *e) + Q_UNUSED(blocker) + d->removeTab(d->ghostTabIndex); + } ++ Q_EMIT tabIsRemoved(d->ghostTabIndex); ++ + insertFromMimeData(d->ghostTabIndex, e->mimeData()); + d->ghostTabIndex = -1; + } else { diff --git a/srcpkgs/dtkwidget/template b/srcpkgs/dtkwidget/template new file mode 100644 index 00000000000..483efbf4719 --- /dev/null +++ b/srcpkgs/dtkwidget/template @@ -0,0 +1,35 @@ +# Template file for 'dtkwidget' +pkgname=dtkwidget +version=2.0.8.1 +revision=2 +build_style=qmake +configure_args="DBUS_VERSION_0_4_2=YES LIB_INSTALL_DIR=/usr/lib" +hostmakedepends="pkg-config qt5-host-tools qt5-qmake" +makedepends="dde-qt-dbus-factory-devel dtkcore-devel gsettings-qt-devel + librsvg-devel pulseaudio-devel qt5-multimedia-devel qt5-svg-devel + qt5-x11extras-devel startup-notification-devel xcb-util-devel" +short_desc="Deepin Tool Kit Widget" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/dtkwidget" +changelog="https://github.com/linuxdeepin/dtkwidget/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/dtkwidget/archive/${version}.tar.gz" +checksum=99d9498da5f74ce56812abfdd8dda1f995e8e83a2530e8a0b711811732fc0df6 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" dtkcore-devel qt5-multimedia-devel qt5-x11extras-devel + qt5-svg-devel gsettings-qt-devel" +fi + +dtkwidget-devel_package() { + depends="${sourcepkg}>=${version}_${revision} dtkcore-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/cmake + vmove usr/lib/qt5/mkspecs + vmove usr/lib/dtk2 + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/dtkwm-devel b/srcpkgs/dtkwm-devel new file mode 120000 index 00000000000..637eb3a2837 --- /dev/null +++ b/srcpkgs/dtkwm-devel @@ -0,0 +1 @@ +dtkwm \ No newline at end of file diff --git a/srcpkgs/dtkwm/template b/srcpkgs/dtkwm/template new file mode 100644 index 00000000000..52ef6a51105 --- /dev/null +++ b/srcpkgs/dtkwm/template @@ -0,0 +1,31 @@ +# Template file for 'dtkwm' +pkgname=dtkwm +version=2.0.8.1 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="qt5-devel qt5-x11extras-devel qt5-multimedia-devel xcb-util-devel + dtkcore-devel" +short_desc="Deepin graphical user interface library" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/dtkwm/" +changelog="https://github.com/linuxdeepin/dtkwm/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/dtkwm/archive/${version}.tar.gz" +checksum=01dad4a28d4d1072c649e694582c1b2d6137736c0ca80a2439d7f4724bdb7c8d + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" dtkcore-devel qt5-x11extras-devel" +fi + +dtkwm-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/qt5 + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template index edf65d9c073..1b40b1b3c96 100644 --- a/srcpkgs/edbrowse/template +++ b/srcpkgs/edbrowse/template @@ -1,9 +1,9 @@ # Template file for 'edbrowse' pkgname=edbrowse -version=3.7.3 +version=3.7.4 revision=1 hostmakedepends="perl pkg-config" -build_style="cmake" +build_style=cmake makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel readline-devel" short_desc="Line-oriented text editor, web browser and mail client similar to ed(1)" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="http://edbrowse.org/" distfiles="https://github.com/CMB/${pkgname}/archive/v${version}.tar.gz" -checksum=ae7717c4c30297a01185ae2705fd55a7cd5f5484db05d5dfc02b7932b5766498 +checksum=b79e6417c1170c96ef68968c33d585725f0f2d27859e3fe807c980a9c33ea719 do_install() { vbin build/edbrowse diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template index 9fe91719b60..f358466378a 100644 --- a/srcpkgs/efibootmgr/template +++ b/srcpkgs/efibootmgr/template @@ -1,7 +1,7 @@ # Template file for 'efibootmgr' pkgname=efibootmgr -version=15 -revision=2 +version=16 +revision=1 hostmakedepends="pkg-config" makedepends="libefivar-devel zlib-devel pciutils-devel popt-devel" short_desc="Tool to modify UEFI Firmware Boot Manager Variables" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://github.com/rhinstaller/efibootmgr" distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/${version}/${pkgname}-${version}.tar.bz2" -checksum=2081add77eb0641805386acd0a0fbbe6dbfb71831b814507ef49087f748333f9 +checksum=950795fb4b58a09fb69e93c120d624000253f1241134469495c7a9def731f65f only_for_archs="i686 i686-musl x86_64 x86_64-musl" conf_files="/etc/default/efibootmgr-kernel-hook" @@ -25,12 +25,14 @@ esac do_build() { make EXTRA_CFLAGS="$CFLAGS" ${makejobs} EFIDIR="void" EFI_LOADER="${EFI_LOADER}" } + do_install() { vbin src/efibootdump vman src/efibootdump.8 vbin src/efibootmgr vman src/efibootmgr.8 } + post_install() { vlicense COPYING vmkdir etc/ diff --git a/srcpkgs/efivar/template b/srcpkgs/efivar/template index 9880734fd0c..b81baa65a18 100644 --- a/srcpkgs/efivar/template +++ b/srcpkgs/efivar/template @@ -1,19 +1,22 @@ # Template file for 'efivar' pkgname=efivar -version=34 +version=36 revision=1 build_style=gnu-makefile -make_build_args="libdir=/usr/lib" -make_build_target="all test" -make_install_args="libdir=/usr/lib" hostmakedepends="pkg-config" short_desc="Tools to manipulate EFI variables" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://github.com/rhinstaller/efivar" -only_for_archs="i686 i686-musl x86_64 x86_64-musl" distfiles="https://github.com/rhboot/efivar/releases/download/${version}/efivar-${version}.tar.bz2" -checksum=1b7e34e728b4b4c294a10734e601212e4c31ce4cf409e27d1d630daa8d0f4325 +checksum=94bfccc20889440978a85f08d5af4619040ee199001b62588d47d676f58c0d33 +make_build_args="libdir=/usr/lib" +make_build_target="all test" +make_install_args="libdir=/usr/lib" + +case "$XBPS_TARGET_MACHINE" in + armv*|mips*|aarch*) broken="unsupported arches for UEFI" ;; +esac CFLAGS="-D_GNU_SOURCE" @@ -31,9 +34,10 @@ libefivar_package() { vmove usr/lib/*.so.* } } + libefivar-devel_package() { short_desc="Library to manipulate EFI variables - development files" - depends="${makedepends} libefivar>=${version}_${revision}" + depends="libefivar-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig diff --git a/srcpkgs/eid-mw-devel b/srcpkgs/eid-mw-devel new file mode 120000 index 00000000000..68de8f472f3 --- /dev/null +++ b/srcpkgs/eid-mw-devel @@ -0,0 +1 @@ +eid-mw/ \ No newline at end of file diff --git a/srcpkgs/eid-mw/patches/musl.patch b/srcpkgs/eid-mw/patches/musl.patch new file mode 100644 index 00000000000..65e11cf6cb3 --- /dev/null +++ b/srcpkgs/eid-mw/patches/musl.patch @@ -0,0 +1,10 @@ +--- cardcomm/pkcs11/src/common/logbase.h.orig ++++ cardcomm/pkcs11/src/common/logbase.h +@@ -88,6 +88,7 @@ + + #ifndef WIN32 + #include ++#include + #endif + + #include diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template new file mode 100644 index 00000000000..54bef65d68e --- /dev/null +++ b/srcpkgs/eid-mw/template @@ -0,0 +1,30 @@ +# Template file for 'eid-mw' +pkgname=eid-mw +version=4.4.2 +revision=1 +wrksrc="${pkgname}-${version}-v${version}" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel" +depends="pcsc-acsccid pcsc-ccid pcsc-tools" +short_desc="Middleware for Belgian eID" +maintainer="Andrew Benson " +license="LGPL-3.0-or-later" +homepage="https://eid.belgium.be/en" +distfiles="https://dist.eid.belgium.be/continuous/sources/${pkgname}-${version}-v${version}.tar.gz" +checksum=b5bcfe8ec965ffb37fdcdb7763ed51497738262a5814260cd6b5e8411d1a501d + +pre_configure() { + sed -i "s%c_rehash%openssl rehash%g" plugins_tools/eid-viewer/Makefile.in +} + +eid-mw-devel_package() { + depends="eid-mw-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} diff --git a/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch b/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch deleted file mode 100644 index ccceb12b1aa..00000000000 --- a/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libdwfl/dwfl_build_id_find_elf.c 2015-10-12 12:22:58.000000000 +0200 -+++ libdwfl/dwfl_build_id_find_elf.c 2015-11-20 05:13:10.972994172 +0100 -@@ -94,7 +94,7 @@ - { - if (*file_name != NULL) - free (*file_name); -- *file_name = canonicalize_file_name (name); -+ *file_name = realpath (name, NULL); - if (*file_name == NULL) - { - *file_name = name; ---- libdwfl/find-debuginfo.c 2015-10-12 12:22:58.000000000 +0200 -+++ libdwfl/find-debuginfo.c 2015-11-20 05:18:56.990967176 +0100 -@@ -372,7 +372,7 @@ - /* If FILE_NAME is a symlink, the debug file might be associated - with the symlink target name instead. */ - -- char *canon = canonicalize_file_name (file_name); -+ char *canon = realpath (file_name, NULL); - if (canon != NULL && strcmp (file_name, canon)) - fd = find_debuginfo_in_path (mod, canon, - debuglink_file, debuglink_crc, diff --git a/srcpkgs/elfutils/patches/musl-qsort_r.patch b/srcpkgs/elfutils/patches/musl-qsort_r.patch index 0f3102dd905..10697d6023a 100644 --- a/srcpkgs/elfutils/patches/musl-qsort_r.patch +++ b/srcpkgs/elfutils/patches/musl-qsort_r.patch @@ -1,7 +1,7 @@ ---- src/readelf.c 2015-10-12 12:22:58.000000000 +0200 -+++ src/readelf.c 2015-11-20 08:11:32.945159213 +0100 -@@ -4366,10 +4366,11 @@ - return base; +--- src/readelf.c ++++ src/readelf.c +@@ -4773,10 +4773,11 @@ listptr_base (struct listptr *p) + return cudie_base (&cu); } +static const char *listptr_name; @@ -14,7 +14,7 @@ struct listptr *p1 = (void *) a; struct listptr *p2 = (void *) b; -@@ -4385,21 +4386,21 @@ +@@ -4792,21 +4793,21 @@ compare_listptr (const void *a, const void *b, void *arg) p1->warned = p2->warned = true; error (0, 0, gettext ("%s %#" PRIx64 " used with different address sizes"), @@ -37,9 +37,18 @@ - name, (uint64_t) p1->offset); + listptr_name, (uint64_t) p1->offset); } + if (p1->attr != p2 ->attr) + { +@@ -4814,7 +4815,7 @@ compare_listptr (const void *a, const void *b, void *arg) + error (0, 0, + gettext ("%s %#" PRIx64 + " used with different attribute %s and %s"), +- name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr), ++ listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr), + dwarf_attr_name (p2->attr)); + } } - -@@ -4464,9 +4465,11 @@ +@@ -4885,9 +4886,11 @@ notice_listptr (enum section_e section, struct listptr_table *table, static void sort_listptr (struct listptr_table *table, const char *name) { diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index e48c0950b92..398496564c6 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,7 +1,7 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.170 -revision=2 +version=0.173 +revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" hostmakedepends="automake libtool" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066 +checksum=b76d8c133f68dad46250f5c223482c8299d454a69430d9aa5c19123345a000ff CFLAGS="-Wno-error" diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template index 60a83e3d7b9..69c54e0fe1b 100644 --- a/srcpkgs/elixir/template +++ b/srcpkgs/elixir/template @@ -1,6 +1,6 @@ # Template file for 'elixir' pkgname=elixir -version=1.6.5 +version=1.6.6 revision=1 build_style=gnu-makefile make_check_target="test" @@ -12,4 +12,4 @@ maintainer="Duncaen " license="Apache-2.0" homepage="http://elixir-lang.org/" distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz" -checksum=defe2bed953ee729addf1121db3fa42a618ef1d6c57a1f489da03b0e7a626e89 +checksum=74507b0646bf485ee3af0e7727e3fdab7123f1c5ecf2187a52a928ad60f93831 diff --git a/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch b/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch deleted file mode 100644 index 3cdfdf061c5..00000000000 --- a/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch +++ /dev/null @@ -1,34 +0,0 @@ -Source: maxice8 -Upstream: https://github.com/elogind/elogind/pull/57 -Reason: add missing FTW_* macros for musl libc based systems - ---- src/shared/musl_missing.h -+++ src/shared/musl_missing.h -@@ -107,6 +107,27 @@ typedef __compar_fn_t comparison_fn_t; - */ - #define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) - -+/* -+ * Missing FTW macros in musl, define them if not defined -+ * taken from -+ * https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch -+ */ -+#ifndef FTW_ACTIONRETVAL -+#define FTW_ACTIONRETVAL 16 -+#endif -+ -+#ifndef FTW_CONTINUE -+#define FTW_CONTINUE 0 -+#endif -+ -+#ifndef FTW_STOP -+#define FTW_STOP 1 -+#endif -+ -+#ifndef FTW_SKIP_SUBTREE -+#define FTW_SKIP_SUBTREE 2 -+#endif -+ - #endif // !defined(__GLIBC__) - - #endif // ELOGIND_BASIC_MUSL_MISSING_H_INCLUDED diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 0a43f62cfdc..1c127002586 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,6 +1,6 @@ # Template file for 'elogind' pkgname=elogind -version=236.1 +version=238.1 revision=1 build_style=meson configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt @@ -15,8 +15,8 @@ short_desc="Standalone logind fork" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/elogind/elogind" -distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=391fdb66d97983827e30e7e518f822c96eadb29d5e54092c3cd348dfb3a7a3b6 +distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" +checksum=b0416c4194198f6af71f5ffb3b3d5d8f20e446acb80699eb4e8df3f79dd18acf conf_files="/etc/elogind/logind.conf" pre_check() { diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template index 4f1534b46f5..af825780138 100644 --- a/srcpkgs/entr/template +++ b/srcpkgs/entr/template @@ -1,6 +1,6 @@ # Template file for 'entr' pkgname=entr -version=4.0 +version=4.1 revision=1 build_style=gnu-makefile short_desc="A utility for running arbitrary commands when files change" @@ -8,7 +8,7 @@ maintainer="Andrea Brancaleoni " license="ISC" homepage="http://entrproject.org" distfiles="$homepage/code/$pkgname-$version.tar.gz" -checksum=4ad4fe9108b179199951cfc78a581a8a69602b073dae59bcae4b810f6e1f6c8b +checksum=c503c93ccffc1e6b2da979cdcb88c5a686e261103501eede7077fa089cdfef78 post_extract() { mv ${XBPS_BUILDDIR}/eradman-entr-* $wrksrc diff --git a/srcpkgs/erlang/patches/fix-libressl.patch b/srcpkgs/erlang/patches/fix-libressl.patch deleted file mode 100644 index 81144bfb4c9..00000000000 --- a/srcpkgs/erlang/patches/fix-libressl.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./otp_src_20.3/lib/crypto/c_src/crypto.c.orig 2018-04-23 18:04:06.652997515 +0200 -+++ ./otp_src_20.3/lib/crypto/c_src/crypto.c 2018-04-23 18:03:47.480968547 +0200 -@@ -102,8 +102,10 @@ - # undef FIPS_SUPPORT - # endif - -+# if LIBRESSL_VERSION_NUMBER < 0x2070000fL - /* LibreSSL wants the 1.0.1 API */ --# define NEED_EVP_COMPATIBILITY_FUNCTIONS -+# define NEED_EVP_COMPATIBILITY_FUNCTIONS -+# endif - #endif - - diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index f5e7c3c54fa..105547f828a 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,7 +1,7 @@ # Template file for 'erlang' pkgname=erlang -version=20.3 -revision=2 +version=21.0 +revision=1 create_wrksrc=yes build_wrksrc=otp_src_${version} build_style=gnu-configure @@ -15,8 +15,8 @@ license="Apache-2.0" homepage="http://www.erlang.org/" distfiles="http://www.erlang.org/download/otp_src_${version}.tar.gz http://www.erlang.org/download/otp_doc_man_${version}.tar.gz" -checksum="4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1 - 17e0b2f94f11576a12526614a906ecad629b8804c25e6c18523f7c4346607112" +checksum="c7d247c0cad2d2e718eaca2e2dff051136a1347a92097abf19ebf65ea2870131 + 10bf0e44b97ee8320c4868d5a4259c49d4d2a74e9c48583735ae0401f010fb31" build_options="x11" diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index 61e34a278c7..c55c2f20abf 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,6 +1,6 @@ # Template file for 'etcd' pkgname=etcd -version=3.3.7 +version=3.3.8 revision=1 build_style=go short_desc="Distributed reliable key-value store" @@ -11,7 +11,7 @@ go_import_path="github.com/coreos/etcd" go_package="${go_import_path} ${go_import_path}/etcdctl" homepage="https://coreos.com/etcd/docs/latest/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=d024defdff1cc2e3679bcd384c00576d8306cef5b9c46efbd7a8612a60f29e47 +checksum=f5bc74dd2de1c567a1a36d797399f20cb764069cb3cf3651a593dd7f8a88c616 conf_files="/etc/sv/etcd/conf" system_accounts="etcd" make_dirs="/var/lib/etcd 0755 etcd etcd" diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template index c1dd11cb77f..f2d85b1b4d0 100644 --- a/srcpkgs/etcetera/template +++ b/srcpkgs/etcetera/template @@ -1,14 +1,14 @@ # Template file for 'etcetera' pkgname=etcetera version=0.5 -revision=1 +revision=2 noarch=yes 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" +homepage="https://gitlab.com/jeancf/etcetera" distfiles="https://github.com/jeancf/etcetera/archive/v${version}.tar.gz" checksum=1cf1df80dabddc9207fa1c44d6d2ac26fe935e084cd6d83ea8d8a7fb4c8b972d conf_files="/etc/etcetera.conf" diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template index 426325397f2..5cd97b8f9c4 100644 --- a/srcpkgs/ethtool/template +++ b/srcpkgs/ethtool/template @@ -1,6 +1,6 @@ # Template file for 'ethtool' pkgname=ethtool -version=4.16 +version=4.17 revision=1 build_style=gnu-configure short_desc="Utility for controlling network drivers and hardware" @@ -8,5 +8,5 @@ maintainer="Juan RP " license="GPL-2.0-only" homepage="http://www.kernel.org/pub/software/network/ethtool/" distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=fe967a6722db2099fa63d847b6628e3e31cf9f53571a37503347dcc3e4015a03 +checksum=c46b1eb417c78793dddb3247b89eb8f50f6e398e12ee4670b092b3570728c585 diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 2ab33acb5f2..e8583aed134 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.2 +version=3.28.3 revision=1 build_style=cmake configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF @@ -13,10 +13,10 @@ depends="$(vopt_if gir libgweather) libsoup-gnome" short_desc="Centralized access to appointments and contacts" 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=531a790182dc6b6b2d0421feb34489c7ddf5cc807e9cffbb87461d13e047f3ab +changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-28/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=437e91f03fe49bf531416d30828e943aa2c74d657aeb44fb637997104a3a5887 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 0dcc10715f7..0a1f3e0d1c7 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,6 +1,6 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.28.2 +version=3.28.3 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -10,6 +10,6 @@ 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=8b495b9b077ba523943377847b6ab670cfe5d3f3d79e9c476c5462c82920b51a +changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-28/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=6c440ea4bd37bc33d31b29b8ff8c6c84fdf473bdb8b587aafa635ebad458df90 diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 5e13d06ea16..c6f953ae2cf 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.28.2 +version=3.28.3 revision=1 build_style=cmake configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF @@ -16,9 +16,9 @@ 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=e444a22d0bdca348b76edb59c7d15935dfa46bf731bf840060dcbada6555a953 +changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-28/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=d374511b7866df399c30458b92ac59a24cd5517c0f3a541d72010bc1eca73be8 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so" diff --git a/srcpkgs/exfat-dkms/template b/srcpkgs/exfat-dkms/template index 6e7df1ebf2f..733d0d28c1a 100644 --- a/srcpkgs/exfat-dkms/template +++ b/srcpkgs/exfat-dkms/template @@ -1,15 +1,15 @@ # Template file for 'exfat-dkms' pkgname=exfat-dkms version=1.2.8 -revision=3 -_commit=de4c760bc9a05ead83bc3ec6eec6cf1fb106f523 -wrksrc=exfat-nofuse-${_commit} +revision=4 +_commit=01c30ad52625a7261e1b0d874553b6ca7af25966 +wrksrc="exfat-nofuse-${_commit}" short_desc="Exfat kernel driver (nofuse)" maintainer="Andrea Brancaleoni " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/dorimanx/exfat-nofuse" -distfiles="$homepage/archive/$_commit.tar.gz" -checksum=789e6f1679dde175e44fa18038bb07bae9c524a1fb7b99da1e5e60a5ea219ccb +distfiles="https://github.com/dorimanx/exfat-nofuse/archive/${_commit}.tar.gz" +checksum=b88a98f0a7e1b987465f5ccfcafb384b293506c7fec9d3b91b803e0fe5b16e0a triggers="dkms" dkms_modules="exfat ${version}" diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 4eacaa062d7..847f8afc848 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=11.02 +version=11.03 revision=1 noarch=yes wrksrc="Image-ExifTool-${version}" @@ -12,6 +12,6 @@ short_desc="Reader and rewriter of EXIF information that supports raw files" maintainer="Juan RP " 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" +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=dd33db39ebd07e0c8849badeafc128a8902b059c4dfb728ee213180b5fba95ba +checksum=dd9663038bc55992f30c316494260eb629601f57c739716ddbbfd5cdf5d167b3 diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template index c8ac4cb9ed6..533bbb36fa4 100644 --- a/srcpkgs/exo/template +++ b/srcpkgs/exo/template @@ -1,19 +1,19 @@ # Template file for 'exo' pkgname=exo -version=0.12.0 +version=0.12.2 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel perl-URI" makedepends="gtk+-devel libxfce4ui-devel" depends="hicolor-icon-theme desktop-file-utils perl-URI" -conf_files="/etc/xdg/xfce4/helpers.rc" short_desc="Extension library for the Xfce desktop environment" maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2" -checksum=64b88271a37d0ec7dca062c7bc61ca323116f7855092ac39698c421a2f30a18f +checksum=6d4b0a88c1e1d3d5ed612cbf012c7511ef67b1636f4f85caa9dc68649b7e6350 +conf_files="/etc/xdg/xfce4/helpers.rc" pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template index 4d0a1665e10..f358ac6d38a 100644 --- a/srcpkgs/extra-cmake-modules/template +++ b/srcpkgs/extra-cmake-modules/template @@ -1,6 +1,6 @@ # Template file for 'extra-cmake-modules' pkgname=extra-cmake-modules -version=5.44.0 +version=5.47.0 revision=1 noarch=yes build_style=cmake @@ -11,8 +11,8 @@ short_desc="Extra modules and scripts for CMake" maintainer="Juan RP " license="BSD-3-Clause" homepage="https://projects.kde.org/projects/kdesupport/extra-cmake-modules" -distfiles="http://download.kde.org/stable/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3a72c3aba988c5e17eef1a805547f2567f5e31cf86676ed0d0761d478ae42f88 +distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 post_install() { vlicense COPYING-CMAKE-SCRIPTS diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 24c19f893b3..de08518884b 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.11.2 -revision=1 +revision=2 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="ruby-devel" diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index c3318ad80b6..254963f0804 100644 --- a/srcpkgs/feh/template +++ b/srcpkgs/feh/template @@ -1,7 +1,10 @@ # Template file for 'feh' pkgname=feh -version=2.26.3 +version=2.27 revision=1 +build_style=gnu-makefile +make_use_env=yes +make_build_args="PREFIX=/usr exif=1 help=1 stat64=1" hostmakedepends="pkg-config" makedepends="giblib-devel libXinerama-devel libXt-devel libcurl-devel libexif-devel libjpeg-turbo-devel" @@ -10,15 +13,14 @@ short_desc="Fast and light imlib2-based image viewer" maintainer="Juan RP " license="MIT-feh" homepage="https://feh.finalrewind.org/" -#changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog" +changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog" distfiles="${homepage}/feh-${version}.tar.bz2" -checksum=3ff3e64db0811e2ff14add77d1aab4ae6d16616f5f78fe54649b49f5aa7f4a21 +checksum=af326845ef7483ecbffde697fdadb39298a68069d79644e249c69c9ad464c64e -do_build() { - make ${makejobs} CC=$CC PREFIX=/usr exif=1 help=1 stat64=1 +pre_build() { + sed -i 's|doc/feh/examples|examples/feh|' config.mk } -do_install() { - make PREFIX=/usr example_dir=${DESTDIR}/usr/share/examples/feh DESTDIR=${DESTDIR} install +post_install() { vlicense COPYING } diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index 9c0b6522054..cf0cd16fbd4 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,6 +1,6 @@ # Template file for 'filezilla' pkgname=filezilla -version=3.33.0 +version=3.34.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck" @@ -12,10 +12,11 @@ short_desc="Fast and reliable FTP, FTPS and SFTP client" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="http://filezilla-project.org/" +changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co" distfiles="https://dl3.cdn.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2" -checksum=f4ab6d4368c0b0c89dd938f823a20164e1ed738fd7389775a899939232570ec1 +checksum=637ea551a442e22d8ee862b0f035077d37ba823a4372e8d0fcbd5b0e378bea80 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-devel xdg-utils" case "$XBPS_TARGET_MACHINE" in armv6*) makedepends+=" libatomic-devel" ;; diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index 9cd4cc954f5..d649f1604e4 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.8.0 +version=52.9.0 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -134,96 +134,95 @@ _pkgtmpl() { } } -checksum=" -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" +checksum="f0430c3a56a450f4bf5c21caf847a279cb19e8a5373939a13f537f8b7bab7367 + e271fa624527ff760878cd420942c704077fecbf723de22d3dd9287a60e076af + 0d58ab44168656d85fc4d2a726ab39f7a79a5e3d161cd21c32b190bbae05e560 + 1658b2782ff9ba538f9215d1214be2d201293739fba29cade86205506465aab4 + bb14fbbd04c85f4ad09c98afe27a8eccfc86b965e269c6599cbb76507e1018d7 + 0a9fb3717235352a72ba21707dc5bf15337e16a7cf16ebe72a9695a238d26648 + 9eb05526f4e3fe539d3c756d617cd50780116bbd87a3eda5817f156c30bfa286 + dabfefa33d774e99047e30fd1ca2bd6049ed98d8ed7f1e70d92573b9c5ec8dd5 + 4ba54f6692543397f7694169dba0568331ef60cb09b9a5b08e8170a7bf6a75fe + 11e44f831003ed4cfb929cbbe7c7a9a80830b9d3e0da29cb2f40e8f042fd6ffb + fe9d9df8b4437d3bb9b160dfef6e908bb88ae99546a6a05691ea68417dd96816 + 8d2074da2ddece656e1b65a957cb1ffc027ce21df62e83acaf57deb37c0481ab + 66a1d3ba08d4324706763eaebbe4b4d60b02fb6710187681100c342d7d4b5ad8 + 324e161c85f2287502e04abab1de88e8b4c0924a30996aa848f859d2d1d556e3 + 8ea19529b0536099bee5ad65799bb422a6e9460fe9670c951e8609eef54133d6 + 0e5f8613768bfa6456b781effb1982bd78f8405c30ee3e763d95ed5cae0de97f + b50c30e90580b0c8bc6871dae8639a01019618caf713c1b8bae32485f0e8b167 + f59ed6f6466815a47ba0e62bee6f589c851f1d6248df0ad0b439e31929e61338 + c8f57aec50a10b6475ef4d06d7c2de794918c1ee17596a80445cf90c1e450082 + c3bcece23d752bc3bb6bf36f135354f6abaa244bdd82a37ebdef2024b97efd65 + 2d0c00c47132e19c470c23758df33d0fa5583efab1a3b5648b18148dded4e7f7 + 55586600fa4bcb6223998639116e47a0ecadde8278fc8db54bfe7f1deecd839b + f76a6b8ccaaffbbeade411976d71176dd598c30a0fc576caef7b8e2140e7e8ea + e81a9b48b0c87944de07a2cb7bb3b1329137f283c5dd0d81b05ed8b5e62e66f0 + 3567cddae4a303042938d2a2d744dade06ab77831816c0f32295cbebe79c75ca + 657225821c9c37fdfe12d09ac561d2702f20b2d17c9141f7e7bbcf7a1d7494e4 + 9b67115c23cebe3e3ce57c3a19dd7a5afaaf98e18e06357c4eace53b4808f302 + 348b9a59d5c621e807c002be4f57f616ed51da2d6e750611bb18da9081a61b42 + 487f6643e335e8a9cec42f14d50140de2f0a3b6d55af87aa123c432fd5f5eda1 + 63aac2681aae850d61b69c0411013ce2ae2c56bc428f174934668a3affd5f3fa + b8799469657e5c39cea9ecb034db50bd0cd28a8ce146d5335a14ba22245291b7 + 2e794d017814967a4a142d53c8d6004d8f15f85d42b1d9d31bef989f1ee147f3 + d8570f7716ad0b1e9fd59dc731f972b0518dd2dcaa1e41014ee6ce1de24795c1 + d57f183a96c7d57502a884458839518b20b183afcf88662c5a3fac4198afa320 + c00ec788d868a77fe1b6fa1532ededef75b1339c803b7b6ba75e5029c0d8a4e9 + 19fd25e53641298c2d726cda6ed60a1bf978813331405b04adecb101213c545b + 14291f4955b8d24f01586c4e2b46ef00cf2b684f83fdb2f62ee4a5eea8fac8a3 + aa5b1ab335018aa7e45ef7274fa37807a4a7999224aa6632a19f18e50a6558d4 + bb5829ca7512341d4d5c395ecfda75e1d8a1f66725032f09533c60bfa7c32efe + b0b7ffdc54d1067f4405f33a568941d738dcc0ad9a045b66fc50ca4e05a25f2d + 5054a5f1071c926290dbffd5820ff19214e22ad6a63662bc93a5c1af885d14e7 + 444a522fdcac5ce9d4901de58fa6e6fa9c5b8a772755c6d1eec120e22aa5c964 + 553bdf6a60bded015ceeef002db99028c9334a4fc2825f9f147ac922f923b1e2 + 4838a040484a5e06e641c05f04f83c3f69b8e6c214e38589e154d53d61e96004 + 2d1a34a83c15f87c05c5be22dd48fd447e1d0772843e4ae3fbd64f17a6660acc + 818c2dbfdc5900391e8aab5d27418bdc88959b66164e0a57890cff5ae56d5b9d + 1c6a6c1c5024a81df3f858ab8038c4228630d9a4eca073cabbe35fb884503ec7 + c85bb05e1e43bb34a469423efd70d4b3d0bd0266d8f851c959687d2ba346f197 + 5b4a5350d9f44cc9535987c50da886b52922402d1d607008239aa289f23f9a34 + aaed4fa95b9f1766f4a2e2537b15554b7a8821d105f27254c4bbb23cef22cb47 + c1aa4b8781925a68975a0e4a7ea419a8c2c8312fc5d81f2b35f5aabfa0a379a5 + 13a4f598164775e3a5fcffcca073460c5760294c54bf8d3b86c4d3e6354bac42 + c07c624b39f030e2b670c7b95df82ce3118af2a46c9a4ce2bd4d24c3405a1104 + 207736a063247eddb70838c1b8101c2b6fa8e4b8fff55447378780af6c2a5646 + ebffd88e898ad8aedefeb15d85628ecc02014ba17578fa01347e536c16eba46a + 465c5cf939297ea1a4b2725ac6b647f084a34000990f0c6bc2e755313c57691a + 8c38efcfb7b55a05c8435a175b08f3f040b9ba670e658b3c010c71aa758242f4 + 74ea5a3e367d775ebd31eeba01650d8d380ac2dc863aa26eafe17e431b0b40be + 107e399c050de243083d4d05a184de9ceb645fba067bd6c97ac6ba692f3cbc9a + 5904ecb6bee710f6a25eb9eb4a70ce3b32cc921545f4d3aae089573a8ced89c7 + 071310d0e7c2b0fdfbdc8f2646660383ec590f933d2f72a6464414976d873b21 + 5da1ac0f791df172435fe6e9dc0f8fed5a54bec5bcc219380718b6dec0739a56 + dd9da1a0f0a33c2fcc6a9a149c97314478d62471c33aec00f0324836b894748a + 76905cf4d180915ab1dd8ce07acc618ee0a8f32e25245aa193a0285c39181ae6 + badc78dfdc174feb0b3c360ff6f087aeac2c00ab177768f5fc3d9db37eb03265 + e87999ef3c49563295fe7229127c5c32b2a1deaed77d142923a1c02f1eacdceb + 65be2e545586bda4c63a4ea17f904cd93e8a5ab69e8f692dfdb03e4348ca22ae + e6d616793b35f5a3ec08eaf21a58fde941f4e704478ad728e754d3b9db6a9df6 + 15705ba576cc09df020e02b5fa1e98039e6438daffaf44ef169dbc3da352eba7 + a3431256dc89be10524babf7243ef48b366348166f8c6f3b33e7ab3dad8f6fa9 + 15b2d810761ea44828d5166588143b631a8341414a35742c2985142260464faa + 7fe472ee9817615a200326c14556281b75a1190b5918725251f6b5b48793979e + 12206fb5285cd7d2b1125a6c372b05591e7beec37bbd05c3e0fafd900af70cfe + 7d7311b5c059d86f5db629d7bb2fdd88232c138f911076f9533d144c139fd2cf + 3baf8d0aa2769c76e548ff41dbd11dea6796ef0a25558c9aa3c9447ad7ba3fd6 + a05cf9bef043afebabf9b7db194706288a3d73eaf1007f4ce6d96a0084b2d441 + ba88eec4cd462d636662529ed5757c359d9a684b3659dfcfc899b5863c07a552 + 99746474185eb6090a3cfc5917166da3a598007f0dd9a4d864483938c2f1786d + 5a9a0ff096f06f5885f0f3b95825fece99c9bffa340d51c2eecf76c6a710e4f9 + 7300854b0367c3569bccba4552f94ab948dbba28e4b407a1919cc509dc6e9224 + ba95f83cd63abf7518e98ec71eed90a47f4fe43e1ce1215ef047663935543d43 + e427833cf0985c680732d5ff6c98e34d0c86caa4ed8363f822bfadc291d24f3f + 66bfb2dcbe11b41207e81e1d259f0a0783dd7425c26f1c97f02df4e275c9d50f + a9be8bbaffbf17dc64ef42de29de38b61b3acf493141de9f462161afc7fbe8ba + 24daaab49e4b71be426ef7276d556edb22fb8c53bb20f684fae1985fedbe2ba4 + 52cc765c308a4f1bc9d99396784da84fd4405c6e571b4911f36f34bc5aa94735 + 43a2b0033269aa6bce8699ef9cff2407fda2cc0ad56b924d0fb110cccbe5125a + 4bc7a88ffa5a025f1eeb2533ede56e1b76259df57cba6bfb30acc82b48ed5a7b + 844dfecaf0156967b6c8ca031e1782f2afbfc7c057d15f3ed47ae3962f0dfca7 + 693a74d9a97667fbd741f5db3ff3ee2648eefddb41fe53b0fb7a91300022d4c1 + 3f77022c3669c5d2c8a728c2027bd515263361cc7722c546662a56e9c63ed788 + b029a2c9828c8f7fa4161bc7d0280ceed8ae23a1fd1f85e8052dfaa288b60bfd" diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 7d5b742eb30..b9cb667b7f8 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". # pkgname=firefox-esr -version=52.8.1 +version=52.9.0 revision=1 wrksrc="firefox-${version}esr" short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)" @@ -11,7 +11,7 @@ maintainer="Eivind Uggedal " homepage="https://www.mozilla.org/firefox/organizations/" license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=487b4b7fe9a4aeb4dfd63991030b5df47d73f7a17ef917ba1036055f0049cf7b +checksum=c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6 lib32disabled=yes hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 32304f861ea..b05611c07c1 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.1 +version=61.0 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -136,97 +136,97 @@ _pkgtmpl() { } } -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" +checksum="81376263077a639a0df7dc4f160354043298590782ea7d70c42a789df50f1a32 + 84340ef11e67bae138d932fdcce967affa5966a0c5ab01f2cc03d6f68298f2aa + 7493be648f7def011e18f6c75290c6def9fac3f3ab4950b4b12b588e212f4a77 + ea4596b8811ae7e7f59f501cb3227232812bd53f3def103ad2bf549cb79d2abb + 4540af01013705c0aea6741a0e213f4874afcb14e34e90a150b19c94e38bfe0a + 6d18813b2e05fe16f66f9f0c82a8e08a3a6fa2890be393c80c301110dd81d800 + e7c42a5364a722e5f6f2351a038ff8c6d70742da71669019810d5537d36f0e39 + 0ebf8acad8a81680c135a3c5e2a323cba2207e13edeff400305e492f2c24fe05 + 4ece264c89c8255c74bf65c6a5d25a44af37609e25cc64217c21179accdeaffc + 8357eee0afe8a67521b2273ef931bf216b06aa3b47add5a11534727080b8cbea + dce2996cd26162637f4f9a7a8bca61e8d4b8499175231da3580a482c66b91b4c + 338862ca53012668fd5da30e81ae15f4f9255731110ef3c844154b71e3e8931b + da9600f62ef968b429a5d437e48f84308ced217516a3b80949e396b09bd155d5 + 2afdf45e104400f8c154aeaef8b6099f06fa1ee00cd77353422b8782c80493d5 + 2dae7c9fbff7b95e02246020518f044c97efdb25264523041fc305bc515dd787 + 859aeb9a8927fb6dbc5a29a91492989bc5a60204fbc3f8f01ad2009f89d636f9 + 6769521271903468ecd9065b418646c32cb36b617b4f628bcbd6d6e72081b879 + da9c71cc15f0fbbb272500aba824ac485fcde321e969b50e533dd71b2c5f89d6 + da95616a965a18506033d090ea51cd5875114523ba66587ea8d9e4ca06182e1a + 4522ccd3e85a2a6c8d823ff598c4d2cf1161ad3e51d15fd93b0a5d114eec5b45 + b87c388daaac4a811a82ff1e1318f4655e9ba80798ba82c00bc5eb813ace1556 + c4dde8f507afcbd75466d1d16049227b5b8889e5713607c728f1ba914b0a808e + ca833b1e4bf09a9876394daa81a49f3b314accd9a0491266beefed7c61479be7 + f703ceee50033cbabaad718fbb0740e569e73f61ddc1df6394a458e084864fb2 + df73ab6175e45dc0b17b735ce299bcb6702b1b61aa3fdf5f37b59394ef171447 + d1724db8da185cad11a8809f3ef77876818eef8ad3231e84018461ef1b874134 + d1cf80c4cf7a1acd1f5cdac6ebb9510e23653370bea12e1db6e5c5e60bb41605 + a0ab6bc595321debd89c552873d02ffbe52da1e2e23fb0bf9e7ed6c78bf03054 + 22b801bc0b8a9df2da8db24a631927f1a7811c39fa20d2f8411312c3e302e566 + e4475907568d860b7a22c9e5bac2cb0b8eccb554969dc0302999b2bd3ccc51ea + 0c4571b60b88b12f61fdc05f14b6f1b8f45b52287cb9eac8ab963562a7d958ef + 01facb4effc8c42f898f0e1f76c2ca73e04b4ec506f6837a4572df0195de54fc + cbb3fbd66dd978a48e206b8c346b04ad444f67afb596846295057d21e36282cd + 1276c23a9a6f10b7c4aac59c9e491970e195df109a5de36ebc60cf94915e2780 + db066b4e73c962aaeb3c8756d30e929d333b1aa67c313c9851e09b841895835e + 05cd67ee6422fe7ed089541d90f73a3baf88fa8e9653bf2eb1de4f60d3442112 + 54438b167939fcf94622f98190d13c8a3fd77aec22cbf087223b434452315e7f + 392b336d0494d5e364c31e12042eda32627ef40b77930602de4c1d306a1aa0d3 + ce90b2726134c1f4de19e0238dc23b110ad20065f216a33498f282c94657ec12 + c21270be60c8300c5975bea228d5941504cc8d81757b5392d11b90c0ca353750 + ef4d075fc8b462b1fd7a0aee53432614e521421f52cd0e90cbbe88ea8e39421b + dce20732f2e5dfba243a9bf96c1956c3a0449fd81f4cacc43c350db32fabc96f + 1b8d7033480b6c2bffec3ce76c073a85142eca8ee6f9ede547207ca33d8f55a9 + a8a99bd1415e01764e4f317701f4e09377276da6db93e10e6e0ed9fb4885a7b1 + ed9b9e3792757ef4ff7422e946bc78e84c9a0f1f8e69db03bb242c8c970de163 + fd4018acb9730d98d1f3023539b6d00bde237eb9ea303cb311e88775821c8068 + 4b4f55569b4f0b521365ed18edff1aa6ca06470c4abe5ef93b33956d1d9748de + 8cd75a88cb666e0fa816211dfb943b1c3d0bd71f1fae997b6b8e4021f9ebd43b + f2592d68efd9f0ed4b030b326233d777016916be9b9f61f7feaf47f29e58c427 + 2439855ef019a354d3dd2506a4b26603b622bc35d4fae982906285f4227cd9b2 + c62496c7da43cfd521cba7a243baba3b8d8e45515cf1729a8c757168ab37ee26 + 6beeb507141d9d39a947044dcd7d0ee3e7adb9e1d4a556b0477a16bfa8863d54 + c588f1f693a12e51f47ede13dcdb392d1fa8f64f0644848f06b1fd7c6859b1bd + b2baab1a55bc5b3340ae6155deed01448aae08136427fdf210356f27dc42cc97 + fd1a3292d73db55c3f8021188c687a6f0a90fef05305f5ad917b55ff0c189be1 + d8c0e96648022e617dd8cd21a053bfa45c56ec23cc7ab6fbfdbbfb80a5f1dce0 + cc0b42757564e1b80aa46c296d9ad55aac50a730ec66a76c2b9ca7be9e77b3cf + d5b731cf3a145b590d16af59ea08bcc27438adda449df0cf1ac468ea55e1fee3 + c823dfbed5d34e1e296b698e66843be873f292db54e8748ce28e36d54bceed49 + e01c5cc2770dfbe0b4b0d35dc8ee2062907a0597a94555a7b93e9164f57b9ed7 + 74bea0ab796797620a6e121513dc2f32114dd23969d57cf3298f10a3f471a0fa + 5b1e3a476a683378e6d1af350761435219398c6c9dc7f0bfc52efb6836e6996d + e691c980d0bf89a99e445d7f726e4d5d1242aae16f940405331f8d8d48de42bc + 70c37eeddb05e6503fe381118bfb488a1368e18240125e2b947617c8a9d4c108 + f18d1a9224486c1952119f882460fbf6d32606c69afcac862c9069a4f9fdfc38 + 725958f542984c594e783fd151306e8340fbacfd05a7795ae8ce346704a89829 + 144367fb12f0b92d46854c8b8add994be91069df2f8e05ee1287c1c57f9315be + f313dd641aab012f93f06278f8da94a70cf42b84e8d2a4ba827d663a960f4126 + ec35e052f38863addfdca5a4b5a4b25f78f6ac59e9655b03f53b9b9741778a27 + e3c0ce3575adcb20ef60d44abb4051e23d560f2994b0a337a9bec0dbb50b9b45 + 534701f536ce6d665a38152cb9e0209e67383e1cedc71e28e953aa878325b96c + e97e4800c799baf4f176807e2892995c7c684672e660c5277158b1467589a9d6 + 76afbe14524ca84c6af851fe1567434237cde207f4f3ab138e8078677f00ce9c + 7402fa24d7cd719e917e5ff07d88ab955c65960e085440b553c45aa178821e86 + 3fb1389619e3e0efd2882507434c5683f04abd3aaa54d5f8113240aed3de86bf + 365dfa4198bbb355706ab405473a350ec971efaed324049f230cdf631c9c9d39 + 8c2fbba9144750e55791792c8d17d248ade6a3d6a61c727cfe4f4c69c698102b + 7ba7ee23ee35aabf8068024f7198522ac8bf3780720d63444a9fc3f4919754b9 + 47f6258d2051edfb85e698169ccb646a009eee52c44c7f11240c7f7e68be0c48 + 2c1cf7d3dd8c8db029d06ec63d3a2d1c58f4747ae2dcdc55d1d44cf2e5f2ebb9 + c9fa033ea4bcd3aca38807dc4f52cef7820ebc1e918b30d195491889eb6a4e6c + 4ba0eab56da8a68961dfb8d333dc26f6253d8fa9b5ef773f11396a16ba7cad7a + 03b2bf62131a59bf6064a9d2190e7d1c14bac55f92e33e48335913acc6cfcd75 + 6dc7695eed1cdf0e02064560675a30b6e9cca2caad290f7b46d00f3078a99993 + 72d64bcbc53d2e437c2872f26659c64a82139a7303504b9bdac3ac01ebde1df7 + d1a2e661a450680e56bc07a6dc9bf9502558a66b6689cd0841b8fc8ad37fe457 + d219719dd56d23e702bb4e6fc589b50f5f18734722b857ebbd44f49b14f2f99f + 07a4d63c033e8234e07e29be35ebf3f9ab8ac8e376e7f8882f8e5fd2eb8c9b9d + 4b44592b37c40e12dc636af6422d16327697074fcb74cee3e9bd0f631506a3e5 + fc8da974458213e019261281def322df32f225f4e3099cad5aff38bdc0e77e27 + b38ee1b09a1f539f9e5eb73ba2a01f99fb98b8896d70295bd90b442a78d8a546 + e88fea87214959b23a2cb79f2775bb82c8d5d72dd045298ca66b46a698c06e61 + 3b39e97e9837005e58584101e8048137f2580bd4bcab4688232d75c2f5d9a992 + 9e3ec5dff511c992c84b6961f77f65428bbe60e6999c4c85aea778eb815984e5" diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig index ac17cc10ed3..05965d93c2d 100644 --- a/srcpkgs/firefox/files/mozconfig +++ b/srcpkgs/firefox/files/mozconfig @@ -17,7 +17,6 @@ ac_add_options --with-system-icu # XXX: the system's libpng doesn't have APNG support ac_add_options --without-system-png ac_add_options --enable-system-pixman -ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi @@ -42,8 +41,6 @@ ac_add_options --disable-strip ac_add_options --disable-profiling ac_add_options --enable-optimize="$CFLAGS" ac_add_options --enable-pie -# needed to enable stylo at runtime by default -ac_add_options --enable-stylo ac_add_options --enable-official-branding ac_add_options --enable-application=browser diff --git a/srcpkgs/firefox/patches/disable-hunspell_hooks.patch b/srcpkgs/firefox/patches/disable-hunspell_hooks.patch deleted file mode 100644 index a5f7c29f2bd..00000000000 --- a/srcpkgs/firefox/patches/disable-hunspell_hooks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200 -+++ mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200 -@@ -54,7 +54,7 @@ - * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in, - * unless --enable-system-hunspell is defined. - */ --#if defined(HUNSPELL_STATIC) -+#if 0 - #include "hunspell_alloc_hooks.h" - #include "hunspell_fopen_hooks.h" - #endif diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch index 097b313e90b..b885aa3802a 100644 --- a/srcpkgs/firefox/patches/sndio.patch +++ b/srcpkgs/firefox/patches/sndio.patch @@ -52,13 +52,13 @@ --- build/moz.configure/old.configure.orig +++ build/moz.configure/old.configure @@ -159,6 +159,7 @@ + '--cache-file', + '--datadir', '--enable-accessibility', - '--enable-address-sanitizer', - '--enable-alsa', + '--enable-sndio', '--enable-bundled-fonts', - '--enable-clang-plugin', '--enable-content-sandbox', + '--enable-cookies', --- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig +++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp @@ -349,6 +349,21 @@ diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 1d9d6474a2d..359843748d4 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,23 +3,23 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=60.0.1 -revision=1 +version=61.0 +revision=2 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=c8e621c7dfccbef14cce41a6847b83bee15b5276cd0c35771c3874e464e6a662 +checksum=3453e8ac7c602390bda0d34a4a636e0d65fd89d9ae69f7aa1740926715c42268 only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes -hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm rust cargo +hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo llvm clang" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx-devel - libXrender-devel hunspell-devel libXcomposite-devel libSM-devel libXt-devel + libXrender-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if startup_notification startup-notification-devel) @@ -116,11 +116,6 @@ do_install() { usr/share/icons/hicolor/${i}/apps firefox.png done - # Use system-provided dictionaries - rm -rf ${DESTDIR}/usr/lib/firefox/{dictionaries,hyphenation} - ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/firefox/dictionaries - ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/firefox/hyphenation - # We don't want the development stuff rm -rf ${DESTDIR}/usr/{include,lib/firefox-devel,share/idl} diff --git a/srcpkgs/flare-engine/template b/srcpkgs/flare-engine/template index c729690d704..e0794d05a99 100644 --- a/srcpkgs/flare-engine/template +++ b/srcpkgs/flare-engine/template @@ -1,6 +1,6 @@ # Template file for 'flare-engine' pkgname=flare-engine -version=1.04 +version=1.06 revision=1 build_style=cmake configure_args="-DBINDIR=/usr/bin -DDATADIR=share/flare" @@ -8,10 +8,10 @@ makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel" depends="flare-engine-data>=${version}_${revision} desktop-file-utils hicolor-icon-theme" short_desc="Free/libre action roleplaying engine (engine only)" maintainer="Diogo Leal " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://flarerpg.org/" distfiles="https://github.com/clintbellanger/flare-engine/archive/v${version}.tar.gz" -checksum=a62384433df872b85315febafdf876faac0fb415c94ed0e919eee04baa811001 +checksum=8cf6f110ca70f911f372120ed3785665213ec9842b8c0291f822ffd57b79bc05 flare-engine-data_package() { short_desc+=" - data" diff --git a/srcpkgs/flare-game/template b/srcpkgs/flare-game/template index 235d125afad..79556e0091e 100644 --- a/srcpkgs/flare-game/template +++ b/srcpkgs/flare-game/template @@ -1,6 +1,6 @@ # Template file for 'flare-game' pkgname=flare-game -version=1.04 +version=1.06 revision=1 noarch=yes build_style=cmake @@ -8,7 +8,11 @@ configure_args="-DDATADIR=share/flare" depends="flare-engine>=${version}" short_desc="Single-player 2D action RPG using the FLARE engine" maintainer="Diogo Leal " -license="GPL-3" +license="GPL-3.0-or-later, CC-BY-SA-3.0" homepage="http://flarerpg.org/" distfiles="https://github.com/clintbellanger/flare-game/archive/v${version}.tar.gz" -checksum=4a4c52d5d6c8c3a1e21e1481ec23f50ec3079c39cff26ea467086baeaf0dd44b +checksum=5eb3d187bde7cd3a16a95ffd311dc05a6d8ff68d3ddbadf2d2fb8243b0145a53 + +post_install() { + vlicense LICENSE.txt +} diff --git a/srcpkgs/flatpak-builder/template b/srcpkgs/flatpak-builder/template index e9e69ee2ce7..dc6f3953443 100644 --- a/srcpkgs/flatpak-builder/template +++ b/srcpkgs/flatpak-builder/template @@ -1,17 +1,17 @@ # Template file for 'flatpak-builder' pkgname=flatpak-builder -version=0.10.9 +version=0.10.10 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config libxslt docbook-xml docbook-xsl xmlto" -makedepends="flatpak-devel libcap-devel libsoup-devel json-glib-devel libxml2-devel - elfutils-devel" +hostmakedepends="pkg-config xmlto" +makedepends="flatpak-devel json-glib-devel libcap-devel libsoup-devel + libyaml-devel" short_desc="Tool to build flatpaks from source" -maintainer="maxice8 " -license="LGPL-2.1" +maintainer="Orphaned " +license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/flatpak-builder" distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=b8253b327d9901cf20a5a0167674377be192012b90bfdc62d54d1c8621cfdd2a +checksum=c299985b230cdb052c6b8f8e912fc7e735b1a3868b2e008c49456ee16a160c2c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" flatpak-devel" diff --git a/srcpkgs/flightgear/patches/fix-link_with_x11.patch b/srcpkgs/flightgear/patches/fix-link_with_x11.patch deleted file mode 100644 index 2b6c73cc454..00000000000 --- a/srcpkgs/flightgear/patches/fix-link_with_x11.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 04ca64edc46cfb54ecff5bddf12370b2c7a0f192 Mon Sep 17 00:00:00 2001 -From: Fabrice Bellet -Date: Tue, 17 Feb 2015 22:49:50 +0100 -Subject: [PATCH] explicitely link with libX11 - ---- - src/Main/CMakeLists.txt | 1 + - utils/fgviewer/CMakeLists.txt | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt -index 12c0961..78c4163 100644 ---- src/Main/CMakeLists.txt -+++ src/Main/CMakeLists.txt -@@ -142,6 +142,7 @@ target_link_libraries(fgfs - ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} - ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES} - ${PLATFORM_LIBS} -+ ${X11_X11_LIB} - ) - - if(ENABLE_FLITE) diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index ac86099575c..780f4c2c4a7 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,6 +1,6 @@ # Template file for 'flightgear' pkgname=flightgear -version=2018.1.1 +version=2018.2.2 revision=1 build_style=cmake configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata -DSYSTEM_SQLITE=1" @@ -11,15 +11,14 @@ makedepends="MesaLib-devel boost-devel freealut-devel libfreeglut-devel fltk-dev depends="flightgear-data>=${version}" short_desc="Sophisticated flight simulator" maintainer="Jürgen Buchmüller " -license="GPL-3" +license="GPL-2.0-or-later" homepage="http://www.flightgear.org/" -#_mirror=http://mirror.netcologne.de/gentoo/distfiles distfiles=" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2 $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2" checksum=" - ed1aa7867e89757622f3faaab996028c4be2f79006dfb89a3059c77b9831aab9 - dfd80e09f6bf04bd25604788c080716007969d127d46d0e10c43c2f709fb8db8" + 61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147 + c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4" nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio diff --git a/srcpkgs/fmit/template b/srcpkgs/fmit/template index f1ca0fb2895..4b87735f1a1 100644 --- a/srcpkgs/fmit/template +++ b/srcpkgs/fmit/template @@ -1,12 +1,10 @@ -broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/9543/steps/shell_3/logs/stdio" - # Template file for 'fmit' pkgname=fmit version=1.2.6 -revision=1 +revision=2 build_style=qmake configure_args="CONFIG+=acs_qt CONFIG+=acs_alsa CONFIG+=acs_jack CONFIG+=acs_portaudio" -hostmakedepends="pkg-config qt5-tools" +hostmakedepends="itstool 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" diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template index 257d6aa4695..ce4b0d3d221 100644 --- a/srcpkgs/font-awesome5/template +++ b/srcpkgs/font-awesome5/template @@ -1,6 +1,6 @@ # Template file for 'font-awesome5' pkgname=font-awesome5 -version=5.0.13 +version=5.1.0 revision=1 noarch=yes wrksrc=Font-Awesome-${version} @@ -11,7 +11,7 @@ maintainer="cr6git " license="OFL-1.1" homepage="https://fontawesome.com" distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz" -checksum=fae40b4aeb6505edb0b641631ff4a5d8c97e5972fb6643f3b2eb626c752e5a83 +checksum=0081ff1e590ef4d49b751840ea0551b3f577fc138436fe1f78101ce432faf2d4 conflicts="font-awesome>=0" do_install() { diff --git a/srcpkgs/font-symbola/template b/srcpkgs/font-symbola/template index 6101b381f9f..c352e91a0fa 100644 --- a/srcpkgs/font-symbola/template +++ b/srcpkgs/font-symbola/template @@ -1,18 +1,19 @@ # Template file for 'font-symbola' pkgname=font-symbola version=11.00 -revision=1 +revision=2 noarch=yes create_wrksrc=yes hostmakedepends="unzip" depends="font-util xbps-triggers" font_dirs="/usr/share/fonts/TTF" short_desc="Font with many Symbol/Emoji blocks of The Unicode Standard" -maintainer="Christian Neukirchen " -license="Free for any use" +maintainer="Leah Neukirchen " +license="Free for personal, non commercial use" homepage="http://users.teilar.gr/~g1951d/" distfiles="http://users.teilar.gr/~g1951d/Symbola.zip>Symbola-${version}.zip" -checksum=9388978165fdd781097656ad6f1111c2641ae5281613e9aebf0203c1dcd638a0 +checksum=d594ce9d51832f614776fed400b79e8ffffb8f8effeced73f9034907e512527d +restricted=yes do_install() { vinstall Symbola.ttf 0644 usr/share/fonts/TTF diff --git a/srcpkgs/fontmatrix/patches/musl.patch b/srcpkgs/fontmatrix/patches/musl.patch new file mode 100644 index 00000000000..8acdf581457 --- /dev/null +++ b/srcpkgs/fontmatrix/patches/musl.patch @@ -0,0 +1,11 @@ +--- src/fmutils.cpp.orig 2017-08-13 19:07:51.821535347 +0200 ++++ src/fmutils.cpp 2017-08-13 19:05:51.995947873 +0200 +@@ -12,7 +12,7 @@ + + #include "fmutils.h" + +-#if !defined(_WIN32) && !defined(Q_OS_MAC) ++#if !defined(_WIN32) && !defined(Q_OS_MAC) && defined(__GLIBC__) + #include + #include + #include diff --git a/srcpkgs/fontmatrix/template b/srcpkgs/fontmatrix/template new file mode 100644 index 00000000000..5784d8d85da --- /dev/null +++ b/srcpkgs/fontmatrix/template @@ -0,0 +1,19 @@ +# Template file for 'fontmatrix' +pkgname=fontmatrix +version=0.6.0.20171228 +revision=1 +_commit=8108e6ea8b5944a92d7f27c40509b8e890ddaff1 +wrksrc="${pkgname}-${_commit}" +build_style=cmake +hostmakedepends="pkg-config" +makedepends="fontconfig-devel MesaLib-devel qt-webkit-devel" +short_desc="Free font collections manager" +maintainer="newbluemoon " +license="GPL-2.0-or-later" +homepage="https://github.com/fontmatrix/fontmatrix" +distfiles="https://github.com/fontmatrix/fontmatrix/archive/${_commit}.tar.gz" +checksum=1fa442e5bafb08265e1078d522ca0e8a8b864ab8544fb5ce4fd77ebb2f7bfc1d + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt-devel" +fi diff --git a/srcpkgs/fonts-droid-ttf/template b/srcpkgs/fonts-droid-ttf/template new file mode 100644 index 00000000000..fc477ef68ea --- /dev/null +++ b/srcpkgs/fonts-droid-ttf/template @@ -0,0 +1,24 @@ +# Template file for 'fonts-droid-ttf' +pkgname=fonts-droid-ttf +version=20150613 +revision=1 +noarch=yes +_githash=f5de525ee3547b8a69a21aec1e1a3175bc06f442 +create_wrksrc=yes +depends="font-util" +font_dirs="/usr/share/fonts/TTF" +conflicts="google-fonts-ttf" +short_desc="General-purpose Android fonts (CJK support)" +maintainer="travankor " +license="Apache-2.0" +homepage="http://www.droidfonts.com/droidfonts/" +changelog="https://android.googlesource.com/platform/frameworks/base/+log/master/data/fonts" +distfiles="https://android.googlesource.com/platform/frameworks/base/+archive/${_githash}/data/fonts.tar.gz" +checksum=@722c954d839cc131c17161956c5117624ceeea3f90e01d4d8ad3d38f374000cc + +do_install() { + vmkdir usr/share/fonts/TTF + vinstall DroidSansFallback.ttf 644 usr/share/fonts/TTF + vinstall DroidSansFallbackFull.ttf 644 usr/share/fonts/TTF + vinstall DroidSansMono.ttf 644 usr/share/fonts/TTF +} diff --git a/srcpkgs/freetype/patches/CVE-2018-6942.patch b/srcpkgs/freetype/patches/CVE-2018-6942.patch deleted file mode 100644 index 950f4e4a83e..00000000000 --- a/srcpkgs/freetype/patches/CVE-2018-6942.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 29c759284e305ec428703c9a5831d0b1fc3497ef Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Sat, 27 Jan 2018 14:43:43 +0100 -Subject: * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5736 ---- - src/truetype/ttinterp.c | 12 ++++++++++-- - 2 files changed, 18 insertions(+), 2 deletions(-) - -diff --git ./src/truetype/ttinterp.c ./src/truetype/ttinterp.c -index d855aaa..551f14a 100644 ---- ./src/truetype/ttinterp.c -+++ ./src/truetype/ttinterp.c -@@ -7532,8 +7532,16 @@ - return; - } - -- for ( i = 0; i < num_axes; i++ ) -- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ -+ if ( coords ) -+ { -+ for ( i = 0; i < num_axes; i++ ) -+ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ -+ } -+ else -+ { -+ for ( i = 0; i < num_axes; i++ ) -+ args[i] = 0; -+ } - } - - --- -cgit v1.0-41-gc330 - diff --git a/srcpkgs/freetype/patches/upstream-type1-flex.patch b/srcpkgs/freetype/patches/upstream-type1-flex.patch deleted file mode 100644 index c00b711872f..00000000000 --- a/srcpkgs/freetype/patches/upstream-type1-flex.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit cc2f3cdecff5a351e7e8961b9f2e389ab740231a -Author: Ewald Hew -Date: Wed Jan 10 13:24:56 2018 +0800 - - [psaux] Correctly handle Flex features (#52846). - - * src/psaux/psintrp.c (cf2_interpT2CharString) : Do not move if doing Flex. - -diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c -index 5c0ee7849..da5a8dad1 100644 ---- src/psaux/psintrp.c -+++ src/psaux/psintrp.c -@@ -852,7 +852,8 @@ - - curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) ); - -- cf2_glyphpath_moveTo( &glyphPath, curX, curY ); -+ if ( !decoder->flex_state ) -+ cf2_glyphpath_moveTo( &glyphPath, curX, curY ); - - break; - -@@ -2674,7 +2675,8 @@ - - curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) ); - -- cf2_glyphpath_moveTo( &glyphPath, curX, curY ); -+ if ( !decoder->flex_state ) -+ cf2_glyphpath_moveTo( &glyphPath, curX, curY ); - - break; - diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template index ecac67e26c7..7d6c220beaa 100644 --- a/srcpkgs/freetype/template +++ b/srcpkgs/freetype/template @@ -1,16 +1,17 @@ -# Template build file 'freetype'. +# Template file for 'freetype' pkgname=freetype -version=2.9 +version=2.9.1 revision=3 build_style=gnu-configure +configure_args="--enable-freetype-config" hostmakedepends="pkg-config" -makedepends="zlib-devel bzip2-devel libpng-devel" +makedepends="bzip2-devel libpng-devel" short_desc="Font rendering engine and library API" maintainer="Juan RP " -homepage="http://www.freetype.org/" -license="GPL-2" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a +license="GPL-2.0-or-later" +homepage="https://www.freetype.org/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d build_options="v35 v38 v40" build_options_default="v40" @@ -39,8 +40,8 @@ freetype-devel_package() { for f in bin include share; do vmove usr/${f} done - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template index 14605910b9b..6b5338e5ec1 100644 --- a/srcpkgs/frp/template +++ b/srcpkgs/frp/template @@ -1,24 +1,23 @@ # Template file for 'frp' pkgname=frp -version=0.16.1 -revision=2 +version=0.20.0 +revision=1 build_style=go go_import_path="github.com/fatedier/frp" go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps" conf_files="/etc/frp/*.ini" -maintainer="cr6git " short_desc="Fast reverse proxy" -homepage="https://github.com/fatedier/frp" +maintainer="cr6git " license="Apache-2.0" +homepage="https://github.com/fatedier/frp" distfiles="https://github.com/fatedier/frp/archive/v${version}.tar.gz" -checksum=f4d5a6ab4e0966edcb214c3f609b0514f2ea6f0241248db66fb6ee79057fedbe +checksum=17219fcdde776c87b79848dcae5aba5beb9ccc2a512d7d2ff811c901611a696e post_install() { vinstall conf/frpc_full.ini 644 etc/frp vinstall conf/frps_full.ini 644 etc/frp vinstall conf/frpc.ini 644 etc/frp vinstall conf/frps.ini 644 etc/frp - vlicense LICENSE vsv frpc vsv frps } diff --git a/srcpkgs/fswatch/template b/srcpkgs/fswatch/template index 22a3768dec3..49515b3813c 100644 --- a/srcpkgs/fswatch/template +++ b/srcpkgs/fswatch/template @@ -1,25 +1,40 @@ # Template file for 'fswatch' pkgname=fswatch -version=1.11.2 +version=1.12.0 revision=1 build_style=gnu-configure +configure_args="--disable-static" +hostmakedepends="doxygen" short_desc="A cross-platform file change monitor with multiple backends" -maintainer="maxice8 " -license="GPL-3" +maintainer="Orphaned " +license="GPL-3.0-or-later" homepage="https://emcrisostomo.github.io/fswatch/" distfiles="https://github.com/emcrisostomo/fswatch/releases/download/${version}/fswatch-${version}.tar.gz" -checksum=b7dadb84848ce666aac0311f9b4c739fbfee6a90c6097807a1f45ad4367294c2 +checksum=8042da283b34dc383ff6321254163e378d4f3cd5d8df87ff608f811ea33e6a83 case "$XBPS_TARGET_MACHINE" in - armv6l-musl) LDFLAGS=" -latomic" ;; + armv[56]*) + makedepends+=" libatomic-devel" + LDFLAGS=" -latomic" + ;; esac -fswatch-devel_package() { - depends="fswatch>=${version}_${revision}" - short_desc+=" - development files" +post_install() { + rm -rf -- "${DESTDIR}/usr/share/doc" +} + +libfswatch_package() { + short_desc+=" - fswatch library" pkg_install() { - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove "usr/lib/libfswatch.so.*" + } +} + +libfswatch-devel_package() { + depends="libfswatch-${version}_${revision}" + short_desc+=" - fswatch development files" + pkg_install() { + vmove usr/lib/libfswatch.so vmove usr/include } } diff --git a/srcpkgs/fuse-sshfs/template b/srcpkgs/fuse-sshfs/template index bd7c0edc1d3..fbac3a1e834 100644 --- a/srcpkgs/fuse-sshfs/template +++ b/srcpkgs/fuse-sshfs/template @@ -1,6 +1,6 @@ # Template file for 'fuse-sshfs' pkgname=fuse-sshfs -version=3.3.2 +version=3.4.0 revision=1 wrksrc="sshfs-${version}" build_style=meson @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://github.com/libfuse/sshfs" distfiles="https://github.com/libfuse/sshfs/releases/download/sshfs-${version}/sshfs-${version}.tar.xz" -checksum=a4da6af0ac4f39606eefd0fd7ca09267fbb90e274081570a700f911fca387e4c +checksum=d27ccd35436d72755c40234cefa081e30fa529e092232a5b4abbff2178c2c22f case "${XBPS_TARGET_MACHINE}" in i686|armv6l|armv7l) diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index b5300682a2e..99159c9d221 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,6 +1,6 @@ # Template file for 'fwup' pkgname=fwup -version=1.2.0 +version=1.2.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -12,7 +12,7 @@ license="Apache-2.0" #changelog="https://raw.githubusercontent.com/fhunleth/fwup/master/CHANGELOG.md" homepage="https://github.com/fhunleth/fwup" distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz" -checksum=e20b22b01e921102e61daea2e5fafd80ce2c5ee868e19f756dccf33f2a6bd61a +checksum=054af579574049f4c64307320808d6900323dbca80edfc042ba98ee198602b53 if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" diff --git a/srcpkgs/fwupdate/template b/srcpkgs/fwupdate/template index 7e1a0c05738..b857267380a 100644 --- a/srcpkgs/fwupdate/template +++ b/srcpkgs/fwupdate/template @@ -1,16 +1,17 @@ # Template file for 'fwupdate' pkgname=fwupdate -version=10 -revision=2 +version=12 +revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="popt-devel libefivar-devel gnu-efi-libs elfutils-devel" +makedepends="elfutils-devel gnu-efi-libs libefivar-devel popt-devel" +checkdepends="libabigail-tools" short_desc="Tool for using the ESRT and UpdateCapsule() to apply firmware updates" maintainer="maxice8 " license="GPL-2.0-or-later" homepage="https://github.com/rhboot/fwupdate" distfiles="https://github.com/rhboot/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2" -checksum=73f42c6097049ab4490e88bd7742ac962f892e6660ee2af40254605d011ef33a +checksum=4167d569f14e00ecf620c369ab34709e4bb1574ed588ef2e2398667e9e968703 make_build_args="EFIDIR=void GNUEFIDIR=/usr/lib" make_install_args="EFIDIR=void LIBDIR=/usr/lib" nocross="fails to find efi.h" @@ -19,6 +20,10 @@ case "$XBPS_TARGET_MACHINE" in x86_64|i686) makedepends+=" libsmbios-devel" ;; esac +do_check() { + EFIDIR=void make abicheck +} + post_install() { vmkdir usr/lib/fwupdate mv "${DESTDIR}"/boot/efi/EFI "${DESTDIR}"/usr/lib/fwupdate/EFI @@ -28,12 +33,20 @@ post_install() { rm -rf "${DESTDIR}"/usr/lib/systemd } +libfwup_package() { + short_desc+=" - fwupdate library" + pkg_install() { + vmove "usr/lib/libfwup.so.*" + } +} + fwupdate-devel_package() { - depends="${sourcepkg}-${version}_${revision} libefivar-devel" + depends="libfwup-${version}_${revision} libefivar-devel" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" + vmove usr/lib/libfwup.so + vmove usr/share/man/man3 } } diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template new file mode 100644 index 00000000000..49b356dc54c --- /dev/null +++ b/srcpkgs/gallery-dl/template @@ -0,0 +1,15 @@ +# Template file for 'gallery-dl' +pkgname=gallery-dl +version=1.4.0 +revision=1 +noarch=yes +build_style=python3-module +pycompile_modules="gallery_dl" +hostmakedepends="python3" +depends="python3-requests" +short_desc="Command-line program to download image galleries" +maintainer="SolitudeSF " +license="GPL-2.0-or-later" +homepage="https://github.com/mikf/gallery-dl" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=09cd0a34deb4d4a26b4c2f4fb410a642939900ab4d9f9f1837c246b2732e813f diff --git a/srcpkgs/gcovr/template b/srcpkgs/gcovr/template index bb208a527a8..c32d6430f0f 100644 --- a/srcpkgs/gcovr/template +++ b/srcpkgs/gcovr/template @@ -1,18 +1,18 @@ # Template file for 'gcovr' pkgname=gcovr -version=3.4 +version=4.0 revision=1 noarch=yes -build_style=python2-module +build_style=python3-module pycompile_module="gcovr" -hostmakedepends="python-setuptools" -depends="python" +hostmakedepends="python3-setuptools" +depends="python3-setuptools python3-Jinja2" short_desc="Generates a simple report that summarizes the gcc code coverage" maintainer="Andre Klitzing " -homepage="http://gcovr.com/" -license="3-clause-BSD" +homepage="https://gcovr.com/" +license="BSD-3-Clause" distfiles="https://github.com/gcovr/gcovr/archive/${version}.tar.gz" -checksum=1c52a71f245adfe1b45e30fbe5015337fe66546f17f40038b3969b7b42acceed +checksum=f9731a0ea516f2087e13b3bc310dbd8edaec4ce6a56b2462f5603ee925f40377 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template index 10a1730c08a..c5defd1c349 100644 --- a/srcpkgs/gede/template +++ b/srcpkgs/gede/template @@ -1,6 +1,6 @@ # Template file for 'gede' pkgname=gede -version=2.7.4 +version=2.8.1 revision=1 build_style=qmake build_wrksrc="src" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="BSD" homepage="http://acidron.com/gede" distfiles="http://gede.acidron.com/uploads/source/${pkgname}-${version}.tar.xz" -checksum=9992e67f80c564a886823559d015308877920486c8e855bef2e7db2801a24ee1 +checksum=614e0ebdf2873427fe5dda17a0667b44305ea1879f1239318dbfccf40c88ab1d if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt-host-tools qt-devel" diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template index 91deb6c7c32..919ab3d8230 100644 --- a/srcpkgs/genius/template +++ b/srcpkgs/genius/template @@ -1,16 +1,16 @@ # Template file for 'genius' pkgname=genius -version=1.0.23 -revision=3 +version=1.0.24 +revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb" +hostmakedepends="intltool pkg-config" +makedepends="gtksourceview2-devel mpfr-devel readline-devel vte-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Advanced calculator including a mathematical programming language" maintainer="Samadi van Koten " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.jirka.org/genius.html" -distfiles="http://ftp.5z.com/pub/genius/genius-${version}.tar.gz" -checksum="efdd082e8fb832f9dd08174ca03538aa46520ae81fdcb0044d93052bdd4c380a" -depends="desktop-file-utils hicolor-icon-theme" -hostmakedepends="intltool pkg-config gnome-doc-utils" -makedepends="gtksourceview2-devel mpfr-devel vte-devel ncurses-devel readline-devel" +distfiles="http://ftp.5z.com/pub/genius/genius-${version}.tar.xz" +checksum=8dea7f386821f39a438c66d5201a741904555c878dc670b96b8a22a8a96dca50 nocross="https://travis-ci.org/voidlinux/void-packages/jobs/252374514" diff --git a/srcpkgs/geomyidae/template b/srcpkgs/geomyidae/template index de423114279..864629776d3 100644 --- a/srcpkgs/geomyidae/template +++ b/srcpkgs/geomyidae/template @@ -1,6 +1,6 @@ # Template file for 'geomyidae' pkgname=geomyidae -version=0.31.1 +version=0.32.1 revision=1 build_style=gnu-makefile short_desc="A small C-based gopherd" @@ -8,7 +8,7 @@ maintainer="m-cz " license="MIT" homepage="http://git.r-36.net/geomyidae/" distfiles="http://git.r-36.net/${pkgname}/snapshot/${pkgname}-${version}.tar.gz" -checksum=a3fdb9fcf57066373824924c888ec7b82c3d0a349e6c8db8064ee81698158ecb +checksum=df884aa04457c69f030dffad50178b96ac364952101e4d8d9eca07cc60a279a8 pre_build() { sed -i 's| -O0||g' Makefile diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index c1e03658367..1e442376385 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,17 +1,21 @@ # Template file for 'gerbera' pkgname=gerbera -version=1.1.0 +version=1.2.0 revision=1 build_style=cmake -makedepends="libuuid-devel libupnp1.8-devel expat-devel sqlite-devel duktape-devel libcurl-devel taglib-devel file-devel libexif-devel ffmpeg-devel" +makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel + libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel" short_desc="UPnP Media Server based on MediaTomb" maintainer="Alexander Gehrke " -license="GPL-2" +license="GPL-2.0-only" homepage="http://gerbera.io/" distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz" -checksum=225247e94983d24d50c0877cd7c9ef1e013091f2ec43fac7e2a3c3b82c11d5bd +checksum=a64fe5820aced590bcdc22600596dc8a41c0baf68d7c0ec5baf7a561ade820df configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" +# libupnp uses large file support, so users must do that, too +CXXFLAGS="-D_FILE_OFFSET_BITS=64" + system_accounts="gerbera" make_dirs="/var/lib/gerbera 0750 gerbera gerbera" diff --git a/srcpkgs/gfm/patches/no-kde.patch b/srcpkgs/gfm/patches/no-kde.patch new file mode 100644 index 00000000000..146bdac8ed1 --- /dev/null +++ b/srcpkgs/gfm/patches/no-kde.patch @@ -0,0 +1,66 @@ +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -8,18 +8,18 @@ + # build instructions + gfm_CPPFLAGS = @TIFILES_CFLAGS@ @TICONV_CFLAGS@ @TICALCS_CFLAGS@ \ + @GLIB_CFLAGS@ @GTK_CFLAGS@ @GLADE_CFLAGS@ \ +- @KDE_INCLUDES@ @QT_INCLUDES@ \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DLOCALEDIR=\"$(datadir)/locale\" ++# @KDE_INCLUDES@ @QT_INCLUDES@ + + gfm_LDFLAGS = -export-dynamic + + gfm_LDADD = \ + @TIFILES_LIBS@ @TICONV_LIBS@ @TICALCS_LIBS@ \ + @GLIB_LIBS@ @GTK_LIBS@ @GLADE_LIBS@ \ +- @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \ +- @QT_LDFLAGS@ @X_LDFLAGS@ \ + @LTLIBINTL@ ++# @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \ ++# @QT_LDFLAGS@ @X_LDFLAGS@ + + # automake wants all .c files listed explicitly. This sucks. qmake does the + # right thing with just "*.c". +--- configure.ac.orig ++++ configure.ac +@@ -90,22 +90,23 @@ + AC_CHECK_FUNCS([getcwd memset mkdir strcasecmp strchr strdup strrchr strstr]) + + # KDE dialogs support +-AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no]) +-if test "x$kde" = "xdefault"; then +- case $host_os in +- *mingw*) +- kde=no +- ;; +- *) +- kde=yes +- ;; +- esac +-fi +-if test "x$kde" = "xyes"; then +- AC_PROG_CXX +- AC_PATH_KDE +- AC_DEFINE(WITH_KDE, 1, [Use KDE support]) +-fi ++#AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no]) ++#if test "x$kde" = "xdefault"; then ++# case $host_os in ++# *mingw*) ++# kde=no ++# ;; ++# *) ++# kde=yes ++# ;; ++# esac ++#fi ++#if test "x$kde" = "xyes"; then ++# AC_PROG_CXX ++# AC_PATH_KDE ++# AC_DEFINE(WITH_KDE, 1, [Use KDE support]) ++#fi ++kde=no + AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes") + AC_SUBST(kde) + diff --git a/srcpkgs/gfm/template b/srcpkgs/gfm/template new file mode 100644 index 00000000000..07047d64765 --- /dev/null +++ b/srcpkgs/gfm/template @@ -0,0 +1,23 @@ +# Template file for 'gfm' +pkgname=gfm +version=1.08 +revision=1 +_tilpver=1.18 +build_style=gnu-configure +hostmakedepends="automake bison groff intltool libtool pkg-config texinfo" +makedepends="libticalcs2-devel libglade-devel" +short_desc="TIgroup files manipulator for TiLP2" +maintainer="Andrew Benson " +license="GPL-2.0-or-later" +homepage="https://www.ticalc.org" +distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2" +checksum=09031ac0abf686b6a8bc9935f331ef460415783a1057f11b0af993526b52017f + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" gettext-devel" +fi + +pre_configure() { + mkdir -p m4 + autoreconf -i -v -f +} diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml deleted file mode 100644 index b25c6eba91a..00000000000 --- a/srcpkgs/git-annex/files/stack.yaml +++ /dev/null @@ -1,31 +0,0 @@ -flags: - git-annex: - concurrentoutput: true - production: true - assistant: true - pairing: true - network-uri: true - s3: true - testsuite: true - webdav: true - torrentparser: true - webapp: true - magicmime: false - dbus: false - android: false - androidsplice: false -packages: -- '.' -extra-deps: -- aws-0.16 -- bloomfilter-2.0.1.0 -- torrent-10000.0.0 -- yesod-default-1.2.0 -- conduit-extra-1.1.17 -- time-1.6.0.1 -- xml-conduit-1.5.1 -- happy-1.19.8 -- alex-3.2.3 -explicit-setup-deps: - git-annex: true -resolver: lts-10.2 diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index d2494ab0559..1e6b2744827 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,10 +1,10 @@ # Template file for 'git-annex' pkgname=git-annex -version=6.20171214 +version=6.20180626 revision=1 nocross=yes build_style=haskell-stack -stackage="lts-10.2" +stackage="lts-10.10" hostmakedepends="pkg-config ghc stack" makedepends="gsasl-devel gnutls-devel libxml2-devel rsync curl lsof gnupg2 file-devel" # depends are utilities required by git-annex @@ -14,7 +14,7 @@ maintainer="Evan Deaubl " license="GPL-3" homepage="http://git-annex.branchable.com" distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=9a9b12d460aed25ddbed1a928511eb1c221969aa664872d9562db6c8caa0dd0d +checksum=8eca36ce61f25079a4f0eb3c23d635e64e3208645402c5d48686eb1b5bc23a72 nopie_files="/usr/bin/git-annex" # These install steps are pulled from the install target in the diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template index 8d559a0063b..060a954bd3b 100644 --- a/srcpkgs/git-lfs/template +++ b/srcpkgs/git-lfs/template @@ -1,30 +1,17 @@ # Template file for 'git-lfs' pkgname=git-lfs -version=2.3.4 -revision=6 -nocross=1 +version=2.4.2 +revision=1 build_style=go go_import_path="github.com/git-lfs/git-lfs" hostmakedepends="go" -depends="git" short_desc="Git extension for versioning large files" maintainer="Michael Aldridge " license="MIT" homepage="https://git-lfs.github.com/" distfiles="https://github.com/git-lfs/${pkgname}/archive/v${version}.tar.gz" -checksum=2594fe7bd8cc29d71effd087623b78cadab04a74e506ceeb4971a4ed9a7fbb94 +checksum=130a552a27c8f324ac0548baf9db0519c4ae96c26a85f926c07ebe0f15a69fc2 -pre_build() { - chmod +x script/bootstrap - mkdir -p src/github.com/git-lfs - ln -s $(pwd) src/github.com/git-lfs/${pkgname} -} - -do_build() { - GOPATH=$(pwd) ./script/bootstrap -} - -do_install() { - vbin bin/git-lfs +post_install() { vlicense LICENSE.md } diff --git a/srcpkgs/git/template b/srcpkgs/git/template index bfef54dea89..1193c03b0fd 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ -# Template file for "git" +# Template file for 'git' pkgname=git -version=2.17.1 +version=2.18.0 revision=1 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 @@ -16,9 +16,10 @@ short_desc="Git Tree History Storage Tool" maintainer="Juan RP " license="GPL-2.0-only" homepage="https://git-scm.com/" +changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e -make_check_target="test" +checksum=8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92 +make_check_target=test subpackages="git-cvs git-svn gitk git-gui git-all" diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index c58c4699140..0a801591144 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,7 +1,7 @@ # Template file for 'gitea' pkgname=gitea -version=1.4.1 -revision=3 +version=1.4.2 +revision=1 build_style=go go_import_path="code.gitea.io/gitea" # This could be done with build options, but these are built in with the @@ -30,7 +30,7 @@ license="MIT" homepage="https://gitea.io" changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md" distfiles="https://github.com/go-gitea/gitea/archive/v${version}.tar.gz" -checksum=93b1e8fbad78dffada0736a26760eda175169771a065ca8a101cfa0ed70ed310 +checksum=c96051b8f2608f9035b2b0dadbd7107c4f7a00c6c66a16c6b5a41416aa9c99fa system_accounts="_gitea" _gitea_homedir="/var/lib/gitea" diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index fb50655670c..b3383435385 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,25 +1,20 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=3.26.2 +version=3.28.5 revision=1 # XXX ovirt support. -build_style=gnu-configure -hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)" -makedepends="clutter-gtk-devel gtk+3-devel gtk-vnc-devel libuuid-devel - libvirt-glib-devel libxml2-devel libgudev-devel libosinfo-devel - tracker-devel spice-gtk-devel spice-protocol vala-devel - libsoup-devel libarchive-devel libusb-devel libsecret-devel" -depends="qemu libvirt-glib>=0.1.6 libosinfo>=0.2.10 desktop-file-utils - hicolor-icon-theme shared-mime-info" +build_style=meson +configure_args="-Dovirt=false" +hostmakedepends="gobject-introspection intltool itstool pkg-config" +makedepends="clutter-gtk-devel gtk-vnc-devel libarchive-devel libosinfo-devel + libsecret-devel libsoup-devel libusb-devel libvirt-glib-devel spice-gtk-devel + spice-protocol tracker-devel vala-devel webkit2gtk-devel" +depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu" short_desc="GNOME 3 application to access remote or virtual systems" maintainer="Juan RP " +license="LGPL-2.0-or-later" homepage="https://live.gnome.org/Boxes" -license="LGPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210 +changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-28/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=f5de0987c2f4f710cc6a7a0333ab4db2f9253aeb2dab9c0e3ddc867e758d38fc nocross="won't cross-compile without gobject-introspection, gobject-intropection can't be cross compiled" - -build_options="gir" -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir" -fi diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 493e72cd718..4dfca66b819 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,6 +1,6 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=3.28.2 +version=3.28.3 revision=1 build_style=meson hostmakedepends="appdata-tools desktop-file-utils flex gobject-introspection @@ -11,10 +11,11 @@ makedepends="clang devhelp-devel flatpak-devel gtksourceview-devel depends="desktop-file-utils flatpak-builder python3-lxml" short_desc="IDE for GNOME" maintainer="Enno Boland " -homepage="https://wiki.gnome.org/Apps/Builder" license="GPL-2.0-or-later" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=398baaf8b14407a666b9d9eddbe9bde0812a86479f534085080149bd3271372e +homepage="https://wiki.gnome.org/Apps/Builder" +changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-28/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=a62b72efebf0080c6899824edcfaaa1e1e1c5d05e8b4390414a7dc78a30b726f case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index 9e66c1ddfc9..da430442d3b 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,14 +1,24 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=3.28.0 +version=3.28.2 revision=1 -build_style=gnu-configure -hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config" -makedepends="gsettings-desktop-schemas-devel gtksourceview-devel libmpc-devel libsoup-devel" -depends="desktop-file-utils gsettings-desktop-schemas>=3.12 hicolor-icon-theme" +build_style=meson +hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config vala" +makedepends="gsettings-desktop-schemas-devel gtksourceview-devel libmpc-devel + libsoup-devel" +depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme" short_desc="The GNOME calculator" maintainer="Juan RP " -homepage="http://www.gnome.org" license="GPL-2.0-or-later" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=76879e01360aadbebf4ace7f0b452823727ff7eadfb80011136597605cddcee2 +homepage="https://wiki.gnome.org/Apps/Calculator" +changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-28/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=bad41e322fc82f13f0fa0c773ad96802c272498adf8e2c8b8054549718cefa47 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" gtksourceview-devel" +fi + +case "$XBPS_TARGET_MACHINE" in + arm*|aarch*) broken="error: Package gtksourceview-3.0 not found in specified Vala API directories or GObject-Introspection GIR directories" ;; +esac diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template index 6b6d7eb2d2f..f10706e17f2 100644 --- a/srcpkgs/gnome-chess/template +++ b/srcpkgs/gnome-chess/template @@ -1,9 +1,9 @@ # Template file for 'gnome-chess' pkgname=gnome-chess -version=3.28.0 +version=3.28.1 revision=1 build_style=meson -hostmakedepends="pkg-config vala glib-devel itstool" +hostmakedepends="pkg-config vala glib-devel itstool librsvg-devel" makedepends="gtk+3-devel librsvg-devel" depends="gnuchess" short_desc="GNOME chess user interface" @@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Chess" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=800fe0c8f5c267dca98e7db404d7bc469bbc7342adf3dbde1a9b6c69cd58afef +checksum=61d7eda645ab74fcf6fa586bc3edc49f01d4a4076f98e1e53d4b4c842b600fe1 pre_configure() { sed -i -e '/meson.add_install_script/d' meson.build diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index ee725a3965d..0e44a5e7cf7 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.28.1 +version=3.28.2 revision=1 build_style=meson configure_args="-Dcheese=true" @@ -20,7 +20,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=c65e56d42e2f8d1fd93ea0afe8c4eafcd4594adc45e2b0d8c069d0f557485738 +checksum=ff9e3d7c1693c6004c8a337eb84452d517259b52330081b6b226a8ac5793d734 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gnome-bluetooth -DHAVE_BLUETOOTH" LDFLAGS="-lgnome-bluetooth" diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 780431f0ce1..ea8e8f571b1 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,6 +1,6 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.28.2 +version=3.28.3 revision=1 build_style=meson configure_args="-Dlibsystemd=false" @@ -14,6 +14,6 @@ license="GPL-2.0-or-later" homepage="https://git.gnome.org/browse/gnome-disk-utility" #changelog="https://git.gnome.org/browse/gnome-disk-utility/plain/NEWS?h=gnome-3-28" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a68ebbf5c1cd3d1f467dbe52a13db6a5b7f09cd46c676dfcefd1ae7cc32274c8 +checksum=150d35ccb8932c8b899b18a73c17e2abf36b9620c234186740da36bd18f95285 nocross=https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/5518/steps/shell_3/logs/stdio lib32disabled=yes diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index 26d808ca6c4..6f2a4cdba7c 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,6 +1,6 @@ # Template file for 'gns3-gui' pkgname=gns3-gui -version=2.1.6 +version=2.1.8 revision=1 noarch=yes build_style=python3-module @@ -13,7 +13,7 @@ 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=e467f8907d3f2e3a3a9192b03bffbf210a87bcf1fbf1574925f15b24df136acd +checksum=66465cfdbe6e64c40e112e815d1761b1bffc23ac990e5df77aea79b2ce851692 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 index ed33974988d..7580ba54a6a 100644 --- a/srcpkgs/gns3-server/patches/async-timeout.patch +++ b/srcpkgs/gns3-server/patches/async-timeout.patch @@ -1,9 +1,9 @@ ---- requirements.txt 2018-05-22 14:11:48.000000000 +0200 -+++ - 2018-05-27 14:37:55.136872861 +0200 +--- requirements.txt.orig 2018-06-16 17:35:19.069681399 -0700 ++++ requirements.txt 2018-06-16 17:35:29.289966118 -0700 @@ -8,4 +8,4 @@ zipstream>=1.1.4 typing>=3.5.3.0 # Otherwise yarl fails with python 3.4 - prompt-toolkit + prompt-toolkit==1.0.15 -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 b565f3ea2cf..a0b74f0e857 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,6 +1,6 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=2.1.6 +version=2.1.8 revision=1 build_style=python3-module pycompile_module="gns3server" @@ -13,7 +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=a292be8f0a4ea970e43ea980383f046b2417e7412ff00e171a44453bde8f3463 +checksum=8bccf2ba16832743e0743f11fe19f506172af07c68d2eae156ea1b946415b1a0 pre_build() { # relax requirements diff --git a/srcpkgs/gnuradio-devel b/srcpkgs/gnuradio-devel new file mode 120000 index 00000000000..b51eb16b0b1 --- /dev/null +++ b/srcpkgs/gnuradio-devel @@ -0,0 +1 @@ +gnuradio \ No newline at end of file diff --git a/srcpkgs/gnuradio-doc b/srcpkgs/gnuradio-doc new file mode 120000 index 00000000000..b51eb16b0b1 --- /dev/null +++ b/srcpkgs/gnuradio-doc @@ -0,0 +1 @@ +gnuradio \ No newline at end of file diff --git a/srcpkgs/gnuradio-osmosdr-devel b/srcpkgs/gnuradio-osmosdr-devel new file mode 120000 index 00000000000..eafaf046c55 --- /dev/null +++ b/srcpkgs/gnuradio-osmosdr-devel @@ -0,0 +1 @@ +gnuradio-osmosdr \ No newline at end of file diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template new file mode 100644 index 00000000000..27c1e97028e --- /dev/null +++ b/srcpkgs/gnuradio-osmosdr/template @@ -0,0 +1,26 @@ +# Template file for 'gnuradio-osmosdr' +pkgname=gnuradio-osmosdr +version=0.1.4 +revision=1 +wrksrc="gr-osmosdr-${version}" +build_style=cmake +pycompile_module="osmosdr" +hostmakedepends="pkg-config python-cheetah swig" +makedepends="boost-devel gnuradio-devel libairspy-devel libhackrf-devel librtlsdr-devel + python-devel" +short_desc="GNU Radio source block for rtlsdr, hackrf and airspy" +maintainer="bra1nwave " +license="GPL-3.0-or-later" +homepage="https://sdr.osmocom.org/trac/" +distfiles="https://github.com/osmocom/gr-osmosdr/archive/v${version}.tar.gz" +checksum=bcf9a9b1760e667c41a354e8cd41ef911d0929d5e4a18e0594ccb3320d735066 + +gnuradio-osmosdr-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 35c21e2ee73..669bc30d71d 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,19 +1,42 @@ # Template file for 'gnuradio' pkgname=gnuradio -version=3.7.12git -revision=2 +version=3.7.13.3 +revision=1 build_style=cmake nocross="relies on volk, which is not complete for arm" +conf_files="/etc/gnuradio/conf.d/*" configure_args="-DENABLE_INTERNAL_VOLK=OFF" -hostmakedepends="pkg-config python python-cheetah" -makedepends="boost-devel python-devel pygtk-devel swig volk-devel" +pycompile_module="gnuradio grc_gnuradio pmt" +hostmakedepends="pkg-config doxygen swig python-cheetah python-lxml + python-numpy python-Sphinx" +makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel libgsm-devel + libusb-devel pygtk-devel volk-devel wxPython-devel" short_desc="Framework for software defined radio" maintainer="Andrew Benson " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://www.gnuradio.org" -distfiles="https://github.com/gnuradio/gnuradio/archive/${version}.tar.gz" -checksum=7ff93c4ad4fd9ed4fbfa31f331846961cde48947b309623466290944339e329b +distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz" +checksum=03fc4d63960e1ab1edb881f792f896a47b16e51a04b81abf00db0bd4e5bdb5c1 if [ -n "$CROSS_BUILD" ]; then nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/7596/steps/shell_3/logs/stdio" fi + +gnuradio-doc_package() { + short_desc+=" - documentation" + noarch=yes + pkg_install() { + vmove usr/share/doc + } +} + +gnuradio-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template new file mode 100644 index 00000000000..4873c23e585 --- /dev/null +++ b/srcpkgs/gobuster/template @@ -0,0 +1,18 @@ +# Template file for 'gobuster' +pkgname=gobuster +version=1.4.1 +revision=1 +build_style=go +go_import_path="github.com/OJ/gobuster" +hostmakedepends="git" +short_desc="Directory, file and DNS busting tool" +maintainer="Andrew Benson " +license="Apache-2.0" +homepage="https://github.com/OJ/gobuster" +distfiles="https://github.com/OJ/gobuster/archive/v${version}.tar.gz" +checksum=d5b8032aac6c4e1975b8302a6192274610f601a659253861e71ec5bca1c4da38 + +post_install() { + vdoc README.md + vdoc THANKS +} diff --git a/srcpkgs/godot/patches/fix-32bit.patch b/srcpkgs/godot/patches/fix-32bit.patch deleted file mode 100644 index 4d3de12edb6..00000000000 --- a/srcpkgs/godot/patches/fix-32bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- drivers/unix/os_unix.cpp.orig 2018-04-30 09:53:04.627075270 +0200 -+++ drivers/unix/os_unix.cpp 2018-04-30 09:53:16.892670422 +0200 -@@ -235,7 +235,7 @@ OS::TimeZoneInfo OS_Unix::get_time_zone_ - - void OS_Unix::delay_usec(uint32_t p_usec) const { - -- struct timespec rem = { p_usec / 1000000, (p_usec % 1000000) * 1000 }; -+ struct timespec rem = { (time_t)(p_usec / 1000000), (long)(p_usec % 1000000) * 1000 }; - while (nanosleep(&rem, &rem) == EINTR) { - } - } diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 3de021bd535..99e7ac06056 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,7 +1,7 @@ # Template file for 'godot' pkgname=godot -version=3.0.2 -revision=2 +version=3.0.4 +revision=1 wrksrc="${pkgname}-${version}-stable" build_style=scons hostmakedepends="scons pkg-config clang" @@ -13,7 +13,7 @@ maintainer="Nick Hahn " license="MIT" homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" -checksum=15bc91dcbc92fe49624118678fcab119ff332dc295b25f4921700a4ee498b651 +checksum=ebd2164ecde94c5276fe0420b8b232b13f255c420a1dca6b34e511e17292164e # Godot contains private copies of libraries # that already have been packaged elsewhere. make_build_args="use_llvm=yes platform=x11 tools=yes target=release_debug colored=yes pulseaudio=no" diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template new file mode 100644 index 00000000000..50372d64b7b --- /dev/null +++ b/srcpkgs/goodvibes/template @@ -0,0 +1,21 @@ +# Template file for 'goodvibes' +pkgname=goodvibes +version=0.3.7 +revision=1 +wrksrc="goodvibes-v${version}" +build_style=gnu-configure +hostmakedepends="automake gettext-devel glib-devel pkg-config" +makedepends="dconf-devel gst-plugins-base1-devel gtk+3-devel libkeybinder3-devel + libsoup-devel" +depends="desktop-file-utils hicolor-icon-theme" +short_desc="Light and simple internet radio player" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://gitlab.com/goodvibes/goodvibes" +changelog="https://gitlab.com/goodvibes/goodvibes/raw/v${version}/NEWS" +distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz" +checksum=8d215198ed789c69b7e08b739eb70adc9f4bd14af1cc69e286329c543c5cff91 + +pre_configure() { + ./autogen.sh +} diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index 922f22f2d6d..43a1a0a9a5f 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,5 +1,5 @@ # Template file for 'google-chrome' -_chromeVersion=67.0.3396.79 +_chromeVersion=67.0.3396.87 _chromeRevision=1 _channel=stable @@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64. _chromeUrl="${_baseUrl}/${_filename}" distfiles="${_chromeUrl}" -checksum=9acbef9fe774f1a383d2f4340ee877cf7134b77614051bc16adbcac49577ffe6 +checksum=af07fd34ad1d5e203adbe293472d3dcc50432b0244137ae07d6707bd09b25db0 do_extract() { mkdir -p ${DESTDIR} diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index f2c4da0a369..e6c0299c575 100644 --- a/srcpkgs/gopass/template +++ b/srcpkgs/gopass/template @@ -1,6 +1,6 @@ # Template file for 'gopass' pkgname=gopass -version=1.8.1 +version=1.8.2 revision=1 build_style=go go_import_path=github.com/gopasspw/gopass @@ -10,9 +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" +changelog="https://raw.githubusercontent.com/justwatchcom/gopass/master/CHANGELOG.md" distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz" -checksum=14b016112abaf18427d58009e61999a7d2aff2d49df9a4458ab572532d4b05e8 +checksum=6dc423448c0672fd5087ab75e4c3d8584fb75c93789c9fd68bf14576ab46d1ed nocross=yes post_build() { diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template index f8a92c0ce82..4f43ebae388 100644 --- a/srcpkgs/goxel/template +++ b/srcpkgs/goxel/template @@ -1,6 +1,6 @@ # Template file for 'goxel' pkgname=goxel -version=0.7.3 +version=0.8.0 revision=1 build_style=scons make_build_args="debug=0 werror=0" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://guillaumechereau.github.io/goxel/" distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz" -checksum=56790d96d9d52d37765ac5c59f924c007885daaa6fb2129baea51dff5380c15c +checksum=2fb9328e27b4f24f2ddff9e79f01832661fd626b52fa0079039cbb64a3e704ca if [ "$CROSS_BUILD" ];then pre_build() { @@ -21,11 +21,16 @@ fi case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone";; + i686*) make_build_args+=" cycles=0";; esac do_install() { - sed -i 's|${SNAP}/icon.png|/usr/share/icons/goxel.png|' snap/gui/goxel.desktop + sed -i 's|${SNAP}/icon.png|goxel.png|' snap/gui/goxel.desktop vbin goxel vinstall snap/gui/goxel.desktop 644 usr/share/applications - vinstall icon.png 644 usr/share/icons goxel.png + for size in 16 24 32 48 64 128 256; do + vinstall data/icons/icon${size}.png 644 \ + usr/share/icons/hicolor/${size}x${size}/apps goxel.png + done + vinstall snap/gui/io.github.guillaumechereau.Goxel.appdata.xml 644 usr/share/metainfo } diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template index 6837d17b2f2..f7b4b913add 100644 --- a/srcpkgs/gpodder/template +++ b/srcpkgs/gpodder/template @@ -1,21 +1,21 @@ # Template file for 'gpodder' pkgname=gpodder -version=3.10.2 +version=3.10.3 revision=1 noarch=yes wrksrc="gpodder-${version}" pycompile_module="gpodder" hostmakedepends="python3-devel intltool" makedepends="python3-devel" -depends="python3-podcastparser python3-mygpoclient python3-dbus python3-html5lib eyeD3 - pygtk hicolor-icon-theme python3-gobject" +depends="eyeD3 hicolor-icon-theme pygtk python3-dbus python3-gobject + python3-html5lib python3-mygpoclient python3-podcastparser" checkdepends="${depends} python3-MiniMock" short_desc="Podcast client" maintainer="bra1nwave " license="GPL-3.0-or-later" homepage="https://github.com/gpodder/gpodder" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=8ef79808102bb41ecf14c5cdb4d7dca3ea814cdd6f2050b7a3083a7f005ba7a7 +checksum=a53b23c605b3a92701aed3e318f0695ae2e4de1ba64692337e0a8f77253ebbb1 make_check_target="unittest" do_install() { diff --git a/srcpkgs/gputils/template b/srcpkgs/gputils/template new file mode 100644 index 00000000000..3791ba4557c --- /dev/null +++ b/srcpkgs/gputils/template @@ -0,0 +1,11 @@ +# Template file for 'gputils' +pkgname=gputils +version=1.5.0 +revision=1 +build_style=gnu-configure +short_desc="PIC Programming Utilities" +maintainer="Leandro Vital " +license="GPL-2.0-or-later" +homepage="http://gputils.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=f6a517c186b991f504be5e4585316871d5950568257885d37487bb368dc76227 diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template new file mode 100644 index 00000000000..2b69bc90aa9 --- /dev/null +++ b/srcpkgs/gqrx/template @@ -0,0 +1,27 @@ +# Template file for 'gqrx' +pkgname=gqrx +version=2.11.5 +revision=1 +wrksrc="gqrx-sdr-${version}" +build_style=cmake +configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio) + $(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)" +hostmakedepends="pkg-config" +makedepends="boost-devel gnuradio-devel gnuradio-osmosdr-devel pulseaudio-devel + qt5-svg-devel $(vopt_if portaudio portaudio-devel)" +short_desc="Software defined radio receiver powered by GNU Radio and Qt" +maintainer="bra1nwave " +license="GPL-3.0-or-later" +homepage="http://gqrx.dk/" +distfiles="https://github.com/csete/gqrx/releases/download/v${version}/gqrx-sdr-${version}-src.tar.xz" +checksum=793062ef7b49a3f986b82a255f949cdda42333107fc5fcea10fd13db74157744 + +build_options="gr_audio portaudio" +vopt_conflict gr_audio portaudio +desc_option_gr_audio="Enable support for GNU Radio audio (ALSA and JACK)" +desc_option_portaudio="Enable support for Portaudio" + +post_install() { + vinstall gqrx.desktop 644 usr/share/applications + vinstall resources/icons/gqrx.svg 644 usr/share/pixmaps +} diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template index 9622a6a95c0..e5067ba5db7 100644 --- a/srcpkgs/gradle/template +++ b/srcpkgs/gradle/template @@ -1,6 +1,6 @@ # Template file for 'gradle' pkgname=gradle -version=4.8 +version=4.8.1 revision=1 noarch=yes hostmakedepends="unzip" @@ -8,9 +8,10 @@ depends="virtual?java-environment" short_desc="Build system for Java/C/C++ software" maintainer="Adrian Siekierka " license="Apache-2.0" -homepage="http://gradle.org/" +homepage="https://gradle.org/" +changelog="https://docs.gradle.org/${version}/release-notes.html" distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip" -checksum=f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba +checksum=af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71 nocross=yes do_install() { diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template index 4fc86943842..0e8a89a231b 100644 --- a/srcpkgs/grafana/template +++ b/srcpkgs/grafana/template @@ -1,32 +1,37 @@ # Template file for 'grafana' pkgname=grafana -version=5.0.1 -revision=3 +version=5.1.3 +revision=2 build_style=go go_import_path=github.com/grafana/grafana go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server" short_desc="The open platform for beautiful analytics and monitoring" +hostmakedepends="nodejs-lts yarn" maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://grafana.com" -distfiles="https://github.com/grafana/grafana/archive/v${version}.tar.gz - https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz" -checksum="1874e5036f5cf9abb4ef74d3e2d80291bea91d761137a0890431834667407248 - d3b3304658f3e7a6c3e6de6780094fbaf924a8ae4358a7e2c7f035c405245efe" +distfiles="https://github.com/grafana/grafana/archive/v${version}.tar.gz" +checksum="bbf69d28f4094d231b9033d916969eedee6b18e3787a44f5bda6c632f08251b9" system_accounts="_grafana" _grafana_homedir="/var/lib/grafana" conf_files="/etc/grafana/grafana.ini" +pre_build() { + yarn install --pure-lockfile +} + +post_build() { + yarn run build +} + post_install() { vlicense LICENSE.md vmkdir var/lib/grafana touch ${DESTDIR}/var/lib/grafana/.empty - # These artifacts are pulled from the binary distribution - # because they can't be built by Void. vmkdir usr/share/grafana vcopy public usr/share/grafana/ vcopy conf usr/share/grafana/ diff --git a/srcpkgs/grantleetheme/update b/srcpkgs/grantleetheme/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/grantleetheme/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index 2e29e7b2c84..95f905c49d1 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -1,7 +1,7 @@ # Template file for 'grilo-plugins' pkgname=grilo-plugins version=0.3.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --enable-shoutcast --enable-compile-warnings=no" hostmakedepends="pkg-config intltool itstool glib-devel gnome-doc-utils" @@ -15,5 +15,5 @@ short_desc="Plugins for Grilo" maintainer="Juan RP " license="LGPL-2.1" homepage="http://live.gnome.org/Grilo" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=2977827b8ecb3e15535236180e57dc35e85058d111349bdb6a1597e62a5068fb diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template index 962f75ee97d..30b8a26e95f 100644 --- a/srcpkgs/grilo/template +++ b/srcpkgs/grilo/template @@ -1,7 +1,7 @@ # Template file for 'grilo' pkgname=grilo version=0.3.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-vala $(vopt_enable gir introspection)" hostmakedepends="automake libtool pkg-config gettext-devel intltool gnome-common @@ -11,7 +11,7 @@ short_desc="Framework focused on making media discovery and browsing easy" maintainer="Enno Boland " license="LGPL-2.1" homepage="http://live.gnome.org/Grilo" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=7c6964053b42574c2f14715d2392a02ea5cbace955eb73e067c77aa3e43b066e # Package build options diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template index da1cd2e290b..64c1252d863 100644 --- a/srcpkgs/grub-customizer/template +++ b/srcpkgs/grub-customizer/template @@ -1,7 +1,7 @@ # Template file for 'grub-customizer' pkgname=grub-customizer -version=5.0.6 -revision=3 +version=5.0.8 +revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="gtkmm-devel libressl-devel libarchive-devel" @@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3" homepage="https://launchpad.net/grub-customizer/" distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}_${version}.tar.gz" -checksum=c5a0d21c08b2215170b96294c7d7d96bd7588302b737bb3c06a1112bc074bdd3 +checksum=b00a1650cdc3f0df668289c79beefd1349f9314d33330e38ca4afd1d29f4407c pre_configure() { # Modify desktop file for Void Linux diff --git a/srcpkgs/gsettings-qt-devel b/srcpkgs/gsettings-qt-devel new file mode 120000 index 00000000000..6402e122b23 --- /dev/null +++ b/srcpkgs/gsettings-qt-devel @@ -0,0 +1 @@ +gsettings-qt \ No newline at end of file diff --git a/srcpkgs/gsettings-qt/patches/0001-Fix-link-path-error.patch b/srcpkgs/gsettings-qt/patches/0001-Fix-link-path-error.patch new file mode 100644 index 00000000000..96f9d0f7a31 --- /dev/null +++ b/srcpkgs/gsettings-qt/patches/0001-Fix-link-path-error.patch @@ -0,0 +1,24 @@ +From: Iceyer +Date: Thu, 20 Jul 2017 16:01:55 +0800 +Subject: Fix link path error +Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path + +This patch would fix the FTBFS on Debian. + +--- + GSettings/gsettings-qt.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/GSettings/gsettings-qt.pro b/GSettings/gsettings-qt.pro +index 218eeea..ffd9b5f 100644 +--- GSettings/gsettings-qt.pro ++++ GSettings/gsettings-qt.pro +@@ -4,7 +4,7 @@ QT -= gui + CONFIG += qt plugin no_keywords link_pkgconfig + PKGCONFIG += gio-2.0 + INCLUDEPATH += ../src . +-LIBS += -L../src -lgsettings-qt ++LIBS += -L$$(PWD)/../src -lgsettings-qt + + TARGET = GSettingsQmlPlugin + diff --git a/srcpkgs/gsettings-qt/patches/0002-Add-ordered-config.patch b/srcpkgs/gsettings-qt/patches/0002-Add-ordered-config.patch new file mode 100644 index 00000000000..af74a82330a --- /dev/null +++ b/srcpkgs/gsettings-qt/patches/0002-Add-ordered-config.patch @@ -0,0 +1,25 @@ +From: Iceyer +Date: Fri, 21 Jul 2017 14:43:24 +0800 +Subject: Add ordered config +Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path + +This patch would fix random FTBFS when doing parallel build after +debhelper v10 due to tests built before real libraries. + +--- + gsettings-qt.pro | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gsettings-qt.pro gsettings-qt.pro +index 15e3684..ee04310 100644 +--- a/gsettings-qt.pro ++++ gsettings-qt.pro +@@ -1,2 +1,7 @@ + TEMPLATE = subdirs +-SUBDIRS += src/gsettings-qt.pro GSettings/gsettings-qt.pro tests/tests.pro tests/cpptest.pro ++CONFIG += ordered ++SUBDIRS += \ ++ src/gsettings-qt.pro \ ++ GSettings/gsettings-qt.pro \ ++ tests/tests.pro \ ++ tests/cpptest.pro diff --git a/srcpkgs/gsettings-qt/patches/0003-Fix-make-check-failed.patch b/srcpkgs/gsettings-qt/patches/0003-Fix-make-check-failed.patch new file mode 100644 index 00000000000..ece1a6f0ad6 --- /dev/null +++ b/srcpkgs/gsettings-qt/patches/0003-Fix-make-check-failed.patch @@ -0,0 +1,37 @@ +From: Iceyer +Date: Fri, 4 Aug 2017 19:03:59 +0800 +Subject: Fix make check failed +Forwarded: https://code.launchpad.net/~iceyers/gsettings-qt/fix-link-path + +This commit would fix the failure when invoking "make check". +--- + tests/cpptest.pro | 3 ++- + tests/tests.pro | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/cpptest.pro tests/cpptest.pro +index 68b3b49..ec46730 100644 +--- a/tests/cpptest.pro ++++ tests/cpptest.pro +@@ -3,7 +3,8 @@ QT += testlib + QT -= gui + CONFIG += testcase link_pkgconfig + TARGET = cpptest +-IMPORTPATH = $$PWD/.. ++IMPORTPATH = $$(PWD)/.. ++QMAKE_RPATHDIR += $$(PWD)/../src + SOURCES = cpptest.cpp + INCLUDEPATH += $$(PWD)/../src + LIBS += -L$$(PWD)/../src -lgsettings-qt +diff --git a/tests/tests.pro tests/tests.pro +index 6e3a388..2183584 100644 +--- a/tests/tests.pro ++++ tests/tests.pro +@@ -4,6 +4,7 @@ QT -= gui + CONFIG += qmltestcase + TARGET = test + IMPORTPATH = $$PWD/.. ++QMAKE_RPATHDIR += $$PWD/../src + SOURCES = test.cpp + + schema.target = gschemas.compiled diff --git a/srcpkgs/gsettings-qt/template b/srcpkgs/gsettings-qt/template new file mode 100644 index 00000000000..1d65853fc18 --- /dev/null +++ b/srcpkgs/gsettings-qt/template @@ -0,0 +1,39 @@ +# Template file for 'gsettings-qt' +pkgname=gsettings-qt +version=0.1+17.10.20170824 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-declarative" +makedepends="qt5-devel qt5-declarative-devel glib-devel" +short_desc="Qml bindings for GSettings" +maintainer="John " +license="LGPL-3.0-only" +homepage="https://launchpad.net/gsettings-qt" +distfiles="$DEBIAN_SITE/main/g/gsettings-qt/gsettings-qt_${version}.orig.tar.gz" +checksum=a3d1020d526ece2319f1e8f05876e456e85279741653008e05c5d7e8b019c9b9 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-devel qt5-declarative-devel" +fi + +pre_configure() { + #disable generation for qmltypes file while cross building + #also makes trouble x86_64-musl so just remove it for everything + if [ "$CROSS_BUILD" ] || [ "${XBPS_TARGET_MACHINE#*-musl}" != "$XBPS_TARGET_MACHINE" ];then + sed -i -e '/qmltypes/ d' GSettings/gsettings-qt.pro + fi +} + +post_install() { + rm -r ${DESTDIR}/usr/tests +} + +gsettings-qt-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/gsl/template b/srcpkgs/gsl/template index 69a0ee2fded..5a3faf0b237 100644 --- a/srcpkgs/gsl/template +++ b/srcpkgs/gsl/template @@ -1,14 +1,14 @@ # Template file for 'gsl' pkgname=gsl -version=2.4 +version=2.5 revision=1 build_style=gnu-configure short_desc="A numerical library for C and C++ programmers" maintainer="Juan RP " +license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/gsl/gsl.html" -license="GPL-3" -distfiles="$GNU_SITE/gsl/$pkgname-$version.tar.gz" -checksum=4d46d07b946e7b31c19bbf33dda6204d7bedc2f5462a1bae1d4013426cd1ce9b +distfiles="${GNU_SITE}/gsl/${pkgname}-${version}.tar.gz" +checksum=0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d gsl-devel_package() { depends="gsl>=${version}_${revision}" diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template index a04a2172c2e..030b69c74dc 100644 --- a/srcpkgs/gsoap/template +++ b/srcpkgs/gsoap/template @@ -1,10 +1,9 @@ # Template file for 'gsoap' pkgname=gsoap -version=2.8.65 -revision=2 +version=2.8.68 +revision=1 +wrksrc="gsoap-${version%.*}" build_style=gnu-configure -wrksrc="${pkgname}-${version%.*}" -disable_parallel_build=yes configure_args="--enable-ipv6" hostmakedepends="unzip flex autoconf" makedepends="libressl-devel zlib-devel" @@ -13,7 +12,8 @@ maintainer="Enno Boland " license="gSOAP-1.3b, GPL-2.0-only" homepage="http://www.cs.fsu.edu/~engelen/soap.html" distfiles="${SOURCEFORGE_SITE}/gsoap2/gsoap_${version}.zip" -checksum=34f20170afdeb355cb3a42d87e17efb3fbb299566588d7bd9c30dd1ec02f69c7 +checksum=2e470f54d89d03f0eba03bd60b7f345003177315043b6406e80e5883437cf649 +disable_parallel_build=yes if [ "$CROSS_BUILD" ]; then hostmakedepends+=" gsoap" diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template index 79925f698e7..b384ecd1c55 100644 --- a/srcpkgs/gspell/template +++ b/srcpkgs/gspell/template @@ -1,6 +1,6 @@ # Template file for 'gspell' pkgname=gspell -version=1.8.0 +version=1.8.1 revision=1 build_style=gnu-configure configure_args="--disable-static @@ -11,8 +11,8 @@ short_desc="Flexible API to add spell checking to a GTK+ application" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="http://www.gnome.org" -distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-$version.tar.xz" -checksum=1b7fc2c5b84ede43bc52d513f0601238af92b572a42b19363da6d067fb529345 +distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz" +checksum=819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5 # Package build options build_options="gir" diff --git a/srcpkgs/gstreamer1-pipewire b/srcpkgs/gstreamer1-pipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/gstreamer1-pipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/gtk-sharp2/template b/srcpkgs/gtk-sharp2/template new file mode 100644 index 00000000000..34835835c4d --- /dev/null +++ b/srcpkgs/gtk-sharp2/template @@ -0,0 +1,15 @@ +# Template file for 'gtk-sharp2' +pkgname=gtk-sharp2 +version=2.12.45 +revision=1 +wrksrc="gtk-sharp-${version}" +build_style=gnu-configure +configure_args="--disable-static" +hostmakedepends="pkg-config mono" +makedepends="mono-devel gtk+-devel libglade-devel" +maintainer="John " +short_desc="Graphical User Interface Toolkit for mono and .Net (Gtk#)" +license="LGPL-2.1-only" +homepage="http://www.mono-project.com/docs/gui/gtksharp/" +distfiles="http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${version}.tar.gz" +checksum=02680578e4535441064aac21d33315daa009d742cab8098ac8b2749d86fffb6a diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template index ebc32bf87b3..e3145fd5f1a 100644 --- a/srcpkgs/gtkd/template +++ b/srcpkgs/gtkd/template @@ -1,6 +1,6 @@ # Template file for 'gtkd' pkgname=gtkd -version=3.8.2 +version=3.8.3 revision=2 wrksrc="GtkD-${version}" build_style=gnu-makefile @@ -8,11 +8,12 @@ hostmakedepends="ldc pkg-config" makedepends="gstreamer1-devel gtksourceview-devel libpeas-devel librsvg-devel vte3-devel" short_desc="D bindings for GTK+3 and related libraries" -maintainer="maxice8 " +maintainer="Orphaned " license="LGPL-3.0-or-later" -homepage="http://gtkd.org" +homepage="https://gtkd.org" +#changelog="https://gtkd.org/changelog.html" distfiles="https://github.com/gtkd-developers/GtkD/archive/v${version}.tar.gz" -checksum=680582e27fcc28dbc894d4aefc5e73bcdd0911c6e31ade229de0ecf7050184ee +checksum=7e0b2a10a4908b183ba842d54e9b1dc0761dcf316b65766f430010fe3bb95593 make_build_args="LDFLAGS='' DC=ldc2" # The compiler used is ldc2 and our LDFLAGS make it fail to compile # so we define LDFLAGS to an empty string @@ -23,53 +24,125 @@ make_install_target="install-shared-gstreamer install-headers-gstreamer install-shared-peas install-headers-peas install-shared-vte install-headers-vte" +case "$XBPS_TARGET_MACHINE" in + *-musl) broken="ldc is broken" ;; +esac + do_check() { make DC=ldc2 LDFLAGS='' test } libpeasd_package() { - short_desc="Peasd library" + short_desc+=" - peasd library" pkg_install() { - vmove "usr/lib/libpeasd*.so.*" + vmove "usr/lib/libpeasd-3.so.*" + } +} + +libpeasd-devel_package() { + depends="libpeasd-${version}_${revision} gtkd-devel-${version}_${revision}" + short_desc+=" - peasd development headers" + pkg_install() { + vmove usr/include/d/gtkd-3/peas + vmove usr/include/d/gtkd-3/peasc + vmove usr/lib/libpeasd-3.so + vmove usr/share/pkgconfig/peasd-3.pc } } libgtkdgl_package() { - short_desc="Gtkdgl library" + short_desc+=" - gtkdgl library" pkg_install() { - vmove "usr/lib/libgtkdgl*.so.*" + vmove "usr/lib/libgtkdgl-3.so.*" + } +} + +libgtkdgl-devel_package() { + depends="libgtkdgl-${version}_${revision} gtkd-devel-${version}_${revision}" + short_desc+=" - gtkdgl development headers" + pkg_install() { + vmove usr/include/d/gtkd-3/glgtk + vmove usr/include/d/gtkd-3/glgdk + vmove usr/include/d/gtkd-3/gtkglc + vmove usr/lib/libgtkdgl-3.so + vmove usr/share/pkgconfig/gtkdgl-3.pc } } libvted_package() { - short_desc="Vted library" + short_desc+=" - vted library" pkg_install() { - vmove "usr/lib/libvted*.so.*" + vmove "usr/lib/libvted-3.so.*" + } +} + +libvted-devel_package() { + depends="libvted-${version}_${revision} gtkd-devel-${version}_${revision}" + short_desc+=" - vted development headers" + pkg_install() { + vmove usr/include/d/gtkd-3/vte + vmove usr/include/d/gtkd-3/vtec + vmove usr/lib/libvted-3.so + vmove usr/share/pkgconfig/vted-3.pc } } libgstreamerd_package() { - short_desc="Gstreamerd library" + short_desc+=" - gstreamerd library" pkg_install() { - vmove "usr/lib/libgstreamerd*.so.*" + vmove "usr/lib/libgstreamerd-3.so.*" + } +} + +libgstreamerd-devel_package() { + depends="libgstreamerd-${version}_${revision} gtkd-devel-${version}_${revision}" + short_desc+=" - gstreamerd development headers" + pkg_install() { + vmove usr/include/d/gtkd-3/gst + vmove usr/include/d/gtkd-3/gstinterfaces + vmove usr/include/d/gtkd-3/gstreamer + vmove usr/include/d/gtkd-3/gstreamerc + vmove usr/lib/libgstreamerd-3.so + vmove usr/share/pkgconfig/gstreamerd-3.pc } } libgtkdsv_package() { - short_desc="Gtkdsv library" + short_desc+=" - gtkdsv library" pkg_install() { - vmove "usr/lib/libgtkdsv*.so.*" + vmove "usr/lib/libgtkdsv-3.so.*" + } +} + +libgtkdsv-devel_package() { + depends="libgtkdsv-${version}_${revision} gtkd-devel-${version}_${revision}" + short_desc+=" - gtkdsv development headers" + pkg_install() { + vmove usr/include/d/gtkd-3/gsv + vmove usr/include/d/gtkd-3/gsvc + vmove usr/lib/libgtkdsv-3.so + vmove usr/share/pkgconfig/gtkdsv-3.pc } } gtkd-devel_package() { - short_desc+=" - development files" - depends="gtkd-${version}_${revision} libpeasd-${version}_${revision} - libgstreamerd-${version}_${revision} libvted-${version}_${revision} - libgtkdsv-${version}_${revision} libgtkdgl-${version}_${revision}" + short_desc+=" - gtkd development files" + depends="gtkd-${version}_${revision}" pkg_install() { - vmove usr/include - vmove usr/share/pkgconfig - vmove "usr/lib/*.so" + vmove usr/include/d/gtkd-3/atk + vmove usr/include/d/gtkd-3/cairo + vmove usr/include/d/gtkd-3/gdk + vmove usr/include/d/gtkd-3/gdkpixbuf + vmove usr/include/d/gtkd-3/gio + vmove usr/include/d/gtkd-3/glib + vmove usr/include/d/gtkd-3/gobject + vmove usr/include/d/gtkd-3/gthread + vmove usr/include/d/gtkd-3/gtk + vmove usr/include/d/gtkd-3/gtkc + vmove usr/include/d/gtkd-3/gtkd + vmove usr/include/d/gtkd-3/pango + vmove usr/include/d/gtkd-3/rsvg + vmove usr/lib/libgtkd-3.so + vmove usr/share/pkgconfig/gtkd-3.pc } } diff --git a/srcpkgs/gtkedit/template b/srcpkgs/gtkedit/template index aa0da4eb781..279116ae171 100644 --- a/srcpkgs/gtkedit/template +++ b/srcpkgs/gtkedit/template @@ -1,18 +1,18 @@ # Template file for 'gtkedit' pkgname=gtkedit -version=0.1.8 -revision=2 +version=0.1.9 +revision=1 wrksrc="gtkwrite-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="gtk+-devel" depends="desktop-file-utils" -maintainer="cr6git " short_desc="Text Editor written in C and Gtk+2" +maintainer="cr6git " +license="GPL-2.0-or-later" homepage="https://github.com/drankinatty/gtkwrite" -license="GPL-2" distfiles="https://github.com/drankinatty/gtkwrite/archive/v${version}.tar.gz" -checksum=bcca9e6dbdfafe9c77204ff0dee57678286fd9c5b6fd21e73d11b6652f0c076f +checksum=7d00a9124baa367f840b0cf2026d2d27f6fc41e4e0a01a7a293f5ebb91fd01dd # Without GtkSourceView it will compile as 'gtkedit' # With GtkSourceView it compiles as 'gtkwrite' diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template index 393a92e38a3..61db9f3a00b 100644 --- a/srcpkgs/gtkwave/template +++ b/srcpkgs/gtkwave/template @@ -1,17 +1,17 @@ # Template file for 'gtkwave' pkgname=gtkwave -version=3.3.89 +version=3.3.91 revision=1 build_style=gnu-configure +configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="gperf pkg-config" makedepends="gtk+-devel tk-devel" short_desc="Fully featured GTK+ based wave viewer" maintainer="allan " license="GPL-2.0-or-later, MIT" homepage="http://gtkwave.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=af10558beed7cec6758fcd4bca989cec117589def29d709b31eaaa3a81f7ebc8 -configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib" +distfiles="http://gtkwave.sourceforge.net/gtkwave-${version}.tar.gz" +checksum=82a42fba9fd6e8e5e07da40d9759a881ed9e40dc52dd31a519953bcf87c4e9ee post_install() { # MIT license diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index f4320a1eb11..a37b9d08f14 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -1,23 +1,29 @@ # Template file for 'guitarix2' pkgname=guitarix2 -version=0.36.1 +version=0.37.1 revision=1 wrksrc="guitarix-${version}" build_style=waf -configure_args="--no-faust --no-lv2" -hostmakedepends="python pkg-config intltool gperf" -makedepends="boost-devel gtkmm2-devel liblrdf-devel eigen - libbluetooth-devel zita-convolver-devel zita-resampler-devel jack-devel - libsndfile-devel fftw-devel ladspa-sdk lilv-devel sratom-devel avahi-glib-libs-devel" +configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust --no-lv2 + $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')" +make_build_args="--progress" +hostmakedepends="gperf intltool pkg-config" +makedepends="boost-devel eigen fftw-devel gtkmm2-devel jack-devel + ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel sratom-devel + zita-convolver-devel zita-resampler-devel + $(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)" depends="desktop-file-utils" -maintainer="cr6git " short_desc="Virtual guitar amplifier running on Jack Audio Connection Kit" +maintainer="cr6git " +license="GPL-3.0-or-later" homepage="http://guitarix.org" -license="GPL-2" distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz" -checksum=608d641bebed88691b2f2154606bc99d0785565b6c0e2d7b29c70ac86522a9bc +checksum=51a9375ef12e0e7242c7a346253fcf7f296d55fcd2a88f1c7fa93fdcbf049318 + +build_options="avahi bluez" +desc_option_avahi="Build with avahi support" +desc_option_bluez="Build with bluez support" -CFLAGS="-fpermissive" CXXFLAGS="-fpermissive" case "$XBPS_TARGET_MACHINE" in @@ -29,7 +35,7 @@ if [ -n "$CROSS_BUILD" ]; then CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/raptor2" post_extract() { # don’t test load the ladspa plugin when cross compiling - sed -i -e "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript + sed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript } fi diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 9287121aa00..05f6e696f1c 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,7 +1,7 @@ # Template file for 'gvfs' pkgname=gvfs version=1.36.2 -revision=1 +revision=2 build_style=meson configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false" hostmakedepends="docbook-xsl glib-devel intltool libxslt openssh pkg-config" diff --git a/srcpkgs/gwenview/update b/srcpkgs/gwenview/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/gwenview/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template index aef48b9d516..f9d6f1e8427 100644 --- a/srcpkgs/gzdoom/template +++ b/srcpkgs/gzdoom/template @@ -1,8 +1,8 @@ # Template file for 'gzdoom' pkgname=gzdoom -version=3.2.5 -revision=2 -_tagdate=2018-01-03 +version=3.4.1 +revision=1 +_tagdate=2018-06-16 wrksrc=${pkgname}-g${version} build_style=cmake configure_args="-DINSTALL_PK3_PATH=share/gzdoom" @@ -11,12 +11,12 @@ makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel depends="libfluidsynth gtk+3" short_desc="Advanced Doom source port with OpenGL support" maintainer="Michael Straube " -license="GPL-3" -homepage="http://www.zdoom.org" +license="GPL-3.0-or-later" +homepage="https://www.zdoom.org" distfiles="https://github.com/coelckers/${pkgname}/archive/g${version}.tar.gz https://github.com/coelckers/${pkgname}/releases/download/g${version}/${pkgname}_${version}_armhf.deb" -checksum="e9cf0aa5b7ee0b165532dee55e4965f6aabf1acadb79f7372f8e362540206748 - 2db1ea9c20ede1e07b6bcb6e6c45c984e1795c3ab716a6cca5c227ed6d900df5" +checksum="295a006417a13c1996c89d9ebf87457788371a9e2576dbcffc04a55576e300f7 + f1824fe1a677b6d1f6bd1a17271e15756ac88f8881baaf8db9d0c825a30dae2d" skip_extraction="${pkgname}_${version}_armhf.deb" nocross=yes @@ -35,7 +35,7 @@ post_extract() { sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h - sed -i 's|"/usr/share/games/doom"|"/usr/share/gzdoom"|g' src/gameconfigfile.cpp + sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp } post_install() { @@ -43,5 +43,5 @@ post_install() { mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}} vinstall gzdoom.desktop 644 usr/share/applications vinstall gzdoom.png 644 usr/share/pixmaps - vinstall soundfont/gzdoom.sf2 644 usr/share/gzdoom + vinstall soundfont/gzdoom.sf2 644 usr/share/gzdoom/soundfonts } diff --git a/srcpkgs/haproxy/patches/fix-libressl-2.5.patch b/srcpkgs/haproxy/patches/fix-libressl-2.5.patch deleted file mode 100644 index 578d64e3bcb..00000000000 --- a/srcpkgs/haproxy/patches/fix-libressl-2.5.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- src/ssl_sock.c.orig 2017-01-13 09:03:00 UTC -+++ src/ssl_sock.c -@@ -792,8 +792,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c - ocsp = NULL; - - #ifndef SSL_CTX_get_tlsext_status_cb --# define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ -- *cb = (void (*) (void))ctx->tlsext_status_cb; -+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB -+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128 -+#endif -+#define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ -+ *cb = SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb) - #endif - SSL_CTX_get_tlsext_status_cb(ctx, &callback); - -@@ -821,7 +824,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c - int key_type; - EVP_PKEY *pkey; - --#ifdef SSL_CTX_get_tlsext_status_arg -+#if defined(SSL_CTX_get_tlsext_status_arg) || defined(LIBRESSL_VERSION_NUMBER) -+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG -+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129 -+#endif - SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg); - #else - cb_arg = ctx->tlsext_status_arg; -@@ -3537,7 +3543,7 @@ int ssl_sock_handshake(struct connection - OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx); - empty_handshake = state == TLS_ST_BEFORE; - #else -- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length; -+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE; - #endif - - if (empty_handshake) { -@@ -3615,7 +3621,7 @@ int ssl_sock_handshake(struct connection - state = SSL_get_state((SSL *)conn->xprt_ctx); - empty_handshake = state == TLS_ST_BEFORE; - #else -- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length; -+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE; - #endif - if (empty_handshake) { - if (!errno) { diff --git a/srcpkgs/haproxy/patches/libressl-2.7.patch b/srcpkgs/haproxy/patches/libressl-2.7.patch new file mode 100644 index 00000000000..6c348dc5271 --- /dev/null +++ b/srcpkgs/haproxy/patches/libressl-2.7.patch @@ -0,0 +1,104 @@ +diff --git a/include/proto/openssl-compat.h include/proto/openssl-compat.h +index b6fe1d2..551cae2 100644 +--- a/include/proto/openssl-compat.h ++++ include/proto/openssl-compat.h +@@ -89,7 +89,7 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned cha + } + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) || defined(OPENSSL_IS_BORINGSSL) ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x20700000L)) || defined(OPENSSL_IS_BORINGSSL) + /* + * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL / BoringSSL + */ +@@ -121,7 +121,7 @@ static inline const OCSP_CERTID *OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP * + + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x20700000L)) + /* + * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL + */ +diff --git a/src/ssl_sock.c src/ssl_sock.c +index c2b5bf6..ebde76d 100644 +--- a/src/ssl_sock.c ++++ src/ssl_sock.c +@@ -56,6 +56,14 @@ + #include + #endif + ++#if defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_NO_ASYNC) ++#define OPENSSL_NO_ASYNC ++#endif ++ ++#if defined(SSL_READ_EARLY_DATA_ERROR) && defined(SSL_READ_EARLY_DATA_SUCCESS) ++#define HAVE_SSL_READ_EARLY ++#endif ++ + #if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(OPENSSL_NO_ASYNC) + #include + #endif +@@ -2066,7 +2074,7 @@ static void ssl_sock_switchctx_set(SSL *ssl, SSL_CTX *ctx) + SSL_set_SSL_CTX(ssl, ctx); + } + +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) || defined(OPENSSL_IS_BORINGSSL) ++#if ((OPENSSL_VERSION_NUMBER >= 0x10101000L) || defined(OPENSSL_IS_BORINGSSL)) && !defined(LIBRESSL_VERSION_NUMBER) + + static int ssl_sock_switchctx_err_cbk(SSL *ssl, int *al, void *priv) + { +@@ -3798,7 +3806,7 @@ ssl_sock_initial_ctx(struct bind_conf *bind_conf) + #ifdef OPENSSL_IS_BORINGSSL + SSL_CTX_set_select_certificate_cb(ctx, ssl_sock_switchctx_cbk); + SSL_CTX_set_tlsext_servername_callback(ctx, ssl_sock_switchctx_err_cbk); +-#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX_set_client_hello_cb(ctx, ssl_sock_switchctx_cbk, NULL); + SSL_CTX_set_tlsext_servername_callback(ctx, ssl_sock_switchctx_err_cbk); + #else +@@ -5052,7 +5060,7 @@ int ssl_sock_handshake(struct connection *conn, unsigned int flag) + if (!conn->xprt_ctx) + goto out_error; + +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if HAVE_SSL_READ_EARLY + /* + * Check if we have early data. If we do, we have to read them + * before SSL_do_handshake() is called, And there's no way to +@@ -5252,7 +5260,7 @@ check_error: + goto out_error; + } + } +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if HAVE_SSL_READ_EARLY + else { + /* + * If the server refused the early data, we have to send a +@@ -5375,7 +5383,7 @@ static int ssl_sock_to_buf(struct connection *conn, struct buffer *buf, int coun + continue; + } + +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if OPENSSL_READ_EARLY + if (conn->flags & CO_FL_EARLY_SSL_HS) { + size_t read_length; + +@@ -5512,7 +5520,7 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl + * in which case we accept to do it once again. + */ + while (buf->o) { +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if HAVE_SSL_EARLY_DATA + size_t written_data; + #endif + +@@ -5531,7 +5539,7 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl + conn->xprt_st |= SSL_SOCK_SEND_UNLIMITED; + } + +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if HAVE_SSL_EARLY_DATA + if (!SSL_is_init_finished(conn->xprt_ctx)) { + unsigned int max_early; + diff --git a/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch b/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch deleted file mode 100644 index 474a51e22bc..00000000000 --- a/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-include_proto_openssl-compat_h,v 1.6 2018/03/20 21:57:55 sthen Exp $ - -Index: include/proto/openssl-compat.h ---- include/proto/openssl-compat.h.orig -+++ include/proto/openssl-compat.h -@@ -89,7 +89,8 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESS - } - #endif - --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - /* - * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL - */ diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index d5821df2f41..f9e727e3b03 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -1,6 +1,6 @@ # Template file for 'haproxy' pkgname=haproxy -version=1.7.11 +version=1.8.11 revision=1 build_style=gnu-makefile make_build_args="TARGET=linux2628 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 @@ -12,7 +12,7 @@ maintainer="Eivind Uggedal " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.haproxy.org" distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz" -checksum=d564b8e9429d1e8e13cb648bf4694926b472e36da1079df946bb732927b232ea +checksum=b4b403ceb5efe3c65c6d86e1a44fc0953189f12cdf0bd884e5df04bbabb27947 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}" conf_files="/etc/${pkgname}/${pkgname}.cfg" system_accounts="${pkgname}" @@ -21,11 +21,14 @@ haproxy_homedir="/var/lib/${pkgname}" case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-D__LINUX_NETFILTER_H";; esac +case "$XBPS_TARGET_MACHINE" in + armv[56]*|mips*) ADDLIB="-latomic"; makedepends+=" libatomic-devel";; +esac do_build() { make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \ - ${make_build_args} + ADDLIB="${ADDLIB}" ${make_build_args} } post_install() { diff --git a/srcpkgs/hexer/patches/Makefile.patch b/srcpkgs/hexer/patches/Makefile.patch deleted file mode 100644 index dbe4c303ff9..00000000000 --- a/srcpkgs/hexer/patches/Makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile 2017-09-15 14:12:23.848961346 +1000 -+++ Makefile 2017-09-15 15:01:32.364872161 +1000 -@@ -2,6 +2,7 @@ - - # Copyright (c) 1995,1996 Sascha Demetrio - # Copyright (c) 2009 - 2011, 2014 - 2016 Peter Pentchev -+# Copyright (c) 2017 Alastair Knowles - - # It might be helpful to read the `README'-file first. - -@@ -70,11 +71,10 @@ $(HEXER): $(OBJECTS) - $(MYC): calc.c config.h - $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -DMYCALC=1 -o $@ calc.c -lm - --bin2c: bin2c.c -- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ bin2c.c -- --helptext.c: help.txt bin2c -- ./bin2c -n helptext -o $@ help.txt -+helptext.c: help.txt -+ $(file >$@,char helptext[] = {) -+ $(file >>$@,$(shell cat help.txt | xxd -i)) -+ $(file >>$@,, 0};) - - .c.o: config.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< diff --git a/srcpkgs/hexer/patches/fix-cross.patch b/srcpkgs/hexer/patches/fix-cross.patch new file mode 100644 index 00000000000..111fce0f3ff --- /dev/null +++ b/srcpkgs/hexer/patches/fix-cross.patch @@ -0,0 +1,22 @@ +--- Makefile ++++ Makefile +@@ -29,8 +29,8 @@ CPPFLAGS_STD ?= -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 \ + CPPFLAGS += $(CPPFLAGS_STD) -DHEXER_VERSION=\"1.0.4\" + + # -- Which compiler? -- +-CC ?= cc +-CC_FOR_BUILD ?= $(CC) ++CC := cc ++CC_FOR_BUILD := $(CC) + CFLAGS ?= -O + LDFLAGS ?= + LDLIBS = $(LTERMCAP) -lm +@@ -72,7 +72,7 @@ $(MYC): calc.c config.h + $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -DMYCALC=1 -o $@ calc.c -lm + + bin2c: bin2c.c +- $(CC_FOR_BUILD) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ bin2c.c ++ $(CC_FOR_BUILD) $(HOSTCPPFLAGS) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ bin2c.c + + helptext.c: help.txt bin2c + ./bin2c -n helptext -o $@ help.txt diff --git a/srcpkgs/hexer/template b/srcpkgs/hexer/template index ea4c75437d2..be358ff2b56 100644 --- a/srcpkgs/hexer/template +++ b/srcpkgs/hexer/template @@ -1,17 +1,18 @@ # Template file for 'hexer' pkgname=hexer -version=1.0.3 +version=1.0.4 revision=1 build_style=gnu-makefile +make_build_args="CC_FOR_BUILD=cc" make_install_args="MANDIR=/usr/share/man/man1" hostmakedepends="xxd" makedepends="ncurses-devel" short_desc="A multi-buffered hex editor for binary files, with a vi like interface" maintainer="Aloz1 " -license="BSD" +license="BSD-3-Clause" homepage="https://devel.ringlet.net/editors/hexer/" distfiles="https://devel.ringlet.net/files/editors/hexer/hexer-${version}.tar.xz" -checksum=0cc09ef5fc256859ad55fd0aa8421bbdf70fc463fcbbc9f52d925a9569136fa8 +checksum=757005881d210e72764d43f366782fec40cf8a4e143904242996d5366030223d post_install() { vlicense COPYRIGHT diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template index b10e1128977..b4f065d6bb9 100644 --- a/srcpkgs/hiawatha/template +++ b/srcpkgs/hiawatha/template @@ -1,7 +1,7 @@ # Template file for 'hiawatha' pkgname=hiawatha version=10.8.1 -revision=1 +revision=2 build_style=cmake configure_args=" -DLOG_DIR=/var/log/hiawatha diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template index 352a47e2494..924239294ed 100644 --- a/srcpkgs/hopper/template +++ b/srcpkgs/hopper/template @@ -1,6 +1,6 @@ # Template file for 'hopper' pkgname=hopper -version=4.3.24 +version=4.3.25 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=7fec505b744d06adc19d55a6e03a00bd661f55324d65ee33d32c8a1425920332 +checksum=c7c84970948adee93af3605d12685b94fa67a9e8a42ae0da38e353186ae7e898 only_for_archs="x86_64" restricted=yes diff --git a/srcpkgs/hostfw/template b/srcpkgs/hostfw/template index 4a93d4ac245..e8c96d8af30 100644 --- a/srcpkgs/hostfw/template +++ b/srcpkgs/hostfw/template @@ -1,22 +1,23 @@ # Template file for 'hostfw' pkgname=hostfw -version=0.6.1 +version=0.6.3 revision=1 -build_style=gnu-makefile +build_style=fetch depends="iptables" short_desc="Simple host-based permit-by-exception iptables generation script" maintainer="Andrew Benson " -license="BSD" +license="MIT" homepage="https://github.com/abenson/hostfw/" -distfiles="https://github.com/abenson/hostfw/archive/v${version}.tar.gz" -checksum=5a27291222f2936e295ebc0a517931b5a261026f3c3b01b1bb688955c297ac1e +distfiles="https://raw.githubusercontent.com/abenson/hostfw/v${version}/firewall + https://raw.githubusercontent.com/abenson/hostfw/v${version}/COPYING.md + https://raw.githubusercontent.com/abenson/hostfw/v${version}/firewall.1" +checksum="f1bbc0aad05293b0bcff015f882f9eb07edca84f95ab397dbd286ca5ff8e55bd + 7e20135e01e8a6b71475b05836e248fcd3f365ada3cbc0634c911f27d807d679 + b0ae64d28f62cfd5b0121572e243762a44df70dd24d471b5327dfe650fb6c37e" +noarch=yes do_install() { vbin firewall vman firewall.1 + vlicense COPYING.md LICENSE } - -post_install() { - vlicense COPYING.md -} - diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 108cd88b382..5fc8150c6cb 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,6 +1,6 @@ # Template file for 'hplip' pkgname=hplip -version=3.18.4 +version=3.18.6 revision=1 build_style=gnu-configure configure_args=" @@ -30,7 +30,7 @@ maintainer="Juan RP " license="GPL-2.0-only, BSD-3-Clause, MIT" homepage="https://developers.hp.com/hp-linux-imaging-and-printing" distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz" -checksum=0a6a019cba53da5d1055d865afa04438d3651f4f4618dd555e6c1949be71e824 +checksum=0ecf3e68b09480f602de81798ac00774cf8ffe754692e784bbbe0f9b2e337b7d conflicts="hplip-gui" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/usr/include/python2.7" diff --git a/srcpkgs/htmlcxx-devel b/srcpkgs/htmlcxx-devel new file mode 120000 index 00000000000..0469ee84c4e --- /dev/null +++ b/srcpkgs/htmlcxx-devel @@ -0,0 +1 @@ +htmlcxx \ No newline at end of file diff --git a/srcpkgs/htmlcxx/template b/srcpkgs/htmlcxx/template new file mode 100644 index 00000000000..30cf9918303 --- /dev/null +++ b/srcpkgs/htmlcxx/template @@ -0,0 +1,21 @@ +# Template file for 'htmlcxx' +pkgname=htmlcxx +version=0.86 +revision=1 +build_style=gnu-configure +short_desc="A simple non-validating CSS1 and HTML parser for C++" +maintainer="RunningDroid " +license="LGPL-2.0-or-later" +homepage="http://htmlcxx.sourceforge.net/" +distfiles="$SOURCEFORGE_SITE/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz" +checksum=07542b5ea2442143b125ba213b6823ff4a23fff352ecdd84bbebe1d154f4f5c1 + +htmlcxx-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template index ea5e73e9cfe..90c852fadee 100644 --- a/srcpkgs/hub/template +++ b/srcpkgs/hub/template @@ -1,21 +1,24 @@ # Template file for 'hub' pkgname=hub -version=2.2.9 -revision=11 +version=2.4.0 +revision=1 build_style=go -go_import_path="github.com/github/hub" +go_import_path=github.com/github/hub hostmakedepends="git" -homepage="http://hub.github.com/" -distfiles="https://github.com/github/hub/archive/v${version}.tar.gz" short_desc="Command line tool for Github" maintainer="Enno Boland " license="MIT" -checksum=b3f949c4500288a18ed68c38755962c9571c9e10063fb77583a19d0fcca5ecdf +homepage="https://hub.github.com/" +#changelog="https://github.com/github/hub/releases" +distfiles="https://github.com/github/hub/archive/v${version}.tar.gz" +checksum=894eb112be9aa0464fa2c63f48ae8e573ef9e32a00bad700e27fd09a0cb3be4b post_install() { - vman man/${pkgname}.1 + # Requires ronn + # vman man/${pkgname}.1 vlicense LICENSE vinstall etc/hub.zsh_completion 644 usr/share/zsh/site-functions _hub vinstall etc/hub.bash_completion.sh 644 usr/share/bash-completion/completions hub + vinstall etc/hub.fish_completion 644 usr/share/fish/completions hub.fish } diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 0a25e432fa5..76e759ba3ae 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.41 +version=0.42.2 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=a5a435d352ad8df3f0dd77968e6ac21925ee006e5538a37f775d9f53b30799fc +checksum=3e834b71c3aab605db0fa7ae54a98161119a9a5758991dd03fcb55151c6de122 build_options="pygments" desc_option_pygments="Alternative syntax highlighter" diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template index ab54fb5e1fa..650f9764876 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=20180525 +version=20180630 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=8ab633466d52cc67023f94af439730971134daefdb1af24edf4c4e19488a3064 +checksum=232f9cb4ffc2d371867ad306a3002cecffdcd4869ad85831b75f31d7e0ad6ccb post_extract() { unzip pl_PL.zip diff --git a/srcpkgs/hunspell-ru_RU/template b/srcpkgs/hunspell-ru_RU/template index afc2a25a1fc..fdd934c5fec 100644 --- a/srcpkgs/hunspell-ru_RU/template +++ b/srcpkgs/hunspell-ru_RU/template @@ -1,6 +1,6 @@ # Template file for 'hunspell-ru_RU' pkgname=hunspell-ru_RU -version=0.4.1 +version=0.4.3 revision=1 hostmakedepends="unzip" short_desc="Russian dictionary for hunspell" @@ -8,7 +8,7 @@ maintainer="Alexander Mamay " license="LGPL-2.1-only" homepage="https://extensions.libreoffice.org/extensions/russian-spellcheck-dictionary.-based-on-works-of-aot-group" distfiles="https://extensions.libreoffice.org/extensions/russian-spellcheck-dictionary.-based-on-works-of-aot-group/${version/./-}/@@download/file/dict_ru_ru-aot-${version}.oxt>dict-ru.zip" -checksum=341c5d92c80ae17adecfb9743e040c5e39cbfb78801ad58e44b5787e166106d9 +checksum=ee9b0575e9f8caf1d0a948fb644aed864de47aaf3bc24d2b77f288fec7f8d4c4 create_wrksrc=yes noarch=yes diff --git a/srcpkgs/i3lock-color/patches/fix-musl.patch b/srcpkgs/i3lock-color/patches/fix-musl.patch new file mode 100644 index 00000000000..18c4aa9bda4 --- /dev/null +++ b/srcpkgs/i3lock-color/patches/fix-musl.patch @@ -0,0 +1,20 @@ +From c265fea7039300ff2283446ce6e7bc03439e2860 Mon Sep 17 00:00:00 2001 +From: maxice8 +Date: Wed, 27 Jun 2018 21:55:47 -0300 +Subject: [PATCH] jpg.h: add include for sys/types.h and define _GNU_SOURCE. + +this allows us to use uint on musl libc systems like Void Linux and +Alpine. +--- +--- jpg.h ++++ jpg.h +@@ -1,6 +1,9 @@ + #ifndef _JPG_H + #define _JPG_H + ++#include ++ ++#define _GNU_SOURCE 1 + typedef struct { + uint height; + uint width; diff --git a/srcpkgs/i3lock-color/template b/srcpkgs/i3lock-color/template new file mode 100644 index 00000000000..817af76528e --- /dev/null +++ b/srcpkgs/i3lock-color/template @@ -0,0 +1,25 @@ +# Template file for 'i3lock-color' +pkgname=i3lock-color +version=2.11 +revision=1 +wrksrc="${pkgname}-${version}-c" +build_style=gnu-configure +hostmakedepends="pkg-config automake" +makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel xcb-util-devel + xcb-util-image-devel libjpeg-turbo-devel" +short_desc="Screenlocker forked from i3lock with more features" +maintainer="jtalowell " +license="MIT" +homepage="https://github.com/PandorasFox/i3lock-color" +distfiles="https://github.com/PandorasFox/i3lock-color/archive/${version}-c.tar.gz" +checksum=376122e9dd6fd4e3572cb5114ca59417a9da4a8c3d65c347f5bf36e3058d077e +conf_files="/etc/pam.d/i3lock" +conflicts="i3lock" + +pre_configure() { + autoreconf -i +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/i8kutils/files/i8kmon/run b/srcpkgs/i8kutils/files/i8kmon/run new file mode 100644 index 00000000000..4e0179182e7 --- /dev/null +++ b/srcpkgs/i8kutils/files/i8kmon/run @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -r ./conf ]; then + . ./conf +fi + +exec /usr/bin/i8kmon ${OPTS:=--nouserconfig} 1>&2 diff --git a/srcpkgs/i8kutils/template b/srcpkgs/i8kutils/template new file mode 100644 index 00000000000..7a239e21fa7 --- /dev/null +++ b/srcpkgs/i8kutils/template @@ -0,0 +1,31 @@ +# Template file for 'i8kutils' +pkgname=i8kutils +version=1.43 +revision=1 +build_style=gnu-makefile +wrksrc="${pkgname}" +short_desc="Fan control for certain Dell laptops" +maintainer="Andrew Benson " +license="GPL-2.0-or-later" +homepage="https://launchpad.net/i8kutils" +distfiles="https://launchpad.net/i8kutils/trunk/${version}/+download/i8kutils_${version}.tar.xz" +checksum=881a211c64f79be6a08c88864deda45280f0ce925ed9e2af180db2d93d364dcb +conf_files="/etc/i8kmon.conf" + +case "${XBPS_TARGET_MACHINE}" in + i686*|x86_64*) ;; + *) broken="this hardware is not available on other architectures" ;; +esac + +do_install() { + vbin i8kfan + vbin i8kmon + vbin i8kctl + vman i8kctl.1 + vman i8kmon.1 + mkdir -p "${DESTDIR}/etc/modprobe.d" + cp dell-smm-hwmon.conf "${DESTDIR}/etc/modprobe.d" + cp i8kmon.conf "${DESTDIR}/etc" + vdoc README.i8kutils + vsv i8kmon +} diff --git a/srcpkgs/ice-ssb/template b/srcpkgs/ice-ssb/template new file mode 100644 index 00000000000..6676ad18e27 --- /dev/null +++ b/srcpkgs/ice-ssb/template @@ -0,0 +1,22 @@ +# Template file for 'ice-ssb' +pkgname=ice-ssb +version=5.3.1 +revision=1 +noarch=yes +wrksrc="ice-$version" +depends="gtk+3 python3-BeautifulSoup4 python3-gobject" +short_desc="Site Specific Browsers (SSBs) manager" +maintainer="John " +license="GPL-2.0-or-later" +homepage="https://github.com/peppermintos/ice/" +changelog="https://github.com/peppermintos/ice/blob/${version}/debian/changelog" +distfiles="https://github.com/peppermintos/ice/archive/${version}.tar.gz" +checksum=1bbc7c6a21f7e9924387e52d3c33b6859ba016df412411866df06fff4a0da853 + +post_extract() { + sed -i -e 's/chromium-browser/chromium/g' usr/bin/ice +} + +do_install() { + vcopy usr usr +} diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template index 933ca9aec13..d376155bc8a 100644 --- a/srcpkgs/imv/template +++ b/srcpkgs/imv/template @@ -1,18 +1,26 @@ # Template file for 'imv' pkgname=imv -version=2.1.3 +version=3.0.0 revision=1 build_style=gnu-makefile make_build_args="V=1" -makedepends="SDL2_ttf-devel freeimage-devel fontconfig-devel" +hostmakedepends="asciidoc pkg-config" +makedepends="SDL2_ttf-devel cmocka-devel fontconfig-devel freeimage-devel" +depends="desktop-file-utils" +conf_files="/etc/imv_config" short_desc="Image viewer for X11/Wayland" maintainer="Arvin Ignaci " -license="GPL-2" +license="GPL-2.0-or-later, MIT" homepage="https://github.com/eXeC64/imv" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=f0b9acd7cff1d2f7301cb5cffb261ace4d0af2003dc4a293d9a37e73074978b7 +distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz" +checksum=51c3fc49b4db8b13f55816a502b68f4f660a8dfccd109cdea5af23cc9f613fad +conflicts="renameutils>=0" pre_build() { export CFLAGS+=" $(${XBPS_CROSS_BASE}/usr/bin/sdl2-config --cflags) -DIMV_VERSION='\"${version}\"'" export LDFLAGS+=" $(${XBPS_CROSS_BASE}/usr/bin/sdl2-config --libs) -lfreeimage -lSDL2_ttf -lfontconfig -lpthread" } + +post_install() { + vlicense LICENSE.MIT +} diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template index 8fadf5fc9ba..dd767dd4c40 100644 --- a/srcpkgs/intellij-idea-community-edition/template +++ b/srcpkgs/intellij-idea-community-edition/template @@ -1,6 +1,6 @@ # Template file for 'intellij-idea-community-edition' pkgname=intellij-idea-community-edition -version=2018.1.4 +version=2018.1.5 revision=1 depends="virtual?java-environment giflib libXtst" short_desc="Java integrated development environment by JetBrains" @@ -8,7 +8,7 @@ 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=a31f0e08d718df6794e178e299cc41b16b62127d431a32b9a17568e7fb4b6c33 +checksum=d819ae48bc96f4bf6864e9d9a3e28880639bafd0e4e7be4347b907b3ffd763ad repository=nonfree nopie=yes only_for_archs="i686 x86_64" diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template index a0b02610253..d026365ac25 100644 --- a/srcpkgs/inxi/template +++ b/srcpkgs/inxi/template @@ -1,16 +1,16 @@ # Template file for 'inxi' pkgname=inxi -version=3.0.07.1 +version=3.0.14 revision=1 -wrksrc=inxi-${version/.1/-1} +wrksrc="inxi-${version}-1" noarch=yes depends="dmidecode file glxinfo pciutils perl usbutils xdpyinfo xprop xrandr" short_desc="Full featured system information script" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://smxi.org/docs/inxi.htm" -distfiles="https://github.com/smxi/inxi/archive/${version/.1/-1}.tar.gz" -checksum=72ed009c882d25f7324e3d51ad61407d639b6fbfe9c50be97122b7dda0eb7b9e +distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz" +checksum=c39047d588af62f89ec0b29f6e7349373f9d33201b1793c6fffa126985695303 do_install() { vbin inxi diff --git a/srcpkgs/inxi/update b/srcpkgs/inxi/update index b2e081e14d8..78285d51b91 100644 --- a/srcpkgs/inxi/update +++ b/srcpkgs/inxi/update @@ -1,2 +1,2 @@ -site="https://github.com/smxi/inxi/raw/master/inxi" -pattern="#### Version: \K.*" +pattern='/inxi/archive/\K[-.\d]+(?=\.tar)' +version=${wrksrc##*inxi-} diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template index 655743ebab9..8d04cb19553 100644 --- a/srcpkgs/iperf/template +++ b/srcpkgs/iperf/template @@ -1,16 +1,16 @@ # Template file for 'iperf' pkgname=iperf -version=2.0.11 +version=2.0.12 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-multicast --enable-threads ac_cv_sizeof_bool=0" short_desc="Perform network throughput tests" -maintainer="Leah Neukirchen " +maintainer="maxice8 " license="NCSA" homepage="https://iperf.fr/" distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz" -checksum=b7d650d07c6bb0e357b5938a20e4ac33876012fddb952299c5d321e6958da5d2 +checksum=367f651fb1264b13f6518e41b8a7e08ce3e41b2a1c80e99ff0347561eed32646 post_install() { vlicense COPYING LICENSE diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template index a8605323c71..6d73e2cbbfb 100644 --- a/srcpkgs/iperf3/template +++ b/srcpkgs/iperf3/template @@ -1,17 +1,18 @@ # Template file for 'iperf3' pkgname=iperf3 -version=3.5 +version=3.6 revision=1 wrksrc="iperf-${version}" build_style=gnu-configure -CFLAGS="-D_GNU_SOURCE" make_build_args="iperf3_profile_LDFLAGS= iperf3_profile_CFLAGS=" short_desc="Active measurements of the maximum achievable bandwidth on IP networks" -maintainer="Leah Neukirchen " -license="3-clause-BSD" +maintainer="maxice8 " +license="BSD-3-Clause" homepage="http://software.es.net/iperf/" distfiles="http://downloads.es.net/pub/iperf/iperf-${version}.tar.gz" -checksum=539bd9ecdca1b8c1157ff85b70ed09b3c75242e69886fc16b54883b399f72cd5 +checksum=de5d51e46dc460cc590fb4d44f95e7cad54b74fea1eba7d6ebd6f8887d75946e + +CFLAGS="-D_GNU_SOURCE" post_extract() { sed -i '1i#include ' src/timer.h diff --git a/srcpkgs/iptables/files/ip6tables/run b/srcpkgs/iptables/files/ip6tables/run index 735c912088a..b681edca9a6 100644 --- a/srcpkgs/iptables/files/ip6tables/run +++ b/srcpkgs/iptables/files/ip6tables/run @@ -1,4 +1,4 @@ #!/bin/sh [ ! -e /etc/iptables/ip6tables.rules ] && exit 0 -ip6tables-restore /etc/iptables/ip6tables.rules +ip6tables-restore /etc/iptables/ip6tables.rules -w 3 || exit 1 exec chpst -b ip6tables pause diff --git a/srcpkgs/iptables/files/iptables/run b/srcpkgs/iptables/files/iptables/run index bfc2dbe6898..ef7f871d409 100644 --- a/srcpkgs/iptables/files/iptables/run +++ b/srcpkgs/iptables/files/iptables/run @@ -1,4 +1,4 @@ #!/bin/sh [ ! -e /etc/iptables/iptables.rules ] && exit 0 -iptables-restore /etc/iptables/iptables.rules +iptables-restore /etc/iptables/iptables.rules -w 3 || exit 1 exec chpst -b iptables pause diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index 742f89cc185..ea675ec666b 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -1,7 +1,7 @@ # Template file for 'iptables' pkgname=iptables version=1.6.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-libipq --enable-shared --enable-devel --enable-bpf-compiler" hostmakedepends="pkg-config flex" diff --git a/srcpkgs/iwd/patches/fix-musl.patch b/srcpkgs/iwd/patches/fix-musl.patch deleted file mode 100644 index a4959ced9bd..00000000000 --- a/srcpkgs/iwd/patches/fix-musl.patch +++ /dev/null @@ -1,79 +0,0 @@ -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 index 66c1bf2cf03..0515b2c8382 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,18 +1,19 @@ # Template file for 'iwd' pkgname=iwd -version=0.2 +version=0.3 revision=1 build_style=gnu-configure configure_args="--disable-systemd-service --enable-docs" hostmakedepends="asciidoc pkg-config" makedepends="readline-devel dbus-devel" depends="dbus" +checkdepends="python3" 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 +checksum=04987ac62db63962b53e6220e44e182c87e87a79e786cc4bf4d42eadf18177e4 make_dirs="/var/lib/iwd 0600 root root" post_install() { diff --git a/srcpkgs/jbigkit/template b/srcpkgs/jbigkit/template index 17882cd7511..66a4846cd1e 100644 --- a/srcpkgs/jbigkit/template +++ b/srcpkgs/jbigkit/template @@ -9,7 +9,7 @@ short_desc="Data compression library/utilities for bi-level high-resolution imag maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.cl.cam.ac.uk/~mgk25/jbigkit" -distfiles="https://github.com/voidlinux/jbigkit-shared/archive/v${version}.tar.gz" +distfiles="https://github.com/void-linux/jbigkit-shared/archive/v${version}.tar.gz" checksum=bce256a39735145ecfc10d3e446e0b55fed1f7c80cffb6e2601a9090faae92e6 disable_parallel_build=yes diff --git a/srcpkgs/jenkins/template b/srcpkgs/jenkins/template index 1b5c16e53a0..f4e37104dde 100644 --- a/srcpkgs/jenkins/template +++ b/srcpkgs/jenkins/template @@ -1,6 +1,6 @@ # Template file for 'jenkins' pkgname=jenkins -version=2.109 +version=2.121.1 revision=1 build_style=fetch depends="virtual?java-runtime" @@ -8,8 +8,8 @@ short_desc="Open source automation server" maintainer="Renato Aguiar " license="MIT" homepage="https://jenkins.io/" -distfiles="http://mirrors.jenkins-ci.org/war/${version}/jenkins.war" -checksum=90ecc4fa84e6d78182d9616aa567164f29741a8025d159c71bad37fe2ac6aed4 +distfiles="http://mirrors.jenkins.io/war-stable/${version}/jenkins.war" +checksum=5bb075b81a3929ceada4e960049e37df5f15a1e3cfc9dc24d749858e70b48919 # Create 'jenkins' user system_accounts="jenkins" jenkins_homedir="/var/lib/jenkins" diff --git a/srcpkgs/jgmenu/patches/musl.patch b/srcpkgs/jgmenu/patches/musl.patch new file mode 100644 index 00000000000..918ccac0553 --- /dev/null +++ b/srcpkgs/jgmenu/patches/musl.patch @@ -0,0 +1,10 @@ +--- watch.c.orig 2018-06-25 10:42:01.431602657 +0200 ++++ watch.c 2018-06-25 10:42:59.363603488 +0200 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #include "list.h" + #include "sbuf.h" diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template index 8296967be88..e92d945b96e 100644 --- a/srcpkgs/jgmenu/template +++ b/srcpkgs/jgmenu/template @@ -1,6 +1,6 @@ # Template file for 'jgmenu' pkgname=jgmenu -version=0.9 +version=1.0 revision=1 build_style=gnu-makefile make_use_env=yes @@ -13,4 +13,4 @@ maintainer="cr6git " 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=2095de1d0bceadba5a5e6e002626a936a95b0f08c4f3397f943d161cf606b3bb +checksum=75d17be9476c429c05de22a12dcd47097dad97a7fa2f5b0053cd05d4db160ac8 diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template index ed289c1382a..211aa7b2c97 100644 --- a/srcpkgs/jsonrpc-glib/template +++ b/srcpkgs/jsonrpc-glib/template @@ -1,18 +1,19 @@ # Template file for 'jsonrpc-glib' pkgname=jsonrpc-glib -version=3.28.0 +version=3.28.1 revision=1 configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false) -Dwith_introspection=$(vopt_if gir true false)" build_style=meson hostmakedepends="pkg-config $(vopt_if gir 'gobject-introspection vala') glib-devel" makedepends="glib-devel json-glib-devel" -short_desc="library to communicate using the JSON-RPC 2.0 specification" +short_desc="Library to communicate using the JSON-RPC 2.0 specification" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" +changelog="https://raw.githubusercontent.com/GNOME/jsonrpc-glib/jsonrpc-glib-3-28/NEWS" distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz" -checksum=ba0b0f05d58ba47d5938a54787b44ea875648214f032f75d4344162d8f736a25 +checksum=cf2ac25944c3990904d63999deea3add38d99ea2fad16f335a996fd9a8706e2b build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template index 6380b60ffb9..af40bb84595 100644 --- a/srcpkgs/julia/template +++ b/srcpkgs/julia/template @@ -1,7 +1,8 @@ # Template file for 'julia' pkgname=julia -version=0.6.2 +version=0.6.3 revision=1 +wrksrc=julia nocross=yes build_style=gnu-makefile make_build_args="prefix=/usr sysconfdir=/etc USE_SYSTEM_LLVM=1 @@ -23,7 +24,7 @@ maintainer="Francisco Gómez " license="MIT" homepage="https://julialang.org" distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}.tar.gz" -checksum=19d15b07a7609e163420a13f4f9ca885cf61adcd1d970a8d9273919e2c9b74eb +checksum=f18dd3fb67ce65137c9cb56b1b338bca4eeb13832a85de9dd3ec5717e68f69ff case "$XBPS_TARGET_MACHINE" in i686-musl) diff --git a/srcpkgs/just/template b/srcpkgs/just/template index 0ccdae3e5d6..ed3d4f49e00 100644 --- a/srcpkgs/just/template +++ b/srcpkgs/just/template @@ -1,15 +1,15 @@ # Template file for 'just' pkgname=just -version=0.3.11 +version=0.3.12 revision=1 hostmakedepends="cargo" short_desc="Just a command runner" maintainer="Wilson Birney " license="CC0-1.0" -#changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md" homepage="https://github.com/casey/just" +changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md" distfiles="https://github.com/casey/just/archive/v${version}.tar.gz" -checksum=2ded5cbb140955e87e0edee5c9728146316a34fa0a23a4de1f7a28df569b25d0 +checksum=e5ca71efd19db8f157131cddb14d75ba161851e79e1cc9fc709e2c674d2c943b nocross=yes do_build() { diff --git a/srcpkgs/kaffeine/template b/srcpkgs/kaffeine/template index 0153c076bcf..854531c13fa 100644 --- a/srcpkgs/kaffeine/template +++ b/srcpkgs/kaffeine/template @@ -1,19 +1,24 @@ # Template file for 'kaffeine' pkgname=kaffeine -version=2.0.14 +version=2.0.15 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules pkg-config" makedepends="kidletime-devel kio-devel vlc-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql - qt5-plugin-sqlite qt5-plugin-tds" + qt5-plugin-sqlite qt5-plugin-tds + $(vopt_if dvb 'v4l-utils-devel eudev-libudev-devel')" maintainer="cr6git " short_desc="KDE media player" homepage="https://www.kde.org/applications/multimedia/kaffeine/" -license="GPL-2" -distfiles="https://download.kde.org/stable/kaffeine/kaffeine-${version}.tar.xz" -checksum=2c73fd473f0579cffa7e797e3d00c41b09d7fb4dee486bb507877a56bd1d7f3a +license="GPL-2.0-or-later" +distfiles="${KDE_SITE}/kaffeine/kaffeine-${version}.tar.xz" +checksum=e61573199fe4e04377679a5cf8b32b3aa0bb4201c56371e11820d3a3ae41904d + +build_options="dvb" +build_options_default="dvb" +desc_option_dvb="Enable DVB Support" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" diff --git a/srcpkgs/kapow/template b/srcpkgs/kapow/template index 7154e158e54..024867709b4 100644 --- a/srcpkgs/kapow/template +++ b/srcpkgs/kapow/template @@ -1,13 +1,14 @@ # Template file for 'kapow' pkgname=kapow -version=1.5.5 +version=1.5.7 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-qmake qt5-tools-devel" makedepends="qt5-devel" short_desc="Simple punch-clock style time tracker" maintainer="Jakub Skrzypnik " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://gottcode.org/kapow/" +changelog="https://raw.githubusercontent.com/gottcode/kapow/master/NEWS" distfiles="https://gottcode.org/${pkgname}/${pkgname}-${version}-src.tar.bz2" -checksum=f0942faab3f6a0e0fc4e6687be6f8a404f3c34585d0c2a8e13c13d9623f24ad5 +checksum=031d49ca9fe27591b0b6291bfcedbf7ac99938067b8a14812ddfecbbadf10caf diff --git a/srcpkgs/kcalc/template b/srcpkgs/kcalc/template index 49b1201448a..174e908264d 100644 --- a/srcpkgs/kcalc/template +++ b/srcpkgs/kcalc/template @@ -1,6 +1,6 @@ # Template file for 'kcalc' pkgname=kcalc -version=17.12.2 +version=18.04.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -8,7 +8,7 @@ hostmakedepends="extra-cmake-modules kconfig kdoctools python qt5-host-tools qt5 makedepends="gmp-devel kinit-devel kparts-devel qt5-devel" short_desc="A simple and scientific calculator" maintainer="Norbert Vegh " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://utils.kde.org/projects/kcalc/" -distfiles="https://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=e8b2bf3925af563eb109f92f55891ef9b52fb5d192ac5932f9e7a18f4f62048e +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=db0d350bd7e0318d8f015b9a0bc840e1b75713a8c22a738c515afb2d538c3ea7 diff --git a/srcpkgs/kcalcore/update b/srcpkgs/kcalcore/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kcalcore/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kcalutils/update b/srcpkgs/kcalutils/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kcalutils/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kcgi/template b/srcpkgs/kcgi/template index ee165aad7b6..ce066d14999 100644 --- a/srcpkgs/kcgi/template +++ b/srcpkgs/kcgi/template @@ -1,15 +1,15 @@ # Template file for 'kcgi' pkgname=kcgi -version=0.10.6 +version=0.10.7 revision=1 build_style=gnu-makefile -checkdepends="pkg-config libbsd-devel libcurl-devel" +checkdepends="pkg-config libcurl-devel" short_desc="Minimal CGI library for web applications in C" maintainer="Duncaen " license="ISC" homepage="http://kristaps.bsd.lv/kcgi/" distfiles="http://kristaps.bsd.lv/kcgi/snapshots/kcgi-${version}.tgz" -checksum=beddb1d5cc7c1e6b8cfc240f032bfc1e1654e859f4f2c48cd19d9fc2a56bd254 +checksum=7bb64212262de06c1203a326cf5873aebac3b80fa35ee9dc7e13a494a762723f do_configure() { local _libc=glibc diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template new file mode 100644 index 00000000000..9413c775efe --- /dev/null +++ b/srcpkgs/kcharselect/template @@ -0,0 +1,18 @@ +# Template file for 'kcharselect' +pkgname=kcharselect +version=18.04.2 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF" +hostmakedepends="extra-cmake-modules" +makedepends="qt5-devel kbookmarks-devel" +short_desc="Character Selector" +maintainer="travankor " +license="GPL-2.0-only" +homepage="https://www.kde.org/applications/utilities/kcharselect/" +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=24e0b69eeca90755fb4a259404943a69e5760c30e4e50dff5f4a43a38297e158 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" +fi \ No newline at end of file diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template index b56a81bc8af..92103121cd9 100644 --- a/srcpkgs/kcolorchooser/template +++ b/srcpkgs/kcolorchooser/template @@ -1,6 +1,6 @@ # Template file for 'kcolorchooser' pkgname=kcolorchooser -version=17.12.2 +version=18.04.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -8,11 +8,15 @@ hostmakedepends="extra-cmake-modules" makedepends="qt5-devel kxmlgui-devel" short_desc="KDE's Color Chooser" maintainer="Michael Straube " -license="GPL-2" +license="MIT" homepage="https://www.kde.org/applications/graphics/kcolorchooser" -distfiles="https://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=29e7fdf9a57c827d0ab05f10a905c6c483323711bb385d1c262e792950bd5f4a +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=020abccf25b18af3e11f67d787be4d3b6df0107ab8f15c946cc00a8804fc1154 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" fi + +post_install() { + vlicense COPYING +} \ No newline at end of file diff --git a/srcpkgs/kcontacts/update b/srcpkgs/kcontacts/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kcontacts/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kdav/update b/srcpkgs/kdav/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kdav/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kdepim-apps-libs/update b/srcpkgs/kdepim-apps-libs/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kdepim-apps-libs/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kdepim-runtime/update b/srcpkgs/kdepim-runtime/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kdepim-runtime/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template index 2ee9c8621d2..e105256e17e 100644 --- a/srcpkgs/kdialog/template +++ b/srcpkgs/kdialog/template @@ -1,6 +1,6 @@ # Template file for 'kdialog' pkgname=kdialog -version=17.12.2 +version=18.04.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -9,7 +9,7 @@ makedepends="kio-devel" conflicts="kde-baseapps" short_desc="Utility for displaying dialog boxes from shell scripts" maintainer="Denis Revin " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/applications/kdialog" -distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=0a0dc5186104f8451f54a170225d9ac29cd4d8ea0aca3c31e6723c2d8b6591df +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=76e68f5b2dedf05572598bc4528f22f1cdc288a17d8e81e7ab0b9ecb54b3db2d diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index cc93e3fdda7..0251aeb2b0f 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -12,6 +12,7 @@ makedepends="boost-devel log4cplus-devel python3-devel $(vopt_if botan botan-devel libressl-devel) $(vopt_if mysql libmysqlclient-devel) $(vopt_if pgsql postgresql-libs-devel)" +checkdepends="procps-ng" #needs pgrep depends="libkea>=0" conf_files="/etc/kea/*.conf" short_desc="Next generation DHCPv4/v6 server" diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index b0552f5b1b6..57d46406450 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,7 +1,7 @@ # Template file for 'keepassxc' pkgname=keepassxc version=2.3.3 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_TESTS=OFF -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF) @@ -31,7 +31,7 @@ desc_option_browser="Enable browser integration with keepassxc-browser" desc_option_network="Enable networking support (favicon download)" desc_option_sshagent="Enable SSH agent support" desc_option_yubikey="Enable YubiKey HMAC-SHA1 authentication support" -build_options_default="autotype sshagent yubikey network" +build_options_default="autotype browser sshagent yubikey network" post_install() { vlicense COPYING diff --git a/srcpkgs/kidentitymanagement/update b/srcpkgs/kidentitymanagement/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kidentitymanagement/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kimap/update b/srcpkgs/kimap/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kimap/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index f6d7d7bf71e..26e1125596d 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,9 +1,9 @@ # Template file for 'kitty' pkgname=kitty -version=0.10.1 +version=0.11.1 revision=1 python_version=3 -hostmakedepends="ncurses pkg-config python3-devel wayland-devel wayland-protocols" +hostmakedepends="ncurses pkg-config" makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel python3-devel wayland-devel wayland-protocols" depends="kitty-terminfo" @@ -11,9 +11,13 @@ 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 +homepage="https://sw.kovidgoyal.net/kitty/" +distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz" +checksum=3baf72ee4de8818bbc205fd631f716b60eabc8bd215ec7e834e00a01db7912c4 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" python3-devel wayland-devel wayland-protocols" +fi do_build() { if [ -n "$CROSS_BUILD" ]; then @@ -29,7 +33,7 @@ do_build() { do_install() { vmkdir etc/kitty - cp ${DESTDIR}/usr/lib/kitty/kitty/kitty.conf ${DESTDIR}/etc/kitty/ + cp ${DESTDIR}/usr/share/doc/kitty/html/_downloads/kitty.conf ${DESTDIR}/etc/kitty/ } kitty-terminfo_package() { diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template index 8f3b2a2ed59..2843547951c 100644 --- a/srcpkgs/kiwix-lib/template +++ b/srcpkgs/kiwix-lib/template @@ -1,21 +1,23 @@ # Template file for 'kiwix-lib' pkgname=kiwix-lib -version=1.1.1 +version=2.0.1 revision=1 build_style=meson hostmakedepends="pkg-config ctpp2" -makedepends="ctpp2-devel icu-devel libzim-devel pugixml-devel xapian-core-devel" +makedepends="ctpp2-devel icu-devel libzim-devel pugixml-devel xapian-core-devel + libaria2-devel" short_desc="Common code base for all Kiwix ports" maintainer="John " -license="GPL-3" -homepage="kiwix.org" +license="GPL-3.0-or-later" +#changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog" +homepage="https://www.kiwix.org/" distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz" -checksum=a33219f4e291e21d557660f05f5a4df1cf84b3281131d17d638cf8842e006c23 +checksum=ff2cb31da5183d541451158bfb678ff864ceea5cd22b655350cc0d80e7cfa3ac kiwix-lib-devel_package() { short_desc+=" - development packages" depends="pugixml-devel icu-devel xapian-core-devel libzim-devel - ctpp2-devel ${sourcepkg}>=${version}_${revision}" + ctpp2-devel libaria2-devel ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/lib/*.so vmove usr/lib/pkgconfig diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template index 70ce475245d..3bdd689d11e 100644 --- a/srcpkgs/kiwix-tools/template +++ b/srcpkgs/kiwix-tools/template @@ -1,16 +1,17 @@ # Template file for 'kiwix-tools' pkgname=kiwix-tools -version=0.4.0 +version=0.6.0 revision=1 build_style=meson hostmakedepends="pkg-config" makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel ctpp2-devel" short_desc="Kiwix command line tools" maintainer="John " -license="GPL-3" +license="GPL-3.0-or-later" +#changelog="https://github.com/kiwix/kiwix-tools/blob/${verion}/Changelog" homepage="https://kiwix.org" distfiles="https://github.com/kiwix/kiwix-tools/archive/${version}.tar.gz" -checksum=168d2616c2f1829c897462e1f7557ca3b352d6baef80d0a1f3499748031f00cd +checksum=0907b21937d64bf89950c50ea8a8d396cf88bb8db76cc51f4fdcbdedbbd71cc2 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kiwix-lib-devel" diff --git a/srcpkgs/kmail-account-wizard/update b/srcpkgs/kmail-account-wizard/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kmail-account-wizard/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kmail/update b/srcpkgs/kmail/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kmail/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kmailtransport/update b/srcpkgs/kmailtransport/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kmailtransport/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kmime/update b/srcpkgs/kmime/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kmime/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/kpimtextedit/update b/srcpkgs/kpimtextedit/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/kpimtextedit/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/krdc/update b/srcpkgs/krdc/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/krdc/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/krfb/update b/srcpkgs/krfb/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/krfb/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 60de41e5bdb..15fc37ab62a 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,6 +1,6 @@ # Template file for 'krita' pkgname=krita -version=4.0.3 +version=4.1.0 revision=1 nocross=yes build_style=cmake @@ -15,7 +15,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel opencolorio-devel eigen vc exiv2-devel libXi-devel libopenexr-devel libgomp-devel poppler-qt5-devel" -license="BSD-3-Clause, GPL-3.0-or-later" +license="GPL-3.0-only" homepage="https://krita.org/" -distfiles="https://download.kde.org/stable/krita/${version}/krita-${version}.tar.gz" -checksum=f9ead78ff4b184af49aea59385b0cfa1238ebf7fd527bf2f408c59fc5b12b67e +distfiles="$KDE_SITE/krita/${version}/krita-${version}.tar.gz" +checksum=78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5 diff --git a/srcpkgs/kronometer/template b/srcpkgs/kronometer/template new file mode 100644 index 00000000000..1cf5728d43e --- /dev/null +++ b/srcpkgs/kronometer/template @@ -0,0 +1,19 @@ +# Template file for 'kronometer' +pkgname=kronometer +version=2.2.1 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF" +hostmakedepends="extra-cmake-modules" +makedepends="kxmlgui-devel qt5-devel" +depends="hicolor-icon-theme" +short_desc="Stopwatch Application" +maintainer="travankor " +license="GPL-2.0-only" +homepage="https://userbase.kde.org/Kronometer" +distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz" +checksum=7d4092e576f9b0be20d5b36c57eee089964f8215672be88797c8c2b44ac462a1 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" kconfig-devel kdoctools python qt5-host-tools qt5-qmake" +fi \ No newline at end of file diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index 8135d9d8d7f..e21447d23b3 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.10.4 +version=1.11.0 revision=1 build_style=go nocross=yes @@ -13,7 +13,7 @@ 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=f352e9a6ea70c8e2c66e5e3351805c204364be729a65b85752963789cd61ef75 +checksum=b264dec72bb383fe6fc9063a1e270c00e734005e7af578bd0b33091fd8451349 system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index 5fd75c1776d..45a7d1ee852 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,6 +1,6 @@ # Template file for 'ldc' pkgname=ldc -version=1.9.0 +version=1.10.0 revision=1 wrksrc="ldc-${version}-src" build_style=cmake @@ -12,14 +12,15 @@ short_desc="Portable D programming language compiler based on LLVM" maintainer="Juan RP " license="BSD-3-Clause, BSL-1.0" homepage="http://wiki.dlang.org/LDC" +changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md" distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz" -checksum=e3f32a4dfcaae12f434e0e23638684faa83765827e7f2deb2df059dccc3169b9 +checksum=99b6e2b8dcaf28a2947318fb25e43fa0b96dd3a6377995146f987c4d17dd8371 conf_files="/etc/ldc2.conf" nopie=yes nocross=yes case "${XBPS_TARGET_MACHINE}" in -*-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9741/steps/shell_3/logs/stdio" ;; + *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9741/steps/shell_3/logs/stdio" ;; esac post_install() { diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index 696f07bb3a4..cb3f7e689ec 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -1,7 +1,7 @@ # Template file for 'leatherman' # Note: always revbump cpp-hocon when updating as it links against this static lib pkgname=leatherman -version=1.4.1 +version=1.4.2 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller " license="Apache-2.0" homepage="https://github.com/puppetlabs/leatherman" distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=a6acf99ef65d55231b0aca2bace717ecbb2e96c0078463b79a2def5c2e2dfd3b +checksum=32ccdb21db3ccc326bac255b35fc6c16b2ddbe39bbd5afdddcadc622e2814fc2 diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template index 8520051e98c..fb95f2282be 100644 --- a/srcpkgs/lf/template +++ b/srcpkgs/lf/template @@ -1,7 +1,7 @@ # Template file for 'lf' pkgname=lf -version=r3 -revision=2 +version=r6 +revision=1 build_style=go go_import_path="github.com/gokcehan/${pkgname}" go_ldflags="-X main.gVersion=$version" @@ -9,9 +9,9 @@ hostmakedepends="git" short_desc="Terminal file manager" maintainer="Daniel Lewan " license="MIT" -homepage="https://${go_import_path}" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=3337cebb6332d6bc9c8cecd6348e620e5f042538b1ee5500fc61c7f2df0e0a48 +homepage="https://github.com/gokcehan/lf" +distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz" +checksum=43298a4e391d97643ace9bcb96429a63f9b7a8d321da4b4d36151998abc5cd03 post_install() { vlicense LICENSE diff --git a/srcpkgs/lf/update b/srcpkgs/lf/update new file mode 100644 index 00000000000..48ff1d9d851 --- /dev/null +++ b/srcpkgs/lf/update @@ -0,0 +1,2 @@ +site='https://github.com/gokcehan/lf/releases' +pattern='archive/\Kr\d+(?=\.tar\.gz)' diff --git a/srcpkgs/libXaw3d/template b/srcpkgs/libXaw3d/template index 2917fd3baef..a59e9b381b8 100644 --- a/srcpkgs/libXaw3d/template +++ b/srcpkgs/libXaw3d/template @@ -1,18 +1,18 @@ # Template file for 'libXaw3d' pkgname=libXaw3d -version=1.6.2 +version=1.6.3 revision=2 build_style=gnu-configure -license="MIT/X11" -maintainer="Carlo Dormeletti " -hostmakedepends="libtool automake pkg-config bison" -makedepends="libX11-devel libXt-devel libXmu-devel libXpm-devel libXext-devel xorg-util-macros" configure_args="--disable-static --enable-internationalization --enable-multiplane-bitmaps --enable-gray-stipples --enable-arrow-scrollbars --with-pic --with-gnu-ld" +hostmakedepends="automake bison libtool pkg-config" +makedepends="libXmu-devel libXpm-devel xorg-util-macros" short_desc="X Athena Widget 3d library" -homepage="http://cgit.freedesktop.org/xorg/lib/libXaw3d/" +maintainer="Carlo Dormeletti " +license="MIT/X11" +homepage="https://cgit.freedesktop.org/xorg/lib/libXaw3d" distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" -checksum="b74f11681061c1492c03cbbe6e318f9635b3877af0761fc0e67e1467c3a6972b" +checksum=2dba993f04429ec3d7e99341e91bf46be265cc482df25963058c15f1901ec544 post_install() { vlicense COPYING diff --git a/srcpkgs/libXpresent-devel b/srcpkgs/libXpresent-devel new file mode 120000 index 00000000000..d7d54dddc78 --- /dev/null +++ b/srcpkgs/libXpresent-devel @@ -0,0 +1 @@ +libXpresent \ No newline at end of file diff --git a/srcpkgs/libXpresent/template b/srcpkgs/libXpresent/template new file mode 100644 index 00000000000..b892dfbee4b --- /dev/null +++ b/srcpkgs/libXpresent/template @@ -0,0 +1,25 @@ +# Template file for 'libXpresent' +pkgname=libXpresent +version=1.0.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config xorg-util-macros" +makedepends="libXfixes-devel libXrandr-devel" +short_desc="XPresent extension C library" +maintainer="maxice8 " +license="X11" +homepage="https://cgit.freedesktop.org/xorg/lib/libXpresent/" +distfiles="${XORG_SITE}/lib/libXpresent-${version}.tar.gz" +checksum=92f1bdfb67ae2ffcdb25ad72c02cac5e4912dc9bc792858240df1d7f105946fa + +libXpresent-devel_package() { + depends="libXpresent-${version}_${revision} xorgproto libX11-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/man/man3 + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} diff --git a/srcpkgs/libaacs/template b/srcpkgs/libaacs/template index d79204771eb..2e2ef4b538f 100644 --- a/srcpkgs/libaacs/template +++ b/srcpkgs/libaacs/template @@ -1,24 +1,24 @@ # Template file for 'libaacs' pkgname=libaacs version=0.9.0 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="pkg-config bison flex" +configure_args="--disable-static" +hostmakedepends="flex pkg-config" makedepends="libgcrypt-devel" short_desc="Open implementation of AACS specification" maintainer="maxice8 " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="https://www.videolan.org/developers/libaacs.html" distfiles="http://ftp.videolan.org/pub/videolan/libaacs/${version}/libaacs-${version}.tar.bz2" checksum=47e0bdc9c9f0f6146ed7b4cc78ed1527a04a537012cf540cf5211e06a248bace libaacs-devel_package() { - depend="${sourcepkg}>=${version}_${revision}" + depend="${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/lib/*.so - vmove usr/lib/*.a + vmove usr/lib/libaacs.so vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/libaom-devel b/srcpkgs/libaom-devel new file mode 120000 index 00000000000..000d89f76fc --- /dev/null +++ b/srcpkgs/libaom-devel @@ -0,0 +1 @@ +libaom \ No newline at end of file diff --git a/srcpkgs/libaom-tools b/srcpkgs/libaom-tools new file mode 120000 index 00000000000..000d89f76fc --- /dev/null +++ b/srcpkgs/libaom-tools @@ -0,0 +1 @@ +libaom \ No newline at end of file diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template new file mode 100644 index 00000000000..4863f56d28a --- /dev/null +++ b/srcpkgs/libaom/template @@ -0,0 +1,37 @@ +# Template file for 'libaom' +pkgname=libaom +version=1.0.0 +revision=1 +create_wrksrc=yes +build_style=cmake +configure_args="-DENABLE_DOCS=ON -DBUILD_SHARED_LIBS=ON" +hostmakedepends="yasm doxygen perl python" +short_desc="AV1 Codec library implementation" +maintainer="maxice8 " +license="BSD-2-Clause" +homepage="https://aomedia.org/" +changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" +distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" +checksum=@8a85b841d98dcebf0d74f1c61c11308746bcc1509c03a6f82e28fb688fb61124 + +post_install() { + vlicense LICENSE +} + +libaom-devel_package() { + depends="libaom-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + +libaom-tools_package() { + short_desc+=" - utilities for enconding and decoding AV1" + pkg_install() { + vmove usr/bin/aomdec + vmove usr/bin/aomenc + } +} diff --git a/srcpkgs/libaria2 b/srcpkgs/libaria2 new file mode 120000 index 00000000000..2ffdeb4a747 --- /dev/null +++ b/srcpkgs/libaria2 @@ -0,0 +1 @@ +aria2 \ No newline at end of file diff --git a/srcpkgs/libaria2-devel b/srcpkgs/libaria2-devel new file mode 120000 index 00000000000..2ffdeb4a747 --- /dev/null +++ b/srcpkgs/libaria2-devel @@ -0,0 +1 @@ +aria2 \ No newline at end of file diff --git a/srcpkgs/libavfs b/srcpkgs/libavfs new file mode 120000 index 00000000000..aeb8440d2d2 --- /dev/null +++ b/srcpkgs/libavfs @@ -0,0 +1 @@ +avfs \ No newline at end of file diff --git a/srcpkgs/libblockdev/patches/fix-musl.patch b/srcpkgs/libblockdev/patches/fix-musl.patch deleted file mode 100644 index 7000fabc235..00000000000 --- a/srcpkgs/libblockdev/patches/fix-musl.patch +++ /dev/null @@ -1,34 +0,0 @@ -Source: upstream -Reason: Fixes compilation in musl libc - ---- src/plugins/crypto.c -+++ src/plugins/crypto.c -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- src/plugins/part.c -+++ src/plugins/part.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1354,7 +1355,7 @@ static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, - real_flags |= 0x4000000000000000; /* 1 << 62 */ - if (flags & BD_PART_FLAG_GPT_NO_AUTOMOUNT) - real_flags |= 0x8000000000000000; /* 1 << 63 */ -- mask_str = g_strdup_printf ("%.16"__PRI64_PREFIX"x", real_flags); -+ mask_str = g_strdup_printf ("%.16"PRIx64, real_flags); - - args[2] = g_strdup_printf ("%d:=:%s", part_num, mask_str); - g_free (mask_str); - diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template index 85108dbde82..1cf2c6bce6e 100644 --- a/srcpkgs/libblockdev/template +++ b/srcpkgs/libblockdev/template @@ -1,17 +1,19 @@ # Template file for 'libblockdev' pkgname=libblockdev -version=2.16 +version=2.18 revision=1 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="cryptsetup-devel device-mapper-devel dmraid-devel libbytesize-devel - libglib-devel libkmod-devel libparted-devel nss-devel volume_key-devel" + libglib-devel libkmod-devel libndctl-devel libparted-devel nss-devel + volume_key-devel libyaml-devel" short_desc="A library for manipulating block devices" maintainer="maxice8 " license="LGPL-2.1-or-later" homepage="https://github.com/storaged-project/libblockdev" +changelog="https://raw.githubusercontent.com/storaged-project/libblockdev/master/NEWS.rst" distfiles="https://github.com/storaged-project/libblockdev/releases/download/${version}-1/libblockdev-${version}.tar.gz" -checksum=d841ae446cf6dc545e4f7386e13dfd8c3e07c4b6a962536b7c0fcd20e3a4d9e4 +checksum=705d82a5a146c71a1f1159d4579648662f7e4414297eb5a2b3e7199d72bb73a8 conf_files="/etc/libblockdev/conf.d/10-lvm-dbus.cfg /etc/libblockdev/conf.d/00-default.cfg" diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template index 20c0784b7ed..802990f7671 100644 --- a/srcpkgs/libbytesize/template +++ b/srcpkgs/libbytesize/template @@ -1,10 +1,11 @@ # Template file for 'libbytesize' pkgname=libbytesize version=1.3 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="python3" makedepends="mpfr-devel pcre-devel" +checkdepends="python3-six python-six" short_desc="A library for operations with sizes in bytes" maintainer="maxice8 " license="LGPL-2.1-or-later" @@ -12,9 +13,11 @@ homepage="https://github.com/storaged-project/libbytesize" distfiles="https://github.com/storaged-project/libbytesize/releases/download/${version}/libbytesize-${version}.tar.gz" checksum=d1991726a67ee44e4c9b3deaba5bbacd5392d3364439efce08060abc45edf5d0 -do_check() { - # broken, one depends on systemd - : +pre_check() { + # Disable test that depends on unpackaged pocketlint + sed -i 's|canary_tests.sh$||g' tests/Makefile + # Default locale doesn't work + sed -i 's|DEFAULT_LOCALE =.*|DEFAULT_LOCALE = "C"|g' tests/libbytesize_unittest.py } libbytesize-devel_package() { diff --git a/srcpkgs/libdatrie/template b/srcpkgs/libdatrie/template index 6d2713ab3f6..56fae586b9c 100644 --- a/srcpkgs/libdatrie/template +++ b/srcpkgs/libdatrie/template @@ -1,6 +1,6 @@ # Template file for 'libdatrie' pkgname=libdatrie -version=0.2.11 +version=0.2.12 revision=1 build_style=gnu-configure short_desc="Implementation of double-array structure for representing trie" @@ -8,7 +8,7 @@ maintainer="newbluemoon " license="LGPL-2.1-or-later" homepage="https://linux.thai.net/projects/datrie" distfiles="https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${version}.tar.xz" -checksum=547c7bd2ab9e10ad65f3270cae8ca7027f52db9c30f7327d24354ad41a98e94b +checksum=452dcc4d3a96c01f80f7c291b42be11863cd1554ff78b93e110becce6e00b149 libdatrie-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libdaxctl b/srcpkgs/libdaxctl new file mode 120000 index 00000000000..7a83effa857 --- /dev/null +++ b/srcpkgs/libdaxctl @@ -0,0 +1 @@ +ndctl \ No newline at end of file diff --git a/srcpkgs/libdaxctl-devel b/srcpkgs/libdaxctl-devel new file mode 120000 index 00000000000..7a83effa857 --- /dev/null +++ b/srcpkgs/libdaxctl-devel @@ -0,0 +1 @@ +ndctl \ No newline at end of file diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 58215bdf128..a32945f0695 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,10 +1,10 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.28.2 +version=3.28.3 revision=1 +build_style=meson configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false) -Dwith_introspection=$(vopt_if gir true false)" -build_style=meson hostmakedepends="glib-devel pkg-config $(vopt_if gir 'gobject-introspection vala')" makedepends="gtk+3-devel" @@ -12,8 +12,9 @@ short_desc="A library to delight your users with fancy features" maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" +changelog="https://raw.githubusercontent.com/GNOME/libdazzle/libdazzle-3-28/NEWS" distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz" -checksum=56519e13bd14b7f3280cc404d7ada924b5195990a9e4bb4843392c2eb1b7ddcd +checksum=879f88b87b0b4048bad8aedc0ca4e60869ed9525d84eda1bcfdba7a457bc0a61 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/libdiff/files/configure.glibc b/srcpkgs/libdiff/files/configure.glibc new file mode 100644 index 00000000000..a212f75c1f5 --- /dev/null +++ b/srcpkgs/libdiff/files/configure.glibc @@ -0,0 +1,26 @@ +HAVE_ARC4RANDOM=0 +HAVE_CAPSICUM=0 +HAVE_ERR=1 +HAVE_EXPLICIT_BZERO=1 +HAVE_GETPROGNAME=0 +HAVE_INFTIM=0 +HAVE_MD5=0 +HAVE_MEMMEM=1 +HAVE_MEMRCHR=1 +HAVE_MEMSET_S=0 +HAVE_PATH_MAX=1 +HAVE_PLEDGE=0 +HAVE_PROGRAM_INVOCATION_SHORT_NAME=1 +HAVE_REALLOCARRAY=0 +HAVE_RECALLOCARRAY=0 +HAVE_SANDBOX_INIT=0 +HAVE_SECCOMP_FILTER=1 +HAVE_SOCK_NONBLOCK=1 +HAVE_STRLCAT=0 +HAVE_STRLCPY=0 +HAVE_STRNDUP=1 +HAVE_STRNLEN=1 +HAVE_STRTONUM=0 +HAVE_SYSTRACE=0 +HAVE_ZLIB=0 +HAVE___PROGNAME=1 diff --git a/srcpkgs/libdiff/files/configure.musl b/srcpkgs/libdiff/files/configure.musl new file mode 100644 index 00000000000..d0b4fb0809a --- /dev/null +++ b/srcpkgs/libdiff/files/configure.musl @@ -0,0 +1,26 @@ +HAVE_ARC4RANDOM=0 +HAVE_CAPSICUM=0 +HAVE_ERR=1 +HAVE_EXPLICIT_BZERO=0 +HAVE_GETPROGNAME=0 +HAVE_INFTIM=0 +HAVE_MD5=0 +HAVE_MEMMEM=1 +HAVE_MEMRCHR=1 +HAVE_MEMSET_S=0 +HAVE_PATH_MAX=1 +HAVE_PLEDGE=0 +HAVE_PROGRAM_INVOCATION_SHORT_NAME=1 +HAVE_REALLOCARRAY=0 +HAVE_RECALLOCARRAY=0 +HAVE_SANDBOX_INIT=0 +HAVE_SECCOMP_FILTER=1 +HAVE_SOCK_NONBLOCK=1 +HAVE_STRLCAT=1 +HAVE_STRLCPY=1 +HAVE_STRNDUP=1 +HAVE_STRNLEN=1 +HAVE_STRTONUM=0 +HAVE_SYSTRACE=0 +HAVE_ZLIB=0 +HAVE___PROGNAME=1 diff --git a/srcpkgs/libdiff/template b/srcpkgs/libdiff/template new file mode 100644 index 00000000000..1419cc2defa --- /dev/null +++ b/srcpkgs/libdiff/template @@ -0,0 +1,26 @@ +# Template file for 'libdiff' +pkgname=libdiff +version=0.1.0 +revision=1 +build_style=gnu-makefile +short_desc="Library to generate arbitrary sequence diffs" +maintainer="Duncaen " +license="MIT" +homepage="https://github.com/kristapsdz/libdiff" +distfiles="https://kristaps.bsd.lv/libdiff/snapshots/libdiff-${version}.tar.gz" +checksum=2012d2eae9ecaf9717c77ecefd9bdff4e38f485d8b9ad8f916cff1fdf1151512 + +do_configure() { + local _libc=glibc + case "$XBPS_TARGET_MACHINE" in + *-musl) _libc=musl ;; + esac + if [ -n "$CROSS_BUILD" ]; then + cp "${FILESDIR}/configure.$_libc" configure.local + fi + ./configure PREFIX=/usr MANDIR=/usr/share/man +} + +post_install() { + vlicense LICENSE.md +} diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template index 8bae2f954e3..1552cafa95d 100644 --- a/srcpkgs/libfm-qt/template +++ b/srcpkgs/libfm-qt/template @@ -1,22 +1,19 @@ # Template file for 'libfm-qt' pkgname=libfm-qt -version=0.12.0 -revision=2 +version=0.13.1 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" -makedepends="lxqt-build-tools qt5-tools-devel qt5-x11extras-devel - liblxqt-devel libfm-devel libexif-devel" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="qt5-tools-devel qt5-x11extras-devel libfm-devel libexif-devel" short_desc="Core library of PCManFM-Qt (Qt binding for libfm)" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/libfm-qt/releases/download/${version}/libfm-qt-${version}.tar.xz" -checksum=a2cc4fc811aff6a83507e41770152cb01ea564668a33f4c878c7132a42b4f693 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/libfm-qt/releases/download/${version}/libfm-qt-${version}.tar.xz" +checksum=69ebbe5fbd110a17a3fdfec091713daffa946a0d3b5c3ff0478315d8ce5f145c replaces="libfm-qt5>=0" -CXXFLAGS="-D_GLIBCXX_USE_C99_STDLIB=1 -D_GLIBCXX_USE_C99_STDIO=1" - libfm-qt-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/fswatch-devel b/srcpkgs/libfswatch similarity index 100% rename from srcpkgs/fswatch-devel rename to srcpkgs/libfswatch diff --git a/srcpkgs/libfswatch-devel b/srcpkgs/libfswatch-devel new file mode 120000 index 00000000000..73e34256b32 --- /dev/null +++ b/srcpkgs/libfswatch-devel @@ -0,0 +1 @@ +fswatch \ No newline at end of file diff --git a/srcpkgs/libfwup b/srcpkgs/libfwup new file mode 120000 index 00000000000..4e8c1ec30d6 --- /dev/null +++ b/srcpkgs/libfwup @@ -0,0 +1 @@ +fwupdate \ No newline at end of file diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index dfcea512ab3..fcd1d0cdf3c 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,19 +1,20 @@ # Template file for 'libgdal' pkgname=libgdal -version=2.3.0 +version=2.3.1 revision=1 wrksrc=gdal-${version} build_style=gnu-configure -hostmakedepends="gettext-devel pkg-config python python-numpy" -makedepends="expat-devel libxml2-devel giflib-devel libopenexr-devel libpng-devel - jasper-devel tiff-devel poppler-glib-devel liblzma-devel openjpeg2 opencl2-headers - pcre-devel sqlite-devel geos-devel" +configure_args="--with-liblzma --with-poppler" +hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel" +makedepends="freexl-devel geos-devel jasper-devel json-c-devel libcurl-devel + libopenexr-devel libopenjpeg2-devel libqhull-devel libwebp-devel libxml2-devel + libzstd-devel opencl-headers poppler-glib-devel sqlite-devel" short_desc="Geospatial Data Abstraction Library" maintainer="Jürgen Buchmüller " license="MIT" homepage="http://www.gdal.org/" distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" -checksum=6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2 +checksum=9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a post_install() { vinstall gdal.pc 644 usr/lib/pkgconfig diff --git a/srcpkgs/libglob/template b/srcpkgs/libglob/template index 929555942e4..2f873d6f31f 100644 --- a/srcpkgs/libglob/template +++ b/srcpkgs/libglob/template @@ -1,14 +1,14 @@ # Template file for 'libglob' pkgname=libglob version=1.0 -revision=1 +revision=2 build_style=gnu-makefile only_for_archs="aarch64-musl armv6l-musl armv7l-musl i686-musl mips-musl mipshf-musl mipsel-musl mipselhf-musl x86_64-musl" short_desc="BSD glob(3) implementation for the musl C library" maintainer="Juan RP " -license="3-clause-BSD" -homepage="https://github.com/voidlinux/libglob" -distfiles="https://github.com/voidlinux/${pkgname}/archive/${version}.tar.gz" +license="BSD-3-clause" +homepage="https://github.com/void-linux/libglob" +distfiles="https://github.com/void-linux/${pkgname}/archive/${version}.tar.gz" checksum=4f1b204dad065689941c64828a92441fb316c9c7539b39525fa728125da65e22 post_install() { diff --git a/srcpkgs/libgltf/template b/srcpkgs/libgltf/template index fbb79e5ee1f..c82d21edd7f 100644 --- a/srcpkgs/libgltf/template +++ b/srcpkgs/libgltf/template @@ -11,6 +11,7 @@ license="MPL" homepage="http://www.libreoffice.org" distfiles="http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.gz" checksum=119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da +CXXFLAGS="-DGLM_ENABLE_EXPERIMENTAL" libgltf-devel_package() { depends="libgltf>=${version}_${revision} $makedepends" diff --git a/srcpkgs/libgravatar/update b/srcpkgs/libgravatar/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/libgravatar/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/libgstreamerd-devel b/srcpkgs/libgstreamerd-devel new file mode 120000 index 00000000000..a978f92e038 --- /dev/null +++ b/srcpkgs/libgstreamerd-devel @@ -0,0 +1 @@ +gtkd \ No newline at end of file diff --git a/srcpkgs/libgtkdgl-devel b/srcpkgs/libgtkdgl-devel new file mode 120000 index 00000000000..a978f92e038 --- /dev/null +++ b/srcpkgs/libgtkdgl-devel @@ -0,0 +1 @@ +gtkd \ No newline at end of file diff --git a/srcpkgs/libgtkdsv-devel b/srcpkgs/libgtkdsv-devel new file mode 120000 index 00000000000..a978f92e038 --- /dev/null +++ b/srcpkgs/libgtkdsv-devel @@ -0,0 +1 @@ +gtkd \ No newline at end of file diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 7ab8f4a7322..1fd8568ac6d 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,6 +1,6 @@ # Template file for 'libguestfs' pkgname=libguestfs -version=1.39.5 +version=1.39.6 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=84fe4045fb0e2bbddb9646313b86cf0271c3b92daa4aa955c61f07d1c9c17401 +checksum=2fc293964a57ea2f78d62c0fda5fd16bcdc4b850ae4ffe192b07a7612c7c38b0 conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index b012196b1a2..cfc69c0f9a7 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,9 +1,8 @@ # Template file for 'libgweather' pkgname=libgweather -version=3.28.1 +version=3.28.2 revision=1 build_style=meson -build_options="gir" configure_args="-Denable_vala=$(vopt_if gir true false) -Dzoneinfo_dir=/usr/share/zoneinfo" hostmakedepends="glib-devel gobject-introspection intltool pkg-config @@ -14,10 +13,11 @@ short_desc="GNOME Weather information access library" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="http://www.gnome.org/" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=157a8388532a751b36befff424b11ed913b2c43689b62cd2060f6847eb730be3 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=081ce81653afc614e12641c97a8dd9577c524528c63772407ae2dbcde12bde75 nocross="requires gobject-introspection" +build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi diff --git a/srcpkgs/libinput/patches/fix-null-derefencing.patch b/srcpkgs/libinput/patches/fix-null-derefencing.patch new file mode 100644 index 00000000000..3a14e571334 --- /dev/null +++ b/srcpkgs/libinput/patches/fix-null-derefencing.patch @@ -0,0 +1,59 @@ +From 7c51c881dc72827ca50ae9eea3d123eef9cb4a66 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 20 Jun 2018 07:56:05 +1000 +Subject: [PATCH] tools: pass a valid grab parameter to list-devices + +My kingdome for a compiler warning. Or a scan-build warning. Or a coverity +warning. Or anything... But no, nothing. + +Also make the open_restricted() more robust to a NULL userdata, because +effectively that's what we were passing here. + +Fixes https://gitlab.freedesktop.org/libinput/libinput/issues/50 + +Introduced in 0a13223c39fdf0f079715bf83d498c0dcd9cf4f8 + +Signed-off-by: Peter Hutterer +--- + tools/libinput-list-devices.c | 3 ++- + tools/shared.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c +index aa225ca..4cbdf77 100644 +--- tools/libinput-list-devices.c ++++ tools/libinput-list-devices.c +@@ -372,6 +372,7 @@ main(int argc, char **argv) + { + struct libinput *li; + struct libinput_event *ev; ++ bool grab = false; + + /* This is kept for backwards-compatibility with the old + libinput-list-devices */ +@@ -388,7 +389,7 @@ main(int argc, char **argv) + } + } + +- li = tools_open_backend(BACKEND_UDEV, "seat0", false, false); ++ li = tools_open_backend(BACKEND_UDEV, "seat0", false, &grab); + if (!li) + return 1; + +diff --git a/tools/shared.c b/tools/shared.c +index d1f0270..d3fb629 100644 +--- tools/shared.c ++++ tools/shared.c +@@ -232,7 +232,7 @@ open_restricted(const char *path, int flags, void *user_data) + if (fd < 0) + fprintf(stderr, "Failed to open %s (%s)\n", + path, strerror(errno)); +- else if (*grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1) ++ else if (grab && *grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1) + fprintf(stderr, "Grab requested, but failed for %s (%s)\n", + path, strerror(errno)); + +-- +libgit2 0.27.1 + + diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index cfc938af41d..9ad80ae7315 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,7 +1,7 @@ # Template file for 'libinput' pkgname=libinput -version=1.11.0 -revision=1 +version=1.11.1 +revision=2 build_style=meson configure_args="-Ddebug-gui=false -Ddocumentation=false" hostmakedepends="pkg-config valgrind" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/libinput" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=64a36c4f826f4b5d473bf2cb803122f96390a18243ec810f2ce8ac5076a0bc12 +checksum=642e95aecc7a592c676cde5b4cfda6d2939d2e2f686a8edbbc369808e646f1fc post_install() { vlicense COPYING diff --git a/srcpkgs/libkcapi/patches/makefile.patch b/srcpkgs/libkcapi/patches/makefile.patch index 4dda0698d8a..302a3833f12 100644 --- a/srcpkgs/libkcapi/patches/makefile.patch +++ b/srcpkgs/libkcapi/patches/makefile.patch @@ -1,15 +1,22 @@ --- Makefile.am +++ Makefile.am -@@ -145,10 +145,10 @@ kcapi_hasher_links = sha1sum sha224sum sha256sum sha384sum sha512sum \ +@@ -153,16 +153,16 @@ CHECK_DIR_BIN_HC = $(if $(CHECK_DIR),$(CHECK_DIR)/hmaccalc,$(bindir)) install-exec-hook: (cd $(DESTDIR)$(bindir) && \ -- ($(foreach link, $(kcapi_hasher_links), $(LN) -f kcapi-hasher $(link);))) -+ ($(foreach link, $(kcapi_hasher_links), $(LN) -f kcapi-hasher $(link)-kcapi;))) +- ($(foreach link, $(hasher_links), $(LN) -f kcapi-hasher $(link);))) ++ ($(foreach link, $(hasher_links), $(LN) -f kcapi-hasher $(link)-kcapi;))) + -rm -f $(DESTDIR)$(bindir)/kcapi-hasher if HAVE_OPENSSL + $(MKDIR_P) $(DESTDIR)$(CHECK_DIR_BIN_FC) + $(MKDIR_P) $(DESTDIR)$(CHECK_DIR_BIN_HC) (cd $(DESTDIR)$(bindir) && \ -- ($(foreach link, $(kcapi_hasher_links), $(OPENSSL) sha256 -hmac orboDeJITITejsirpADONivirpUkvarP $(link) > $(CHECK_PREFIX)$(link).$(CHECK_SUFFIX);))) -+ ($(foreach link, $(kcapi_hasher_links), $(OPENSSL) sha256 -hmac orboDeJITITejsirpADONivirpUkvarP $(link)-kcapi > $(CHECK_PREFIX)$(link).$(CHECK_SUFFIX);))) + ($(foreach link, $(hasher_links_fc), \ +- $(CHECKSUM_CMD_FC) $(link) > $(DESTDIR)$(CHECK_DIR_BIN_FC)/$(CHECK_PREFIX)$(link).$(CHECK_SUFFIX);) \ ++ $(CHECKSUM_CMD_FC) $(link)-kcapi > $(DESTDIR)$(CHECK_DIR_BIN_FC)/$(CHECK_PREFIX)$(link).$(CHECK_SUFFIX);) \ + $(foreach link, $(hasher_links_hc), \ +- $(CHECKSUM_CMD_HC) $(link) > $(DESTDIR)$(CHECK_DIR_BIN_HC)/$(CHECK_PREFIX)$(link).$(CHECK_SUFFIX);):)) ++ $(CHECKSUM_CMD_HC) $(link)-kcapi > $(DESTDIR)$(CHECK_DIR_BIN_HC)/$(CHECK_PREFIX)$(link).$(CHECK_SUFFIX);):)) + ($(foreach lib, $(wildcard $(DESTDIR)$(libdir)/libkcapi.so*), \ + $(CHECKSUM_CMD_FC) $(lib) > $(DESTDIR)$(CHECK_DIR_LIB)/$(CHECK_PREFIX)$(notdir $(lib)).$(CHECK_SUFFIX);):) endif - endif - diff --git a/srcpkgs/libkcapi/template b/srcpkgs/libkcapi/template index 2fcd585b7c3..81c6baac05f 100644 --- a/srcpkgs/libkcapi/template +++ b/srcpkgs/libkcapi/template @@ -1,6 +1,6 @@ # Template file for 'libkcapi' pkgname=libkcapi -version=1.1.0 +version=1.1.1 revision=1 build_style=gnu-configure configure_args=" --enable-kcapi-speed --enable-kcapi-hasher @@ -12,7 +12,7 @@ maintainer="maxice8 " license="GPL-2.0-or-later, BSD-3-Clause" homepage="https://github.com/smuellerDD/libkcapi" distfiles="https://github.com/smuellerDD/libkcapi/archive/v${version}.tar.gz" -checksum=fa43554ab8bac1be18a4f8e25def79658bf315e5f00ca66faf4718c4ac637f13 +checksum=91d94ccba520db98765d32ec7df44b94d86005e833451b9aed2f0c6d3b647ac1 pre_configure() { autoreconf -i diff --git a/srcpkgs/libkdcraw5/update b/srcpkgs/libkdcraw5/update deleted file mode 100644 index 3658d52a1ae..00000000000 --- a/srcpkgs/libkdcraw5/update +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=libkdcraw -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/libkgapi/update b/srcpkgs/libkgapi/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/libkgapi/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template index 4404177dfd8..b5a4055dea6 100644 --- a/srcpkgs/libkipi5/template +++ b/srcpkgs/libkipi5/template @@ -1,6 +1,6 @@ # Template file for 'libkipi5' pkgname=libkipi5 -version=17.12.2 +version=18.04.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -10,10 +10,10 @@ makedepends="kxmlgui-devel" conflicts="libkipi" short_desc="An interface to use kipi-plugins from a KDE application" maintainer="Denis Revin " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" -distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=055ac08616d9c07ab3fa08caab9ec2e79f4c41a87bc9b3d9b402401c89781ea0 +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname%5}-${version}.tar.xz" +checksum=16700d690bb827660760935750a6fdb4e9a4755f28b3405a3cbb109ce9d2adad libkipi5-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libkleo/update b/srcpkgs/libkleo/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/libkleo/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/libksane-devel b/srcpkgs/libksane-devel new file mode 120000 index 00000000000..d079758af50 --- /dev/null +++ b/srcpkgs/libksane-devel @@ -0,0 +1 @@ +libksane \ No newline at end of file diff --git a/srcpkgs/libksane/template b/srcpkgs/libksane/template new file mode 100644 index 00000000000..b869b862b1d --- /dev/null +++ b/srcpkgs/libksane/template @@ -0,0 +1,23 @@ +# Template file for 'libksane' +pkgname=libksane +version=18.04.2 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules" +makedepends="qt5-devel libkdepim-devel sane-devel" +short_desc="An image scanning library" +maintainer="travankor " +license="LGPL-2.1-or-later" +homepage="https://www.kde.org/applications/graphics/" +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=be057f47750d5ae8b9b5bacb332af1b9c603e1636f96b8e8117e49d9be0a8c3a + +libksane-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/cmake + } +} diff --git a/srcpkgs/libksieve/update b/srcpkgs/libksieve/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/libksieve/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template index 8a65cfa5f17..d7f44eacba1 100644 --- a/srcpkgs/liblxqt/template +++ b/srcpkgs/liblxqt/template @@ -1,17 +1,17 @@ # Template file for 'liblxqt' pkgname=liblxqt -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools kwindowsystem-devel" -makedepends="lxqt-build-tools kwindowsystem-devel libqtxdg-devel libXScrnSaver-devel" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel" +makedepends="kwindowsystem-devel libqtxdg-devel libXScrnSaver-devel polkit-qt5-devel" short_desc="Core utility library for all LXQt components" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/liblxqt/releases/download/${version}/liblxqt-${version}.tar.xz" -checksum=44bba48b073ded5b0ab3de2ea3575a704bb22d23ce5cc5743f76579c1f084f33 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/liblxqt/releases/download/${version}/liblxqt-${version}.tar.xz" +checksum=b41db9dd6fcc4e3232402ee0304d2b977ec82d696c464667dddba555b0056a39 liblxqt-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libmpack-devel b/srcpkgs/libmpack-devel new file mode 120000 index 00000000000..73626875c28 --- /dev/null +++ b/srcpkgs/libmpack-devel @@ -0,0 +1 @@ +libmpack \ No newline at end of file diff --git a/srcpkgs/libmpack/template b/srcpkgs/libmpack/template new file mode 100644 index 00000000000..1897b0e826e --- /dev/null +++ b/srcpkgs/libmpack/template @@ -0,0 +1,25 @@ +# Template file for 'libmpack' +pkgname=libmpack +version=1.0.5 +revision=1 +build_style=gnu-makefile +hostmakedepends="libtool" +short_desc="Simple implementation of msgpack in C" +maintainer="maxice8 " +license="MTI" +homepage="https://github.com/libmpack/libmpack" +distfiles="https://github.com/libmpack/libmpack/archive/${version}.tar.gz" +checksum=4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956 +make_check_target=test +nocross="libtool usage doesn't support cross-compiling" + +libmpack-devel_package() { + depends="libmpack-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} diff --git a/srcpkgs/libndctl b/srcpkgs/libndctl new file mode 120000 index 00000000000..7a83effa857 --- /dev/null +++ b/srcpkgs/libndctl @@ -0,0 +1 @@ +ndctl \ No newline at end of file diff --git a/srcpkgs/libndctl-devel b/srcpkgs/libndctl-devel new file mode 120000 index 00000000000..7a83effa857 --- /dev/null +++ b/srcpkgs/libndctl-devel @@ -0,0 +1 @@ +ndctl \ No newline at end of file diff --git a/srcpkgs/libnfs/patches/fix-musl.patch b/srcpkgs/libnfs/patches/fix-musl.patch new file mode 100644 index 00000000000..fe6de52594c --- /dev/null +++ b/srcpkgs/libnfs/patches/fix-musl.patch @@ -0,0 +1,10 @@ +--- include/nfsc/libnfs.h ++++ include/nfsc/libnfs.h +@@ -24,6 +24,7 @@ + #define _LIBNFS_H_ + + #include ++#include + #if defined(__ANDROID__) || defined(AROS) \ + || ( defined(__APPLE__) && defined(__MACH__) ) + #include diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template index 840922317ec..ef19425a9ed 100644 --- a/srcpkgs/libnfs/template +++ b/srcpkgs/libnfs/template @@ -1,16 +1,16 @@ # Template file for 'libnfs' pkgname=libnfs -version=2.0.0 +version=3.0.0 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="libtool pkg-config automake" short_desc="Client library for accessing NFS shares" maintainer="Juan RP " +license="LGPL-2.1-or-later" homepage="https://github.com/sahlberg/libnfs" -license="GPL-2" -distfiles="https://github.com/sahlberg/libnfs/archive/$pkgname-${version}.tar.gz" -checksum=7ea6cd8fa6c461d01091e584d424d28e137d23ff4b65b95d01a3fd0ef95d120e +distfiles="https://github.com/sahlberg/libnfs/archive/${pkgname}-${version}.tar.gz" +checksum=445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libnova-devel b/srcpkgs/libnova-devel new file mode 120000 index 00000000000..6122617d2c1 --- /dev/null +++ b/srcpkgs/libnova-devel @@ -0,0 +1 @@ +libnova \ No newline at end of file diff --git a/srcpkgs/libnova/template b/srcpkgs/libnova/template new file mode 100644 index 00000000000..af136b9d786 --- /dev/null +++ b/srcpkgs/libnova/template @@ -0,0 +1,27 @@ +# Template file for 'libnova' +pkgname=libnova +version=0.15.0 +revision=1 +build_style=gnu-configure +hostmakedepends="autoconf automake libtool" +short_desc="A double precision astrometry and astrodynamics library" +maintainer="travankor " +license="LGPL-2.0-or-later" +homepage="http://libnova.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=7c5aa33e45a3e7118d77df05af7341e61784284f1e8d0d965307f1663f415bb1 + +pre_build() { + autoreconf -i +} + +libnova-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/libnovaconfig + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} \ No newline at end of file diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template index 5da83dadefc..99072f9cd62 100644 --- a/srcpkgs/libosinfo/template +++ b/srcpkgs/libosinfo/template @@ -1,18 +1,20 @@ # Template file for 'libosinfo' pkgname=libosinfo -version=1.1.0 -revision=2 +version=1.2.0 +revision=1 build_style=gnu-configure -configure_args="--disable-static --disable-tests $(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool glib-devel wget" -makedepends="libglib-devel libsoup-gnome-devel libxml2-devel libxslt-devel vala-devel $(vopt_if gir gobject-introspection)" +configure_args="--disable-static $(vopt_enable gir introspection)" +hostmakedepends="glib-devel intltool pkg-config wget" +makedepends="libxslt-devel vala-devel $(vopt_if gir 'gobject-introspection')" depends="osinfo-db" +checkdepends="libosinfo" short_desc="GObject based library API for managing info about operating systems" -maintainer="Juan RP " +maintainer="maxice8 " +license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://libosinfo.org/" -license="GPL-2, LGPL-2.1" +changelog="https://gitlab.com/libosinfo/libosinfo/raw/master/NEWS" distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.gz" -checksum=600f43a4a8dae5086a01a3d44bcac2092b5fa1695121289806d544fb287d3136 +checksum=ee254fcf3f92447787a87b3f6df190c694a787de46348c45101e8dc7b29b5a78 # Package build options build_options="gir" @@ -26,9 +28,10 @@ libosinfo-devel_package() { depends="libglib-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/include vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 vmove usr/share/vala diff --git a/srcpkgs/libpeasd-devel b/srcpkgs/libpeasd-devel new file mode 120000 index 00000000000..a978f92e038 --- /dev/null +++ b/srcpkgs/libpeasd-devel @@ -0,0 +1 @@ +gtkd \ No newline at end of file diff --git a/srcpkgs/libpipewire b/srcpkgs/libpipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libpipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libplacebo-devel b/srcpkgs/libplacebo-devel new file mode 120000 index 00000000000..9ae0446455d --- /dev/null +++ b/srcpkgs/libplacebo-devel @@ -0,0 +1 @@ +libplacebo \ No newline at end of file diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template new file mode 100644 index 00000000000..83c525867f4 --- /dev/null +++ b/srcpkgs/libplacebo/template @@ -0,0 +1,21 @@ +# Template file for 'libplacebo' +pkgname=libplacebo +version=0.5.0 +revision=1 +build_style=meson +short_desc="Reusable library for GPU-accelerated video/image rendering" +maintainer="maxice8 " +license="LGPL-2.1-or-later" +homepage="https://github.com/haasn/libplacebo" +distfiles="https://github.com/haasn/libplacebo/archive/v${version}.tar.gz" +checksum=2cc7729a25cb1c265b96900cd22727d96ce984c16cf57bfb784c7f988a5e32a7 + +libplacebo-devel_package() { + depends="libplacebo-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libpqxx/template b/srcpkgs/libpqxx/template index 44f6cee8b46..aa6f657e7d3 100644 --- a/srcpkgs/libpqxx/template +++ b/srcpkgs/libpqxx/template @@ -1,6 +1,6 @@ # Template file for 'libpqxx' pkgname=libpqxx -version=6.2.3 +version=6.2.4 revision=1 build_style=gnu-configure configure_args="--enable-shared --disable-documentation" @@ -9,10 +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" +changelog="https://raw.githubusercontent.com/jtv/libpqxx/master/NEWS" distfiles="https://github.com/jtv/${pkgname}/archive/${version}.tar.gz" -checksum=382b88992c6162c9814388cc8575eb774ffad03d49743a5d9576aa3bffc91dfa +checksum=91a295d9e06fc36db5d993970aa1928e053a57ec03bf6284a1c534844ed35ed3 post_install() { vlicense COPYING diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template index 7a9d86793e2..f681510a47f 100644 --- a/srcpkgs/libqtxdg/template +++ b/srcpkgs/libqtxdg/template @@ -1,16 +1,16 @@ # Template file for 'libqtxdg' pkgname=libqtxdg -version=3.1.0 -revision=2 +version=3.2.0 +revision=1 build_style=cmake -hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools-devel" -makedepends="qt5-tools-devel qt5-svg-devel" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools" +makedepends="qt5-svg-devel" short_desc="Qt implementation of freedesktop.org XDG specifications" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/libqtxdg/releases/download/${version}/libqtxdg-${version}.tar.xz" -checksum=0ee1a4684b782e34950c55dc06df1b4ef2dc3d9b3562a512de004191c18a2e08 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/libqtxdg/releases/download/${version}/libqtxdg-${version}.tar.xz" +checksum=949134060d148df2ca4515e3759ed9c6a2fa7c51eb7a2197dd0e26a32e220553 libqtxdg-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template index 145de172e4c..35d69f69e9e 100644 --- a/srcpkgs/libraw/template +++ b/srcpkgs/libraw/template @@ -1,17 +1,18 @@ # Template file for 'libraw' pkgname=libraw -version=0.18.8 +version=0.18.13 revision=1 -wrksrc=LibRaw-${version} +wrksrc="LibRaw-${version}" build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="lcms2-devel jasper-devel" +makedepends="jasper-devel lcms2-devel" short_desc="Raw image decoder library" maintainer="Juan RP " -license="LGPL-2.1, CDDL" -homepage="http://www.libraw.org" -distfiles="http://www.libraw.org/data/LibRaw-${version}.tar.gz" -checksum=56aca4fd97038923d57d2d17d90aa11d827f1f3d3f1d97e9f5a0d52ff87420e2 +license="LGPL-2.1-only, CDDL-1.0" +homepage="https://www.libraw.org" +changelog="https://raw.githubusercontent.com/LibRaw/LibRaw/0.18-stable/Changelog.txt" +distfiles="https://www.libraw.org/data/LibRaw-${version}.tar.gz" +checksum=cb1f9d0d1fabc8967d501d95c05d2b53d97a2b917345c66553b1abbea06757ca post_install() { vmkdir usr/share/licenses @@ -29,6 +30,7 @@ libraw-devel_package() { vmove "usr/lib/*.so" } } + libraw-progs_package() { short_desc+=" - applications" pkg_install() { diff --git a/srcpkgs/libreoffice-firebird b/srcpkgs/libreoffice-firebird new file mode 120000 index 00000000000..d5e3a56f350 --- /dev/null +++ b/srcpkgs/libreoffice-firebird @@ -0,0 +1 @@ +libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice-fonts b/srcpkgs/libreoffice-fonts new file mode 120000 index 00000000000..d5e3a56f350 --- /dev/null +++ b/srcpkgs/libreoffice-fonts @@ -0,0 +1 @@ +libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice-xtensions b/srcpkgs/libreoffice-xtensions new file mode 120000 index 00000000000..d5e3a56f350 --- /dev/null +++ b/srcpkgs/libreoffice-xtensions @@ -0,0 +1 @@ +libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 9b353d2f264..cf49832ad63 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -2,7 +2,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=6.0.4.2 -revision=1 +revision=2 build_style=meta make_build_args="build-nocheck" nocross=yes @@ -28,11 +28,14 @@ depends+=" libreoffice-common>=${version}_${revision}" depends+=" libreoffice-base>=${version}_${revision}" depends+=" libreoffice-calc>=${version}_${revision}" depends+=" libreoffice-draw>=${version}_${revision}" +depends+=" libreoffice-fonts>=${version}_${revision}" +depends+=" libreoffice-firebird>=${version}_${revision}" depends+=" libreoffice-gnome>=${version}_${revision}" depends+=" libreoffice-impress>=${version}_${revision}" depends+=" libreoffice-math>=${version}_${revision}" depends+=" libreoffice-postgresql>=${version}_${revision}" depends+=" libreoffice-writer>=${version}_${revision}" +depends+=" libreoffice-xtensions>=${version}_${revision}" # Add the previously installed default languages as well depends+=" libreoffice-i18n-en-US>=${version}_${revision}" depends+=" libreoffice-i18n-de>=${version}_${revision}" @@ -62,6 +65,8 @@ _baseurl="http://download.documentfoundation.org/${pkgname}/src/${version%.*}" _addurl="http://dev-www.libreoffice.org/src" _exturl="http://dev-www.libreoffice.org/extern" +# Additional distfiles and checksums can be found in +# the file 'download.lst' after configure was run. distfiles=" ${_baseurl}/${pkgname}-${version}.tar.xz ${_baseurl}/${pkgname}-dictionaries-${version}.tar.xz @@ -273,6 +278,8 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL" + # Move files listed in a _list.txt into $PKGDESTDIR _split() { local list file dir destdir @@ -286,6 +293,13 @@ _split() { mv ${destdir}/${file} ${PKGDESTDIR}/${dir}/ done done + # Move appdata file, if any + file=usr/share/appdata/libreoffice-${1}.appdata.xml + if [ -f ${destdir}/${file} ]; then + dir="${file%/*}" + ! [ -d "${PKGDESTDIR}/${dir}" ] && vmkdir "${dir}" + mv ${destdir}/${file} ${PKGDESTDIR}/${dir}/ + fi } _languages="" @@ -503,11 +517,10 @@ do_configure() { opts+=" --with-tls=nss" # xmlsec1-nss is missing, thus don't use system-xmlsec opts+=" --without-system-xmlsec" + opts+=" --without-system-firebird" opts+=" --without-system-libzmf" opts+=" --without-system-libstaroffice" opts+=" --without-system-mysql-cppconn" - # without firebird-sdbc (as it is not packaged correctly) - opts+=" --disable-firebird-sdbc" opts+=" --without-system-libtommath" opts+=" --without-system-jfreereport" opts+=" --without-system-apache-commons" @@ -532,7 +545,7 @@ do_build() { } do_install() { - make DESTDIR="${DESTDIR}/all" PREFIXDIR="/usr" distro-pack-install + make DESTDIR="${DESTDIR}/all" PREFIXDIR=/usr distro-pack-install # Remove useless directory usr/lib32 rm -rf ${DESTDIR}/usr/lib32 @@ -573,6 +586,31 @@ libreoffice-draw_package() { } } +libreoffice-firebird_package() { + short_desc+=" - Connector for Firebird SDBC" + noverifyrdeps=yes + pkg_install() { + vmkdir usr/lib/libreoffice/program + for f in libEngine12.so libfbclient.so.2 libfirebird_sdbclo.so; do + mv ${DESTDIR}/all/usr/lib/libreoffice/program/${f} \ + ${PKGDESTDIR}/usr/lib/libreoffice/program/ + done + vmkdir usr/lib/libreoffice/share + mv ${DESTDIR}/all/usr/lib/libreoffice/share/firebird \ + ${PKGDESTDIR}/usr/lib/libreoffice/share/ + } +} + +libreoffice-fonts_package() { + short_desc+=" - Fonts" + noarch=yes + pkg_install() { + vmkdir usr/lib/libreoffice/share + mv ${DESTDIR}/all/usr/lib/libreoffice/share/fonts \ + ${PKGDESTDIR}/usr/lib/libreoffice/share/ + } +} + libreoffice-gnome_package() { short_desc+=" - GNOME integration" depends="libreoffice-common>=${version}_${revision}" @@ -623,7 +661,24 @@ libreoffice-writer_package() { noverifyrdeps=yes pkg_install() { _split writer - # Remove any remains from not packaged files - rm -rf ${DESTDIR}/all + } +} + +# Use a name which makes this catch-all subpackage the last one +libreoffice-xtensions_package() { + short_desc+=" - Extensions" + depends="libreoffice-common>=${version}_${revision}" + noverifyrdeps=yes + pkg_install() { + # Remove empty files + find ${DESTDIR}/all -size 0 -delete + # Remove useless files + for f in segments.gen segments_3 _0.cfs help.tree help.key_ help.db_; do + find ${DESTDIR}/all -name "${f}" -delete + done + # Move the remaining files to this subpackage + vmkdir usr + mv -v ${DESTDIR}/all/usr/* ${PKGDESTDIR}/usr/ + rm -rvf ${DESTDIR}/all } } diff --git a/srcpkgs/rpm-devel b/srcpkgs/librpm similarity index 100% rename from srcpkgs/rpm-devel rename to srcpkgs/librpm diff --git a/srcpkgs/librpm-devel b/srcpkgs/librpm-devel new file mode 120000 index 00000000000..7c88ef3c072 --- /dev/null +++ b/srcpkgs/librpm-devel @@ -0,0 +1 @@ +rpm \ No newline at end of file diff --git a/srcpkgs/librpmbuild b/srcpkgs/librpmbuild new file mode 120000 index 00000000000..7c88ef3c072 --- /dev/null +++ b/srcpkgs/librpmbuild @@ -0,0 +1 @@ +rpm \ No newline at end of file diff --git a/srcpkgs/librpmio b/srcpkgs/librpmio new file mode 120000 index 00000000000..7c88ef3c072 --- /dev/null +++ b/srcpkgs/librpmio @@ -0,0 +1 @@ +rpm \ No newline at end of file diff --git a/srcpkgs/librpmsign b/srcpkgs/librpmsign new file mode 120000 index 00000000000..7c88ef3c072 --- /dev/null +++ b/srcpkgs/librpmsign @@ -0,0 +1 @@ +rpm \ No newline at end of file diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index a765f67177a..dff5fb1b476 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,11 +1,11 @@ # Template build file for 'librsvg'. pkgname=librsvg version=2.40.20 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--disable-static $(vopt_enable gir introspection)" +configure_args="--disable-static $(vopt_enable gir introspection) $(vopt_enable vala)" hostmakedepends="automake libtool pkg-config intltool python glib-devel - gdk-pixbuf-devel gobject-introspection" + gdk-pixbuf-devel gobject-introspection $(vopt_if vala vala-devel)" makedepends="libcroco-devel pango-devel gdk-pixbuf-devel" triggers="gtk-pixbuf-loaders" short_desc="SVG library for GNOME" @@ -16,11 +16,11 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b # Package build options -build_options="gir" +build_options="gir vala" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" + build_options_default="vala gir" fi pre_configure() { @@ -43,6 +43,9 @@ librsvg-devel_package() { if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi + if [ "$build_options_vala" ]; then + vmove usr/share/vala + fi } } librsvg-utils_package() { diff --git a/srcpkgs/libsass/template b/srcpkgs/libsass/template index 7803bfeecf2..142b9660622 100644 --- a/srcpkgs/libsass/template +++ b/srcpkgs/libsass/template @@ -1,6 +1,6 @@ # Template file for 'libsass' pkgname=libsass -version=3.5.3 +version=3.5.4 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio " license="MIT" homepage="http://www.sass-lang.com/libsass" distfiles="https://github.com/sass/${pkgname}/archive/${version}.tar.gz" -checksum=f19fd5ce1c4209b9f3e2f6764e1e6c40194bf2e854865341f3c94d0d95c0cdd1 +checksum=5f61cbcddaf8e6ef7a725fcfa5d05297becd7843960f245197ebb655ff868770 pre_configure() { NOCONFIGURE=1 autoreconf -fi diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 3f9a17c5946..832a90eb0b3 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -1,7 +1,8 @@ # Template file for 'libsearpc' pkgname=libsearpc +reverts="3.0.8_1" version=3.0.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-compile-demo" hostmakedepends="automake libtool pkg-config python" diff --git a/srcpkgs/libskk/template b/srcpkgs/libskk/template index 5c0afef30ef..9caf8c90a22 100644 --- a/srcpkgs/libskk/template +++ b/srcpkgs/libskk/template @@ -1,16 +1,17 @@ -# Template file for 'lib-skk' +# Template file for 'libskk' pkgname=libskk -version=1.0.3 +version=1.0.4 revision=1 +build_style=gnu-configure +hostmakedepends="gettext-devel gnome-common gobject-introspection intltool + libgee08-devel pkg-config vala" +makedepends="json-glib-devel libgee08-devel" short_desc="Japanese SKK input method library" maintainer="Satoshi Amemiya " +license="GPL-3.0-or-later" homepage="https://github.com/ueno/${pkgname}" -license="GPL-3" -hostmakedepends="libgee08-devel pkg-config intltool gnome-common gobject-introspection vala gettext-devel" -makedepends="libgee08-devel json-glib-devel" -build_style=gnu-configure distfiles="https://github.com/ueno/${pkgname}/archive/${version}.tar.gz" -checksum=9c1fe5f426608cf81dc6db11741c7e07d3cc6264b225455aff361ed408df3887 +checksum=39ff9a7df25b319b0e0e74fe4161de17720a32bf73dea8096647e13efcd89f9d build_options="gir" if [ "$CROSS_BUILD" ]; then @@ -28,7 +29,7 @@ libskk-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template index db65fcdca4c..10a095266a8 100644 --- a/srcpkgs/libsmbios/template +++ b/srcpkgs/libsmbios/template @@ -1,18 +1,18 @@ # Template file for 'libsmbios' pkgname=libsmbios -version=2.4.1 +version=2.4.2 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-static --disable-python" -hostmakedepends="pkg-config perl automake gettext-devel libtool doxygen help2man" +hostmakedepends="automake doxygen gettext-devel help2man libtool pkg-config" makedepends="libxml2-devel" checkdepends="python3" short_desc="Library for SMBIOS access" +maintainer="maxice8 " +license="GPL-2.0-or-later, OLS-2.1" homepage="https://github.com/dell/libsmbios" -license="GPL-2+, OLS-2.1" -maintainer="Juan RP " distfiles="https://github.com/dell/libsmbios/archive/v${version}.tar.gz" -checksum=ad200d0b8db681d04336afb64c765808b3bfdfc18619e24621576c03564e629f +checksum=ebfe18415e24bbec06d0a9ea1066c8dcd82982555373712713d7e194138650de only_for_archs="i686 i686-musl x86_64 x86_64-musl" @@ -43,10 +43,11 @@ libsmbios-devel_package() { vmove "usr/lib/*.so" } } + libsmbios-utils_package() { short_desc+=" - utilities" pkg_install() { vmove usr/bin - vmove "usr/share/man/man1/*.1" + vmove usr/share/man/man1 } } diff --git a/srcpkgs/libspa-bluetooth b/srcpkgs/libspa-bluetooth new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libspa-bluetooth @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libspa-ffmpeg @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libspa-lib b/srcpkgs/libspa-lib new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libspa-lib @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libspa-lib-devel b/srcpkgs/libspa-lib-devel new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libspa-lib-devel @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template index a615ea95cd7..9a5b7da495d 100644 --- a/srcpkgs/libssh/template +++ b/srcpkgs/libssh/template @@ -1,15 +1,16 @@ # Template file for 'libssh' pkgname=libssh version=0.7.5 -revision=3 +revision=4 build_style=cmake +configure_args="-DWITH_TESTING=ON" hostmakedepends="pkg-config" -makedepends="zlib-devel libressl-devel" +makedepends="zlib-devel libressl-devel cmocka-devel" short_desc="Multiplatform C library implementing the SSH v2 protocol" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://www.libssh.org/" -distfiles="http://git.libssh.org/projects/libssh.git/snapshot/${pkgname}-${version}.tar.bz2" +license="LGPL-2.1-or-later" +homepage="https://www.libssh.org/" +distfiles="https://git.libssh.org/projects/libssh.git/snapshot/${pkgname}-${version}.tar.bz2" checksum=ff914e2ec6596badec453efaa63ef68c82c60074466f951167a4c60e49903336 libssh-devel_package() { diff --git a/srcpkgs/libsysstat/template b/srcpkgs/libsysstat/template index fd8465a6747..608651e6a14 100644 --- a/srcpkgs/libsysstat/template +++ b/srcpkgs/libsysstat/template @@ -1,16 +1,16 @@ # Template file for 'libsysstat' pkgname=libsysstat -version=0.4.0 +version=0.4.1 revision=1 build_style=cmake -hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" -makedepends="lxqt-build-tools liblxqt-devel libXcursor-devel" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="qt5-devel" short_desc="Qt-based interface to system statistics" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxde.org/" -distfiles="https://github.com/lxde/libsysstat/releases/download/${version}/libsysstat-${version}.tar.xz" -checksum=8fea723545aeb266f1a998d450aa4c985194b8b79d314817c7c2a78e9b4e996b +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/libsysstat/releases/download/${version}/libsysstat-${version}.tar.xz" +checksum=c376e5c3a650d56873f2bd757292282f6b6b5af7ecc6d24c7a4df7b8c646ff59 replaces="lxde-libsysstat>=0" libsysstat-devel_package() { diff --git a/srcpkgs/libticables2-devel b/srcpkgs/libticables2-devel new file mode 120000 index 00000000000..da8ee81ce66 --- /dev/null +++ b/srcpkgs/libticables2-devel @@ -0,0 +1 @@ +libticables2 \ No newline at end of file diff --git a/srcpkgs/libticables2/template b/srcpkgs/libticables2/template new file mode 100644 index 00000000000..eebc810b46c --- /dev/null +++ b/srcpkgs/libticables2/template @@ -0,0 +1,35 @@ +# Template file for 'libticables2' +pkgname=libticables2 +version=1.3.5 +revision=1 +_tilpver=1.18 +build_style=gnu-configure +configure_args="--enable-libusb10" +hostmakedepends="automake bison groff intltool libtool pkg-config texinfo" +makedepends="glib-devel libusb-devel gettext-devel" +short_desc="TI Link Cable Library" +maintainer="Andrew Benson " +license=" GPL-2.0-or-later" +homepage="https://www.ticalc.org" +distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2" +checksum=0c6fb6516e72ccab081ddb3aecceff694ed93aec689ddd2edba9c7c7406c4522 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" gettext-devel" +fi + +pre_configure() { + mkdir -p m4 + autoreconf -i -v -f +} + +libticables2-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + diff --git a/srcpkgs/libticalcs2-devel b/srcpkgs/libticalcs2-devel new file mode 120000 index 00000000000..1e731906b9a --- /dev/null +++ b/srcpkgs/libticalcs2-devel @@ -0,0 +1 @@ +libticalcs2 \ No newline at end of file diff --git a/srcpkgs/libticalcs2/template b/srcpkgs/libticalcs2/template new file mode 100644 index 00000000000..423a90949e8 --- /dev/null +++ b/srcpkgs/libticalcs2/template @@ -0,0 +1,35 @@ +# Template file for 'libticalcs2' +pkgname=libticalcs2 +version=1.1.9 +revision=1 +_tilpver=1.18 +build_style=gnu-configure +hostmakedepends="autoconf automake bison groff intltool libtool pkg-config + texinfo" +makedepends="libticables2-devel libtifiles2-devel" +short_desc="Library for interacting with TI graphing calculators" +maintainer="Andrew Benson " +license="GPL-2.0-or-later" +homepage="https://www.ticalc.org" +distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2" +checksum=76780788bc309b647f97513d38dd5f01611c335a72855e0bd10c7bdbf2e38921 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" gettext-devel" +fi + +pre_configure() { + mkdir -p m4 + autoreconf -i -v -f +} + +libticalcs2-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + diff --git a/srcpkgs/libticonv-devel b/srcpkgs/libticonv-devel new file mode 120000 index 00000000000..f30dfeda6f2 --- /dev/null +++ b/srcpkgs/libticonv-devel @@ -0,0 +1 @@ +libticonv \ No newline at end of file diff --git a/srcpkgs/libticonv/template b/srcpkgs/libticonv/template new file mode 100644 index 00000000000..3c7790896bd --- /dev/null +++ b/srcpkgs/libticonv/template @@ -0,0 +1,30 @@ +# Template file for 'libticonv' +pkgname=libticonv +version=1.1.5 +revision=1 +_tilpver=1.18 +build_style=gnu-configure +configure_args="--enable-iconv" +hostmakedepends="automake bison groff intltool libtool pkg-config texinfo" +makedepends="glib-devel" +short_desc="TI character set conversion library" +maintainer="Andrew Benson " +license=" GPL-2.0-or-later" +homepage="https://www.ticalc.org" +distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2" +checksum=316da6a73bf26b266dd23443882abc4c9fe7013edc3a53e5e301d525c2060878 + +pre_configure() { + mkdir -p m4 + autoreconf -i -v -f +} + +libticonv-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/libtifiles2-devel b/srcpkgs/libtifiles2-devel new file mode 120000 index 00000000000..bfe5d07c450 --- /dev/null +++ b/srcpkgs/libtifiles2-devel @@ -0,0 +1 @@ +libtifiles2 \ No newline at end of file diff --git a/srcpkgs/libtifiles2/template b/srcpkgs/libtifiles2/template new file mode 100644 index 00000000000..181d618265f --- /dev/null +++ b/srcpkgs/libtifiles2/template @@ -0,0 +1,34 @@ +# Template file for 'libtifiles2' +pkgname=libtifiles2 +version=1.1.7 +revision=1 +_tilpver=1.18 +build_style=gnu-configure +hostmakedepends="automake bison groff intltool libtool pkg-config texinfo" +makedepends="libticonv-devel libarchive-devel gettext-devel" +short_desc="TI File format library" +maintainer="Andrew Benson " +license=" GPL-2.0-or-later" +homepage="https://www.ticalc.org" +distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2" +checksum=9ac63b49e97b09b30b37bbc84aeb15fa7967bceb944e56141c5cd5a528acc982 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" gettext-devel" +fi + +pre_configure() { + mkdir -p m4 + autoreconf -i -v -f +} + +libtifiles2-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + diff --git a/srcpkgs/libtotem-plparser-mini b/srcpkgs/libtotem-plparser-mini new file mode 120000 index 00000000000..e94521bbd10 --- /dev/null +++ b/srcpkgs/libtotem-plparser-mini @@ -0,0 +1 @@ +totem-pl-parser \ No newline at end of file diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template index 46ef3a5fe34..7d905c4c43e 100644 --- a/srcpkgs/libuv/template +++ b/srcpkgs/libuv/template @@ -1,16 +1,16 @@ -# Template build file for 'libuv' +# Template file for 'libuv' pkgname=libuv -version=1.20.3 +version=1.21.0 revision=1 -build_style="gnu-configure" +build_style=gnu-configure hostmakedepends="automake libtool pkg-config" short_desc="Multi-platform support library with a focus on asynchronous I/O" maintainer="Enno Boland " license="MIT, CC-BY-SA-4.0" -#changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog" -homepage="http://libuv.org/" -distfiles="https://github.com/libuv/libuv/archive/v$version.tar.gz" -checksum=43a388687194a15d5f3cc1980d53c405020a3586254c620e5f3c4d241bb9da05 +homepage="https://libuv.org/" +changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog" +distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz" +checksum=c6f53e4a75d2601db8efe0e837839969de7667d36569110429a0bc8f8229bf59 pre_configure() { NOCONFIGURE=1 ./autogen.sh @@ -26,7 +26,7 @@ libuv-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 8efdf384902..55316e2a045 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,18 +1,18 @@ # Template file for 'libvirt' pkgname=libvirt -version=4.2.0 -revision=2 +version=4.4.0 +revision=1 build_style=gnu-configure patch_args="-Np1" configure_args="--without-hal --with-storage-lvm --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf --with-interface --disable-static" short_desc="The virtualization API for controlling virtualization engines" -maintainer="Juan RP " +maintainer="Helmut Pozimski " +license="LGPL-2.1-or-later" homepage="https://libvirt.org" -license="LGPL-2.1" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=3a98ea4417811a24d2cf7be776c102919ae6376d28820b153686b018cb8f015b +checksum=46631d63cb61af8042593a93fa046dddfff204d29858f20df77a125bd6f84ab6 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 system_accounts="libvirt" diff --git a/srcpkgs/libvted-devel b/srcpkgs/libvted-devel new file mode 120000 index 00000000000..a978f92e038 --- /dev/null +++ b/srcpkgs/libvted-devel @@ -0,0 +1 @@ +gtkd \ No newline at end of file diff --git a/srcpkgs/libwkhtmltopdf b/srcpkgs/libwkhtmltopdf new file mode 120000 index 00000000000..c4f52b3313d --- /dev/null +++ b/srcpkgs/libwkhtmltopdf @@ -0,0 +1 @@ +wkhtmltopdf \ No newline at end of file diff --git a/srcpkgs/libxlsxwriter-devel b/srcpkgs/libxlsxwriter-devel new file mode 120000 index 00000000000..07cf84f6070 --- /dev/null +++ b/srcpkgs/libxlsxwriter-devel @@ -0,0 +1 @@ +libxlsxwriter \ No newline at end of file diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template new file mode 100644 index 00000000000..0d914e6d540 --- /dev/null +++ b/srcpkgs/libxlsxwriter/template @@ -0,0 +1,33 @@ +# Template file for 'libxlsxwriter' +pkgname=libxlsxwriter +version=0.7.7 +revision=1 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON" +wrksrc="${pkgname}-RELEASE_${version}" +makedepends="zlib-devel" +short_desc="Library for creating Excel XLSX files" +maintainer="Andrew Benson " +license="BSD-2-Clause" +homepage="https://libxlsxwriter.github.io/" +distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz" +checksum=cce28d1a7e7887b105c7b0fd20b7be84f62070569f7a28e7779ceaec6be3847b + +pre_configure() { + sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME} \ + PROPERTIES VERSION ${version} SOVERSION ${version%%.*})" \ + CMakeLists.txt +} + +post_install() { + vlicense License.txt +} + +libxlsxwriter-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "/usr/lib/*.so" + } +} diff --git a/srcpkgs/libxo-devel b/srcpkgs/libxo-devel new file mode 120000 index 00000000000..0d574cb534b --- /dev/null +++ b/srcpkgs/libxo-devel @@ -0,0 +1 @@ +libxo \ No newline at end of file diff --git a/srcpkgs/libxo-progs b/srcpkgs/libxo-progs new file mode 120000 index 00000000000..0d574cb534b --- /dev/null +++ b/srcpkgs/libxo-progs @@ -0,0 +1 @@ +libxo \ No newline at end of file diff --git a/srcpkgs/libxo/patches/fix-musl.patch b/srcpkgs/libxo/patches/fix-musl.patch new file mode 100644 index 00000000000..fd544686e61 --- /dev/null +++ b/srcpkgs/libxo/patches/fix-musl.patch @@ -0,0 +1,10 @@ +--- libxo/xo_syslog.c ++++ libxo/xo_syslog.c +@@ -58,7 +58,6 @@ + #include + #include + #include +-#include + + #include "xo_config.h" + #include "xo.h" diff --git a/srcpkgs/libxo/template b/srcpkgs/libxo/template new file mode 100644 index 00000000000..5ad84b5b1a3 --- /dev/null +++ b/srcpkgs/libxo/template @@ -0,0 +1,37 @@ +# Template file for 'libxo' +pkgname=libxo +version=0.9.0 +revision=1 +build_style=gnu-configure +short_desc="Library for programs to output XML, JSON and HTML" +maintainer="maxice8 " +license="BSD-2-Clause" +homepage="https://juniper.github.io/libxo/libxo-manual.html" +distfiles="https://github.com/Juniper/libxo/releases/download/${version}/libxo-${version}.tar.gz" +checksum=81fa2843e9d2695b6308a900e52e67d0489979f42e77dae1a5b0c6a4c584fc63 + +post_install() { + vlicense Copyright +} + +libxo-devel_package() { + depends="libxo-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/libxo-config + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/man/man3 + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} + +libxo-progs_package() { + depends="libxo" + short_desc+=" - programs and utilities" + pkg_install() { + vmove usr/bin + vmove usr/share/man/man1 + } +} diff --git a/srcpkgs/libzim-tools/template b/srcpkgs/libzim-tools/template new file mode 100644 index 00000000000..2fe3626596a --- /dev/null +++ b/srcpkgs/libzim-tools/template @@ -0,0 +1,10 @@ +# Template file for 'libzim-tools' +pkgname=libzim-tools +version=4.0.0 +revision=1 +build_style=meta +depends="zim-tools" +short_desc="Libzim-tool (transitional dummy package)" +maintainer="John Zimmermann " +license="GPL-3.0-or-later" +homepage="http://www.openzim.org" diff --git a/srcpkgs/libzim/patches/werror.patch b/srcpkgs/libzim/patches/werror.patch new file mode 100644 index 00000000000..89c12351306 --- /dev/null +++ b/srcpkgs/libzim/patches/werror.patch @@ -0,0 +1,16 @@ +Author: maxice8 +Upstream: no +Reason: Fixes compilation + +--- meson.build ++++ meson.build +@@ -1,7 +1,7 @@ + project('libzim', ['c', 'cpp'], + version : '3.3.0', + license : 'GPL2', +- default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) ++ default_options : ['c_std=c11', 'cpp_std=c++11']) + + conf = configuration_data() + conf.set('VERSION', '"@0@"'.format(meson.project_version())) + diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template index 818fde2a625..b22c49375e2 100644 --- a/srcpkgs/libzim/template +++ b/srcpkgs/libzim/template @@ -1,17 +1,18 @@ # Template file for 'libzim' pkgname=libzim -version=3.2.0 -revision=1 +version=4.0.0 +revision=2 build_style=meson hostmakedepends="pkg-config git" makedepends="liblzma-devel $(vopt_if zlib zlib-devel) $(vopt_if xapian "xapian-core-devel icu-devel")" short_desc="Library to read and write ZIM files" maintainer="John " -license="GPL-2" +license="GPL-2.0-or-later" +#changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog" homepage="http://www.openzim.org/" distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz" -checksum=9b39a21b62b88b60fdb2f59870ed611c175b9b20c8cd7e51ed01589bf055c8af +checksum=e195d30ba1b55dd2b6529fdd84fcbed6ec35ed4ddc957ad7725edabd20c3126c replaces="libzim-tools>=0" build_options="zlib xapian" diff --git a/srcpkgs/light/patches/00-no-help2man.patch b/srcpkgs/light/patches/00-no-help2man.patch deleted file mode 100644 index fbf232cd5da..00000000000 --- a/srcpkgs/light/patches/00-no-help2man.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig 2016-05-10 01:34:59.000000000 +0000 -+++ Makefile 2016-12-15 13:22:36.601576649 +0000 -@@ -9,27 +9,21 @@ - HELP2MAN_VERSION := $(shell help2man --version 2>/dev/null) - - all: --ifndef HELP2MAN_VERSION --$(error "help2man is not installed") --endif - $(CC) $(CFLAGS) -g -o light src/helpers.c src/light.c src/main.c - exp: - $(CC) $(CFLAGS) -E src/helpers.c src/light.c - man: - help2man $(MANFLAGS) ./light | gzip - > light.1.gz - --install: all man -+install: all - mkdir -p $(BINDIR) - cp -f ./light $(BINDIR)/light - chown root $(BINDIR)/light - chmod 4755 $(BINDIR)/light -- mkdir -p $(MANDIR) -- mv light.1.gz $(MANDIR) - - uninstall: - rm $(BINDIR)/light - rm -rf /etc/light -- rm $(MANDIR)/light.1.gz - - clean: - rm -vfr *~ light light.1.gz diff --git a/srcpkgs/light/patches/01-fix-pie.patch b/srcpkgs/light/patches/01-fix-pie.patch deleted file mode 100644 index a85d517a792..00000000000 --- a/srcpkgs/light/patches/01-fix-pie.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.orig 2016-12-15 13:28:15.000000000 +0000 -+++ Makefile 2016-12-15 13:29:23.893597661 +0000 -@@ -3,13 +3,13 @@ - MANDIR=$(PREFIX)/share/man/man1 - - CC=gcc --CFLAGS=-std=c89 -O2 -pedantic -Wall -I"./include" -+ORG_CFLAGS=-std=c89 -O2 -pedantic -Wall -I"./include" - MANFLAGS=-h -h -v -V - - HELP2MAN_VERSION := $(shell help2man --version 2>/dev/null) - - all: -- $(CC) $(CFLAGS) -g -o light src/helpers.c src/light.c src/main.c -+ $(CC) $(CFLAGS) $(ORG_CFLAGS) $(LDFLAGS) -g -o light src/helpers.c src/light.c src/main.c - exp: - $(CC) $(CFLAGS) -E src/helpers.c src/light.c - man: diff --git a/srcpkgs/light/template b/srcpkgs/light/template index b151e01ff85..47ddb12c385 100644 --- a/srcpkgs/light/template +++ b/srcpkgs/light/template @@ -1,17 +1,28 @@ # Template file for 'light' pkgname=light -version=1.0 -revision=1 +version=1.1.2 +revision=2 build_style=gnu-makefile +make_use_env=1 +make_build_target=man +hostmakedepends="help2man" short_desc="Program to control backlight controllers" maintainer="Dennis Kraus " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://haikarainen.github.io/light/" -distfiles="https://github.com/haikarainen/light/archive/v${version}.tar.gz" -checksum=974608ee42ffe85cfd23184306d56d86ec4e6f4b0518bafcb7b3330998b1af64 +distfiles="https://github.com/haikarainen/light/archive/${version}.tar.gz" +checksum=291ef234929adb20fe96359724c5ccad36cf396dd110f7001654c21e17800032 + +pre_build() { + sed -i Makefile \ + -e "s;^\(CC\)=.*;\1=${CC};" \ + -e "s;^\(CFLAGS\)=\(.*\);\1=\2 ${CFLAGS};" +} do_install() { - vbin light + vbin light + gzip -d light.1.gz + vman light.1 chmod 4755 ${DESTDIR}/usr/bin/light } diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template index d3fb770c94c..61e69a77e2c 100644 --- a/srcpkgs/lightdm-gtk3-greeter/template +++ b/srcpkgs/lightdm-gtk3-greeter/template @@ -1,6 +1,6 @@ # Template file for 'lightdm-gtk3-greeter' pkgname=lightdm-gtk3-greeter -version=2.0.4 +version=2.0.5 revision=1 wrksrc="${pkgname/3/}-${version}" build_style=gnu-configure @@ -15,4 +15,4 @@ maintainer="Juan RP " license="GPL-3.0-or-later, LGPL-2.0-or-later" homepage="https://launchpad.net/lightdm-gtk-greeter" distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname/3/}-${version}.tar.gz" -checksum=613b5966dad749e3e316352a9fa7d6380392be4c875b10a6384dd04105f66beb +checksum=5dc608d58ff9d15117c9d99b55e5f038d39e2f1691f03ce1dc1c8881560387df diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 1127f32e412..62c3c75bb2d 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,8 +1,8 @@ # Template file for 'linux-firmware' pkgname=linux-firmware -version=20180314 +version=20180606 revision=1 -_githash=4c0bf113a55975d702673e57c5542f150807ad66 +_githash=d1147327232ec4616a66ab898df84f9700c816c1 wrksrc="${pkgname}-${_githash}" noarch=yes short_desc="Binary firmware blobs for the Linux kernel" @@ -11,7 +11,7 @@ homepage="https://www.kernel.org/" license="See /usr/share/licenses/${pkgname}" depends="${pkgname}-amd-${version}_${revision} ${pkgname}-network-${version}_${revision}" distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${_githash}.tar.gz" -checksum=06953094fdee8c64d205949f8b2261fb0202e4b9b8f271f1d6b3b954dc10c24c +checksum=8e55b3bdad5df820f72f153361855c2a03dee9c21c50cdb3c6af51356c4c7db5 do_install() { vmkdir usr/lib/firmware diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index 9eb605ee91c..fd7b4914f1b 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -1,15 +1,15 @@ # Template file for 'linux4.14' pkgname=linux4.14 -version=4.14.49 +version=4.14.52 revision=1 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " homepage="http://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=c69f49731ef392034a5d8816e2e2668bc8928878764d1c8caac37d00339d3bf7 +checksum=a5d226c7b2fd1eb0f01d56e4e2c6a0100784b68df907cc7317f32bde34f88810 nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.17/files/i386-dotconfig b/srcpkgs/linux4.17/files/i386-dotconfig index 4bd8ce78bbc..656f4c89329 100644 --- a/srcpkgs/linux4.17/files/i386-dotconfig +++ b/srcpkgs/linux4.17/files/i386-dotconfig @@ -5062,7 +5062,7 @@ CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y diff --git a/srcpkgs/linux4.17/files/x86_64-dotconfig b/srcpkgs/linux4.17/files/x86_64-dotconfig index 1c173a8f2ae..3b3f73ee67d 100644 --- a/srcpkgs/linux4.17/files/x86_64-dotconfig +++ b/srcpkgs/linux4.17/files/x86_64-dotconfig @@ -5136,7 +5136,7 @@ CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y diff --git a/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch b/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch deleted file mode 100644 index 4ea2e4e3de1..00000000000 --- a/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit ec62ab71dab19c079bd689e907bbb0e3ce5b546f -Author: Ethan Lee -Date: Thu May 31 16:13:17 2018 -0700 - - Input: goodix - add new ACPI id for GPD Win 2 touch screen - - GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp - - Tested on a unit from the first production run sent to Indiegogo backers - - Signed-off-by: Ethan Lee - Cc: stable@vger.kernel.org - Signed-off-by: Dmitry Torokhov - -diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c -index 9736c83dd418..f2d9c2c41885 100644 ---- a/drivers/input/touchscreen/goodix.c -+++ b/drivers/input/touchscreen/goodix.c -@@ -933,6 +933,7 @@ MODULE_DEVICE_TABLE(i2c, goodix_ts_id); - #ifdef CONFIG_ACPI - static const struct acpi_device_id goodix_acpi_match[] = { - { "GDIX1001", 0 }, -+ { "GDIX1002", 0 }, - { } - }; - MODULE_DEVICE_TABLE(acpi, goodix_acpi_match); diff --git a/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch b/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch deleted file mode 100644 index 0051c49766d..00000000000 --- a/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3e8a4c1a96a49ab258307132a641631ac7462fcf (HEAD) -Author: Ethan Lee -Date: Fri Jun 1 11:46:08 2018 -0700 - - Input: xpad - add GPD Win 2 Controller USB IDs - - GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp - - Tested on a unit from the first production run sent to Indiegogo backers - - Signed-off-by: Ethan Lee - Cc: stable@vger.kernel.org - Signed-off-by: Dmitry Torokhov - -diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c -index 06e9650b3b30..a89b81b35932 100644 ---- a/drivers/input/joystick/xpad.c -+++ b/drivers/input/joystick/xpad.c -@@ -123,6 +123,7 @@ static const struct xpad_device { - u8 mapping; - u8 xtype; - } xpad_device[] = { -+ { 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 }, - { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, - { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, - { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, -@@ -409,6 +410,7 @@ static const signed short xpad_abs_triggers[] = { - - static const struct usb_device_id xpad_table[] = { - { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ -+ XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ - XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ - XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ - XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ diff --git a/srcpkgs/linux4.17/template b/srcpkgs/linux4.17/template index 58b30fe32ea..9647c21031d 100644 --- a/srcpkgs/linux4.17/template +++ b/srcpkgs/linux4.17/template @@ -1,6 +1,6 @@ # Template file for 'linux4.17' pkgname=linux4.17 -version=4.17.1 +version=4.17.3 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=c93f3fbcbce66b7ed51e1d33d669b0ad56dd5088c23ea77fb8925b328faa7070 +checksum=af32ab2427cd0916c030c751b6b8fd4e72b7359feefd642aefad74838e921ffd nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.4/files/i386-dotconfig b/srcpkgs/linux4.4/files/i386-dotconfig index fb37a255aa8..8638ff2b5d7 100644 --- a/srcpkgs/linux4.4/files/i386-dotconfig +++ b/srcpkgs/linux4.4/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.130 Kernel Configuration +# Linux/i386 4.4.138 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -178,6 +178,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y diff --git a/srcpkgs/linux4.4/files/x86_64-dotconfig b/srcpkgs/linux4.4/files/x86_64-dotconfig index b54f418f853..bc36047a19c 100644 --- a/srcpkgs/linux4.4/files/x86_64-dotconfig +++ b/srcpkgs/linux4.4/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.130 Kernel Configuration +# Linux/x86_64 4.4.138 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -187,6 +187,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index c02ef349a8f..f9d02290058 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -1,14 +1,14 @@ # Template file for 'linux4.4' pkgname=linux4.4 -version=4.4.130 -revision=2 +version=4.4.138 +revision=1 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="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=b29bdf90659deee725dd760096c5d86b69cde0e787e98efb75f1c32294434de5 +checksum=e6f9c64e17e0ba353e12fe97974319d6b633cd91e4f98144752c91c9372cc4ee nocross=yes nodebug=yes @@ -46,13 +46,8 @@ do_configure() { i686*) arch=i386;; x86_64*) arch=x86_64;; armv7*) arch=arm - # This file does not exist!? - # $XBPS_FETCH_CMD http://rcn-ee.com/deb/sid-armhf/v${version}-armv7-x2/patch-${version}-armv7-x2.diff.gz - # gunzip patch-${version}-armv7-x2.diff.gz - # patch -Np1 -i patch-${version}-armv7-x2.diff - # Found the latest here: - $XBPS_FETCH_CMD http://rcn-ee.com/deb/zesty-armhf/v${version}-armv7-x15/patch-${version}-armv7-x15.diff.xz - unxz patch-${version}-armv7-x15.diff.xz + $XBPS_FETCH_CMD http://rcn-ee.com/deb/sid-armhf/v${version}-armv7-x15/patch-${version}-armv7-x15.diff.gz + gunzip patch-${version}-armv7-x15.diff.gz patch -Np1 -i patch-${version}-armv7-x15.diff ;; aarch64*) arch=arm64;; diff --git a/srcpkgs/linux4.9/files/arm64-dotconfig b/srcpkgs/linux4.9/files/arm64-dotconfig index 4a96e8e698d..5d548be2d2d 100644 --- a/srcpkgs/linux4.9/files/arm64-dotconfig +++ b/srcpkgs/linux4.9/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.93 Kernel Configuration +# Linux/arm64 4.9.110 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -440,6 +440,7 @@ CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=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 @@ -519,6 +520,7 @@ CONFIG_KEXEC=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y # # ARMv8.1 architectural features @@ -741,7 +743,7 @@ CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y CONFIG_NETLABEL=y -# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETWORK_SECMARK=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETFILTER=y @@ -760,6 +762,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m CONFIG_NF_LOG_COMMON=m CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y @@ -855,6 +858,7 @@ CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m +# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m @@ -7210,18 +7214,30 @@ CONFIG_ENCRYPTED_KEYS=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y -CONFIG_SECURITY_NETWORK_XFRM=y -# CONFIG_SECURITY_PATH is not set +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY is not set -# CONFIG_SECURITY_SELINUX is not set +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set -# CONFIG_SECURITY_APPARMOR is not set +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_YAMA=y # CONFIG_INTEGRITY is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=m @@ -7486,27 +7502,3 @@ CONFIG_FONT_8x16=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_SBITMAP=y -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_SECURITY_NETWORK is not set -# CONFIG_SECURITY_APPARMOR is not set -CONFIG_NETWORK_SECMARK=y -# CONFIG_NF_CONNTRACK_SECMARK is not set -# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -# CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set diff --git a/srcpkgs/linux4.9/files/i386-dotconfig b/srcpkgs/linux4.9/files/i386-dotconfig index 96c39d1d5d6..1630c67488e 100644 --- a/srcpkgs/linux4.9/files/i386-dotconfig +++ b/srcpkgs/linux4.9/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.93 Kernel Configuration +# Linux/i386 4.9.110 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7183,14 +7183,10 @@ CONFIG_UEFI_CPER=y # CONFIG_DCACHE_WORD_ACCESS=y CONFIG_FS_IOMAP=y -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=m -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_ENCRYPTION is not set diff --git a/srcpkgs/linux4.9/files/x86_64-dotconfig b/srcpkgs/linux4.9/files/x86_64-dotconfig index d439a0b8783..66cc3e81e57 100644 --- a/srcpkgs/linux4.9/files/x86_64-dotconfig +++ b/srcpkgs/linux4.9/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.93 Kernel Configuration +# Linux/x86_64 4.9.110 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -7254,14 +7254,10 @@ CONFIG_UEFI_CPER=y # CONFIG_DCACHE_WORD_ACCESS=y CONFIG_FS_IOMAP=y -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=m -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_ENCRYPTION is not set diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 2cf4bd285ca..39ee51f0c54 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,15 +1,15 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.93 -revision=2 +version=4.9.110 +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=58f78ab6c945c64a7c7c246256dc8b516b009c9ef1c90572ae396e7a8d6a5903 +checksum=379a143a70a79f0eea6c9f6638942b65e6043abdde17ad23264c0abd93c4ea7a nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index c8e93b3e566..1a030804436 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -1,10 +1,10 @@ # Template file for 'lmms' pkgname=lmms -version=1.2.0rc5 -revision=3 +version=1.2.0rc6 +revision=1 wrksrc="lmms-${version/r/-r}" _x11embed_commit=022b39a1d496d72eb3e5b5188e5559f66afca957 -_rpmalloc_commit=2e0479192b8dfb15e0084969fdf06208cffbfd09 +_rpmalloc_version=1.3.1 build_style=cmake configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF" hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules" @@ -13,27 +13,23 @@ makedepends="SDL_sound-devel fltk-devel fluidsynth-devel jack-devel ladspa-sdk lame-devel libsamplerate-devel portaudio-devel qt5-tools-devel qt5-x11extras-devel redland-devel xcb-util-devel xcb-util-keysyms-devel sndio-devel" -depends="desktop-file-utils" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Cross-platform music production software" maintainer="Logen K. " -license="GPL-2-or-later" +license="GPL-2.0-or-later" homepage="https://lmms.io/" distfiles="https://github.com/LMMS/lmms/archive/v${version/r/-r}.tar.gz https://github.com/Lukas-W/qt5-x11embed/archive/${_x11embed_commit}.tar.gz - https://github.com/rampantpixels/rpmalloc/archive/${_rpmalloc_commit}.tar.gz" -checksum="2cdf8c50f1e3a6d1c2158e52dac831ceef2984d8f997876fd448b66d4689f9cc + https://github.com/rampantpixels/rpmalloc/archive/${_rpmalloc_version}.tar.gz" +checksum="2476371cff5f77412dbb4bb3e741ffe7c62b3ebab52d83379bf7d18860de0a9f 06159c71a5eeba5662bfb309d215e733f310c2699c8c1de83297d32d13a510bc - d7291aedec6abfc7bcac6106b3b9e24f8b3b225c0bf986fb0d8e8517af611625" - -case $XBPS_TARGET_MACHINE in - armv6*) broken="https://travis-ci.org/voidlinux/void-packages/jobs/358366106";; -esac + 9bc0013a0bf8c01540821e84fef0cef067f1d857a01ceceac36f83bd6fedc106" post_extract() { [ -d "${wrksrc}/../qt5-x11embed-${_x11embed_commit}" ] && rm -rf src/3rdparty/qt5-x11embed && mv "${wrksrc}/../qt5-x11embed-${_x11embed_commit}" src/3rdparty/qt5-x11embed - [ -d "${wrksrc}/../rpmalloc-${_rpmalloc_commit}" ] && + [ -d "${wrksrc}/../rpmalloc-${_rpmalloc_version}" ] && rm -rf src/3rdparty/rpmalloc/rpmalloc && - mv "${wrksrc}/../rpmalloc-${_rpmalloc_commit}" src/3rdparty/rpmalloc/rpmalloc + mv "${wrksrc}/../rpmalloc-${_rpmalloc_version}" src/3rdparty/rpmalloc/rpmalloc } diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template index 92995ed28a8..1e0215d7bc8 100644 --- a/srcpkgs/logstalgia/template +++ b/srcpkgs/logstalgia/template @@ -1,6 +1,6 @@ # Template file for 'logstalgia' pkgname=logstalgia -version=1.1.1 +version=1.1.2 revision=1 wrksrc="$pkgname-$version" build_style=gnu-configure @@ -11,4 +11,4 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/acaudwell/Logstalgia/" distfiles="$homepage/releases/download/$pkgname-$version/$pkgname-$version.tar.gz" -checksum=d693e432511d8de792ebe04cfb495fdcd38510641b4cd5f9b72f8a9a309a765b +checksum=ed3f4081e401f4a509761a7204bdbd7c34f8f1aff9dcb030348885fb3995fca9 diff --git a/srcpkgs/lolcat-c/template b/srcpkgs/lolcat-c/template new file mode 100644 index 00000000000..2200acb5ef3 --- /dev/null +++ b/srcpkgs/lolcat-c/template @@ -0,0 +1,23 @@ +# Template file for 'lolcat-c' +pkgname=lolcat-c +version=0.0.2017.12.20 +revision=1 +_commit=e298c102bd51ae67fbae09df5dfc00cba16a2231 +wrksrc="lolcat-${_commit}" +build_style=gnu-makefile +make_build_target="lolcat" +short_desc="High-performance implementation of lolcat" +maintainer="John " +license="WTFPL" +homepage="https://github.com/jaseg/lolcat" +distfiles="${homepage}/archive/${_commit}.tar.gz" +checksum=7d86ab471bb14d5d472517de53fad7c8b06e8454b88be77ffb135bed2b783b9b + +pre_build() { + export CFLAGS="${CFLAGS/O2/O0}" + sed -i -e 's/gcc/$(CC)/g' Makefile +} + +do_install() { + vbin lolcat +} diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 209eaf914bc..e6f76800d3f 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,7 +1,9 @@ # Template file for 'lollypop' pkgname=lollypop -version=0.9.514 +version=0.9.516 revision=1 +# Gitlab upload tag hash +_uhash=81888cdad8759274482060912e11a6d0 build_style=meson noarch=yes hostmakedepends="intltool itstool pkg-config glib-devel gobject-introspection python3 git" @@ -13,5 +15,5 @@ short_desc="A music player for GNOME" maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Lollypop" -distfiles="https://gitlab.gnome.org/gnumdk/lollypop/uploads/fc731e0878cea850ebadb46afd69b3b8/lollypop-${version}.tar.xz" -checksum=b9597979372a54445e8317e417331557302d212775a9d528593c568dc8c91803 +distfiles="https://gitlab.gnome.org/World/lollypop/uploads/${_uhash}/lollypop-${version}.tar.xz" +checksum=72bd11b5e77ce984daa10937ff4115d74a772512ece202421912700877cc5d14 diff --git a/srcpkgs/love/template b/srcpkgs/love/template index a06d11b1c39..80a5b42c275 100644 --- a/srcpkgs/love/template +++ b/srcpkgs/love/template @@ -1,6 +1,6 @@ # Template file for 'love' pkgname=love -version=0.10.2 +version=11.1 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -9,8 +9,8 @@ makedepends="SDL2-devel devil-devel libopenal-devel LuaJIT-devel freetype-devel depends="hicolor-icon-theme desktop-file-utils" short_desc="A framework for writing 2D games in lua" maintainer="Caleb Pilon " -license="zlib" +license="Zlib" homepage="https://love2d.org/" distfiles="https://bitbucket.org/rude/love/downloads/${pkgname}-${version}-linux-src.tar.gz" -checksum=b26b306b113158927ae12d2faadb606eb1db49ffdcd7592d6a0a3fc0af21a387 +checksum=bc5e9a70021de830f1032d6afe900f0b81902e2b6c610e26cf1d6859bf8e7cde lib32disabled=yes diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template index 55e3322c972..57038ea9ed8 100644 --- a/srcpkgs/lowdown/template +++ b/srcpkgs/lowdown/template @@ -1,14 +1,15 @@ # Template file for 'lowdown' pkgname=lowdown -version=0.3.2 +version=0.4.0 revision=1 build_style=gnu-makefile +makedepends="libdiff" short_desc="Simple markdown translator" maintainer="Duncaen " license="ISC" homepage="https://kristaps.bsd.lv/lowdown/" distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz" -checksum="740cf6025c43ceaae9bcc1ffc3e94986aa62d65d91ef8173d444a1977c562094" +checksum=d075ddb3c1fb9908d1b72c395429a0faebd3940f9c995e817eb2e93923c9ccaa do_configure() { local _libc=glibc diff --git a/srcpkgs/lua51-mpack/template b/srcpkgs/lua51-mpack/template index 393b62ab56e..f87c6b51a25 100644 --- a/srcpkgs/lua51-mpack/template +++ b/srcpkgs/lua51-mpack/template @@ -1,19 +1,19 @@ # Template file for 'lua51-mpack' pkgname=lua51-mpack -version=1.0.2 +version=1.0.7 revision=1 -wrksrc="libmpack-${version}" +wrksrc="libmpack-lua-${version}" hostmakedepends="libtool" -makedepends="lua51-devel" +makedepends="lua51-devel libmpack-devel" short_desc="Simple implementation of MessagePack for Lua 5.1" maintainer="Steve Prybylski " license="MIT" -homepage="https://github.com/tarruda/libmpack" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=9c570b2aab81b0c56d97cbd8fc483dc431b69510fd9becb4a1845291563e8bc9 +homepage="https://github.com/libmpack/libmpack-lua" +distfiles="https://github.com/libmpack/libmpack-lua/archive/${version}.tar.gz" +checksum=2ebe9c8972c378040c9b8505f5fb40a0c64d990cd68be6a62989362b18294d0a do_build() { - ${CC} ${CFLAGS} -shared -o mpack.so binding/lua/lmpack.c ${LDFLAGS} + make ${makejobs} USE_SYSTEM_MPACK=1 USE_SYSTEM_LUA=1 } do_install() { diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 2a395bafbd1..43bfb2a754b 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,6 +1,6 @@ # Template file for 'lutris' pkgname=lutris -version=0.4.17 +version=0.4.18 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=8db1bbcaf61b7212a9607cbde1cfce9ac34cab7df896c7a0d8dc8e77eff50c62 +checksum=a9e2fc537a52ff29b970a3e32bea5ab7f354343c6a7c404bc8c59ae8a35f3542 diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template index 2c38486b89f..591857a3322 100644 --- a/srcpkgs/luxmark/template +++ b/srcpkgs/luxmark/template @@ -1,7 +1,7 @@ # Template file for 'luxmark' pkgname=luxmark version=3.1 -revision=4 +revision=5 build_style=cmake makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template index 5be3b53f60e..50e0fc3d530 100644 --- a/srcpkgs/luxrays/template +++ b/srcpkgs/luxrays/template @@ -1,7 +1,7 @@ # Template file for 'luxrays' pkgname=luxrays version=3.1 -revision=8 +revision=9 build_style=cmake configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON" hostmakedepends="flex bison boost-python" diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index 6f3f3a256cd..ccb88b249e1 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,7 +1,7 @@ # Template file for 'lvm2' pkgname=lvm2 -version=2.02.177 -revision=2 +version=2.02.178 +revision=1 wrksrc="LVM2.${version}" build_style=gnu-configure configure_args="--disable-selinux --enable-readline --enable-pkgconfig @@ -11,18 +11,19 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm --with-default-locking-dir=/run/lock/lvm" hostmakedepends="pkg-config" -makedepends="libblkid-devel libuuid-devel readline-devel eudev-libudev-devel" +makedepends="eudev-libudev-devel libaio-devel libblkid-devel readline-devel" depends="thin-provisioning-tools" +short_desc="Logical Volume Manager 2 utilities" +maintainer="Juan RP " +license="GPL-2.0-only, LGPL-2.1-only" +homepage="https://sourceware.org/lvm2/" +changelog="https://abi-laboratory.pro/?view=changelog&l=lvm2&v=${version}" +distfiles="https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${version}.tgz" +checksum=88fff4526c10830fa8c1cb490999fafba71746203b81f7d0421a14d0213d33f9 +conf_files="/etc/lvm/lvm.conf" make_dirs=" /etc/lvm/archive 0755 root root /etc/lvm/backup 0755 root root" -conf_files="/etc/lvm/lvm.conf" -short_desc="Logical Volume Manager 2 utilities" -maintainer="Juan RP " -homepage="http://sourceware.org/lvm2/" -license="GPL-2, LGPL-2.1" -distfiles="https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${version}.tgz" -checksum=4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2 case $XBPS_TARGET_MACHINE in *-musl) @@ -69,6 +70,7 @@ device-mapper-devel_package() { esac } } + device-mapper_package() { short_desc="Device Mapper userspace library and tools" pkg_install() { @@ -83,8 +85,10 @@ device-mapper_package() { vsv dmeventd } } + liblvm2app-devel_package() { - depends="device-mapper-devel>=${version}_${revision} libblkid-devel liblvm2app>=${version}_${revision}" + depends="device-mapper-devel-${version}_${revision} libblkid-devel + liblvm2app-${version}_${revision}" short_desc="LVM2 application library - development files" pkg_install() { vmove usr/include/lvm2app.h @@ -92,6 +96,7 @@ liblvm2app-devel_package() { vmove usr/lib/liblvm2app.so } } + liblvm2app_package() { short_desc="LVM2 application library" pkg_install() { diff --git a/srcpkgs/lximage-qt/template b/srcpkgs/lximage-qt/template index 4b7ecbb3e08..cee5c97bc09 100644 --- a/srcpkgs/lximage-qt/template +++ b/srcpkgs/lximage-qt/template @@ -1,14 +1,15 @@ # Template file for 'lximage-qt' pkgname=lximage-qt -version=0.6.0 +version=0.7.0 revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel libfm-devel" -makedepends="lxqt-build-tools liblxqt-devel libexif-devel libfm-qt-devel" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel" +makedepends="qt5-x11extras-devel qt5-tools-devel qt5-svg-devel libfm-qt-devel + libexif-devel" short_desc="LXQt image viewer" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lximage-qt/releases/download/${version}/lximage-qt-${version}.tar.xz" -checksum=d560d0d47de64975d3f1712faa267a7eda117b9e2f5773ba30b359703d2149e1 +license="GPL-2.0-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lximage-qt/releases/download/${version}/lximage-qt-${version}.tar.xz" +checksum=1cac20e51db395eaba1c137d578f68a676a271a173a9aaad4ed92b99a98192d7 diff --git a/srcpkgs/lxqt-about/template b/srcpkgs/lxqt-about/template index c5fb229c376..335d0bc2dc2 100644 --- a/srcpkgs/lxqt-about/template +++ b/srcpkgs/lxqt-about/template @@ -1,14 +1,14 @@ # Template file for 'lxqt-about' pkgname=lxqt-about -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="qt5-host-tools qt5-devel qt5-tools-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" makedepends="qt5-tools-devel liblxqt-devel" short_desc="LXQt about application" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-about/releases/download/${version}/lxqt-about-${version}.tar.xz" -checksum=1c92815ec69a79a8000f9847d4074b405fdb46dbfadb405dc7ce0ce12e6be7a1 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-about/releases/download/${version}/lxqt-about-${version}.tar.xz" +checksum=bc58d1d57675e6c073596a9095417ca9bb9d61158830646d77dfc573ee913522 diff --git a/srcpkgs/lxqt-admin/template b/srcpkgs/lxqt-admin/template index f3a15cb21ee..02c20de59ca 100644 --- a/srcpkgs/lxqt-admin/template +++ b/srcpkgs/lxqt-admin/template @@ -1,17 +1,17 @@ # Template file for 'lxqt-admin' pkgname=lxqt-admin -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="qt5-host-tools qt5-devel qt5-tools-devel" -makedepends="qt5-devel liblxqt-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel" +makedepends="liblxqt-devel" short_desc="LXQt system administration tool" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-admin/releases/download/${version}/lxqt-admin-${version}.tar.xz" -checksum=92753bbbcea7fda23307128affd0d6b63d3b782722a77d3c103ef125b7dd9e80 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-admin/releases/download/${version}/lxqt-admin-${version}.tar.xz" +checksum=41dbadbd3deb36de13a4d8b435691f4fc16e520954d1dc56f30329898cd97763 post_install() { # depends on systemd-{timedated,timesyncd} diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template index 7a29b532e92..38aa85cbdbd 100644 --- a/srcpkgs/lxqt-build-tools/template +++ b/srcpkgs/lxqt-build-tools/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-build-tools' pkgname=lxqt-build-tools -version=0.4.0 +version=0.5.0 revision=1 noarch=yes build_style=cmake @@ -8,10 +8,10 @@ hostmakedepends="qt5-host-tools qt5-qmake pkg-config" makedepends="qt5-devel" short_desc="LXQt build tools" maintainer="Orphaned " -license="3-clause-BSD" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-build-tools/releases/download/${version}/lxqt-build-tools-${version}.tar.xz" -checksum=b0836d43912cefe348b39a0d9450dbb5d5b1067897213546c2b42ff596cc8bd2 +license="BSD-3-Clause" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-build-tools/releases/download/${version}/lxqt-build-tools-${version}.tar.xz" +checksum=a66d080d4cf075007fcdd9eab1689559728418dd8f85f7e8e79679738de8658d post_install() { vlicense BSD-3-Clause LICENSE diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template index 06b409fd6bd..d3d2ee02ff5 100644 --- a/srcpkgs/lxqt-config/template +++ b/srcpkgs/lxqt-config/template @@ -1,14 +1,14 @@ # Template file for 'lxqt-config' pkgname=lxqt-config -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel qt5-tools-devel" -makedepends="liblxqt-devel libXcursor-devel libkscreen-devel qt5-svg-devel" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="liblxqt-devel libXcursor-devel libkscreen-devel" short_desc="LXQt System Settings" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-config/releases/download/${version}/lxqt-config-${version}.tar.xz" -checksum=b9d409f9805c9865f9b254d6031ece20a70589e1bfae58330e14f5b6c0e932c6 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-config/releases/download/${version}/lxqt-config-${version}.tar.xz" +checksum=25adce2f44bc6567c77039e70b13b48837c6ab35391875ca7d7706b205853f66 diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template index 9ccb5dcf94b..76da824c54a 100644 --- a/srcpkgs/lxqt-globalkeys/template +++ b/srcpkgs/lxqt-globalkeys/template @@ -1,17 +1,17 @@ # Template file for 'lxqt-globalkeys' pkgname=lxqt-globalkeys -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" makedepends="liblxqt-devel" short_desc="LXQt daemon and library for global keyboard shortcuts registration" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-globalkeys/releases/download/${version}/lxqt-globalkeys-${version}.tar.xz" -checksum=e61d8fb0999283498243b937166a1306daf9e1388dbd15bb6f897bc3eae4744c +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-globalkeys/releases/download/${version}/lxqt-globalkeys-${version}.tar.xz" +checksum=ed6dc56e0374939caeb44380ef4a8765b097761be7381dfedbf79f089764dbbf replaces="lxqt-common>=0" lxqt-globalkeys-devel_package() { diff --git a/srcpkgs/lxqt-l10n/template b/srcpkgs/lxqt-l10n/template index dc844611cc6..ad0d7d0568c 100644 --- a/srcpkgs/lxqt-l10n/template +++ b/srcpkgs/lxqt-l10n/template @@ -1,14 +1,14 @@ # Template file for 'lxqt-l10n' pkgname=lxqt-l10n -version=0.12.0 +version=0.13.0 revision=1 noarch=yes build_style=cmake -hostmakedepends="pkg-config qt5-host-tools qt5-tools" -makedepends="liblxqt-devel lxqt-build-tools" +hostmakedepends="lxqt-build-tools qt5-host-tools" +makedepends="qt5-tools-devel" short_desc="Translations of LXQt" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-l10n/releases/download/${version}/lxqt-l10n-${version}.tar.xz" -checksum=62ef5183d209f84a238f040cd155182e0b5c00631368918a5a6bdedfcb27d02b +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-l10n/releases/download/${version}/lxqt-l10n-${version}.tar.xz" +checksum=8706415a89ba2808c67dd5f8c9479743acb11b1afc2fe331d0330fccbe9ac5aa diff --git a/srcpkgs/lxqt-notificationd/template b/srcpkgs/lxqt-notificationd/template index b7c8f018454..bb64986baf1 100644 --- a/srcpkgs/lxqt-notificationd/template +++ b/srcpkgs/lxqt-notificationd/template @@ -1,15 +1,15 @@ # Template file for 'lxqt-notificationd' pkgname=lxqt-notificationd -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" makedepends="liblxqt-devel" short_desc="LXQt notification daemon" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-notificationd/releases/download/${version}/lxqt-notificationd-${version}.tar.xz" -checksum=f9e2e05152af7ccbb0c8779a24cf992617d27a9148b2403c2dc4c1cbc2615afb +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-notificationd/releases/download/${version}/lxqt-notificationd-${version}.tar.xz" +checksum=a69d18a0307c5a18826c2bd0a110f3862d23fece07c64bfc7e187af8f66a10d0 replaces="lxqt-common>=0" diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template index 5060f140098..bfcab6d0982 100644 --- a/srcpkgs/lxqt-openssh-askpass/template +++ b/srcpkgs/lxqt-openssh-askpass/template @@ -1,19 +1,16 @@ # Template file for 'lxqt-openssh-askpass' pkgname=lxqt-openssh-askpass -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-tools-devel" -makedepends="liblxqt-devel libXcursor-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="liblxqt-devel" depends="openssh" short_desc="LXQt ssh-agent helper" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-openssh-askpass/releases/download/${version}/lxqt-openssh-askpass-${version}.tar.xz" -checksum=0962ae128c56c812929ca3d355c54dad3391962a1126b1c40fffc4d4bebd3cf5 - -alternatives=" - ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass -" +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-openssh-askpass/releases/download/${version}/lxqt-openssh-askpass-${version}.tar.xz" +checksum=f33e5f168729b974a4b9408e67c9b63f424bcff850bcbdc2d94f22e59f384250 +alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass" diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template index e51b14c4b01..e4de656859b 100644 --- a/srcpkgs/lxqt-panel/template +++ b/srcpkgs/lxqt-panel/template @@ -1,17 +1,16 @@ # Template file for 'lxqt-panel' pkgname=lxqt-panel -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools" makedepends="libxkbcommon-devel liblxqt-devel ksolid-devel kguiaddons-devel lxqt-globalkeys-devel alsa-lib-devel pulseaudio-devel libstatgrab-devel - menu-cache-devel libsensors-devel libXcomposite-devel libsysstat-devel - libdbusmenu-qt5-devel" + libsensors-devel libXcomposite-devel libsysstat-devel libdbusmenu-qt5-devel" short_desc="LXQt desktop panel" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-panel/releases/download/${version}/lxqt-panel-${version}.tar.xz" -checksum=3d286ba65d7a51403bc01d3efbc01c65c88ee4cf6f062143ed00c104a7b15f11 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-panel/releases/download/${version}/lxqt-panel-${version}.tar.xz" +checksum=a139dc43d19adf6b7674e7ad518772aebf033aefcb1767b05085d983ff8b2ae3 diff --git a/srcpkgs/lxqt-policykit/template b/srcpkgs/lxqt-policykit/template index 22623d6b0d0..b037dc3a1f1 100644 --- a/srcpkgs/lxqt-policykit/template +++ b/srcpkgs/lxqt-policykit/template @@ -1,15 +1,15 @@ # Template file for 'lxqt-policykit' pkgname=lxqt-policykit -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools polkit-qt5-devel qt5-tools-devel" +hostmakedepends="pkg-config lxqt-build-tools polkit-qt5-devel" makedepends="liblxqt-devel polkit-qt5-devel" short_desc="LXQt PolicyKit agent" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-policykit/releases/download/${version}/lxqt-policykit-${version}.tar.xz" -checksum=6e1972433cad8f2b1b647c740d792432aaa9f72b625c2b34cd46165c3c135838 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-policykit/releases/download/${version}/lxqt-policykit-${version}.tar.xz" +checksum=f729a898a0ace59cf7702146dbe2891d8cb93494e0e6683099b60863b47727b5 replaces="lxqt-common>=0" diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template index 142268a6898..732710a086b 100644 --- a/srcpkgs/lxqt-powermanagement/template +++ b/srcpkgs/lxqt-powermanagement/template @@ -1,14 +1,14 @@ # Template file for 'lxqt-powermanagement' pkgname=lxqt-powermanagement -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel qt5-tools-devel" -makedepends="qt5-svg-devel liblxqt-devel ksolid-devel kidletime-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="liblxqt-devel ksolid-devel kidletime-devel" short_desc="LXQt power management module" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-powermanagement/releases/download/${version}/lxqt-powermanagement-${version}.tar.xz" -checksum=bfb2e8e6cf2151876b5dec162d5cd35a73d903ec1212cdbc17b5d8300fdbd27f +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-powermanagement/releases/download/${version}/lxqt-powermanagement-${version}.tar.xz" +checksum=2398e465f627d7c2565bb9245899626c2cacea6a705ed1c63cd772e9af6fdb96 diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template index 42ab875d574..42df8a22f8e 100644 --- a/srcpkgs/lxqt-qtplugin/template +++ b/srcpkgs/lxqt-qtplugin/template @@ -1,13 +1,13 @@ # Template file for 'lxqt-qtplugin' pkgname=lxqt-qtplugin -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel libfm-devel" -makedepends="lxqt-build-tools liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel" +makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel" short_desc="LXQt Qt theme plugin" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-qtplugin/releases/download/${version}/lxqt-qtplugin-${version}.tar.xz" -checksum=a41a1e06c7246eb109225885a9ab9239c0d310baa0ab86b8712c410e77e00cef +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-qtplugin/releases/download/${version}/lxqt-qtplugin-${version}.tar.xz" +checksum=a67c8668c09aefe54ef78c63806dc647f1c7b2067d780616f6fa4a9b125bdc5a diff --git a/srcpkgs/lxqt-runner/template b/srcpkgs/lxqt-runner/template index ea873eaeb25..55c577886a3 100644 --- a/srcpkgs/lxqt-runner/template +++ b/srcpkgs/lxqt-runner/template @@ -1,14 +1,14 @@ # Template file for 'lxqt-runner' pkgname=lxqt-runner -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel" -makedepends="liblxqt-devel lxqt-globalkeys-devel menu-cache-devel muparser-devel" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="liblxqt-devel lxqt-globalkeys-devel muparser-devel" short_desc="LXQt quick launcher" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-runner/releases/download/${version}/lxqt-runner-${version}.tar.xz" -checksum=93dfcdf5d3d6fb016354bd06ab58316a328f6f3c30f3e43e5ea813e355d59f9f +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-runner/releases/download/${version}/lxqt-runner-${version}.tar.xz" +checksum=912a8a36158c1b37ebb9f29cfe0f0ea317fb1359373c0dd47f872ecc9a334f37 diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template index 888602922f7..dc131c7f21a 100644 --- a/srcpkgs/lxqt-session/template +++ b/srcpkgs/lxqt-session/template @@ -1,16 +1,16 @@ # Template file for 'lxqt-session' pkgname=lxqt-session -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel xdg-user-dirs" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs" makedepends="liblxqt-devel xdg-user-dirs" depends="xdg-user-dirs" short_desc="LXQt session handler" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-session/releases/download/${version}/lxqt-session-${version}.tar.xz" -checksum=e826bb81fc3f688bf626cac2c66e63881e1ccfdb1ec8b54f493c1270775e69b8 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-session/releases/download/${version}/lxqt-session-${version}.tar.xz" +checksum=bf44b691d34d75895d0055894b714ed7035ad2605874a9d6f286bc7aefbd2baa replaces="lxqt-common>=0" diff --git a/srcpkgs/lxqt-sudo/template b/srcpkgs/lxqt-sudo/template index b32fb7757f7..a1440b4be83 100644 --- a/srcpkgs/lxqt-sudo/template +++ b/srcpkgs/lxqt-sudo/template @@ -1,15 +1,15 @@ # Template file for 'lxqt-sudo' pkgname=lxqt-sudo -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" makedepends="liblxqt-devel" depends="sudo" short_desc="LXQt GUI frontend for sudo" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/lxqt-sudo/releases/download/${version}/lxqt-sudo-${version}.tar.xz" -checksum=7ce8783a5a7ec72be54d79f8e01c0b3618a1d2d3c7c22c190eb55c8df1c6df44 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-sudo/releases/download/${version}/lxqt-sudo-${version}.tar.xz" +checksum=8e05adf4926eead9fa3015be54a76f67ebf3f7c40e1dea0bcafbcf4c38e548c8 diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template index 6729d941392..ee6736301fc 100644 --- a/srcpkgs/lxqt-themes/template +++ b/srcpkgs/lxqt-themes/template @@ -1,14 +1,14 @@ # Template file for 'lxqt-themes' pkgname=lxqt-themes -version=0.12.0 +version=0.13.0 revision=1 build_style=cmake -makedepends="lxqt-build-tools" +hostmakedepends="lxqt-build-tools" depends="hicolor-icon-theme" short_desc="Themes, graphics and icons for LXQt" maintainer="maxice8 " -license="LGPL-2.1" -homepage="https://github.com/lxde/lxqt-themes" -distfiles="https://github.com/lxde/lxqt-themes/releases/download/${version}/lxqt-themes-${version}.tar.xz" -checksum=bfc94e8bd3cf0b509d46e0a382b2564b44e82ca4da962d1d4cdd771889d49eb9 +license="LGPL-2.1-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/lxqt-themes/releases/download/${version}/lxqt-themes-${version}.tar.xz" +checksum=8ecef8b903b0dfc63bc4e232128d519fd4fdd53842a6f327e3f62dd4e59f738e replaces="lxqt-common>=0" diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template index a98b8a060a0..78e298e4a33 100644 --- a/srcpkgs/lxqt/template +++ b/srcpkgs/lxqt/template @@ -1,7 +1,7 @@ # Template file for 'lxqt' pkgname=lxqt -version=0.12.0 -revision=2 +version=0.13.0 +revision=1 build_style=meta depends=" lxqt-about>=${version} @@ -21,9 +21,9 @@ depends=" lxqt-themes>=${version} obconf-qt>=${version} pcmanfm-qt>=${version} - lximage-qt>=0.6.0 + lximage-qt>=0.7.0 lxmenu-data - qterminal>=0.8.0 + qterminal>=0.9.0 openbox breeze-icons xdg-utils @@ -31,5 +31,5 @@ depends=" upower" short_desc="The LXQt meta-package for Void Linux" maintainer="Juan RP " -homepage="http://www.lxqt.org" -license="LGPL-2.1" +homepage="https://www.lxqt.org/" +license="LGPL-2.1-or-later" diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 70cf73506e4..46dbaac8437 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0198 +version=0199 revision=1 wrksrc="mame-mame${version}" homepage="http://mamedev.org" @@ -8,7 +8,7 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" -checksum=0c354a5c3d82d46acf2183d6be291364c4454ce6ffdd79cf3397174779cff8fa +checksum=cf4511d6c893e699fd5bc510133aee75c852942321e1c668c9d5802229bec116 hostmakedepends="automoc4 perl pkg-config python" makedepends="SDL2_ttf-devel glm libjpeg-turbo-devel libutf8proc-devel diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template index f0547868e08..37025319a8d 100644 --- a/srcpkgs/marco/template +++ b/srcpkgs/marco/template @@ -1,6 +1,6 @@ # Template file for 'marco' pkgname=marco -version=1.20.1 +version=1.20.2 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-startup-notification --disable-schemas-compile" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a44e4983f1f3bcf6460ded1677c3599d59ce4e2133cae0140680ee15d521dde2 +checksum=3ebe0c50e3b8cd0420f47719ee7bf806f4719a96d8244f27c98f902bb1f3c0ba pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template index 18db5dd9c32..e9bf67da6ee 100644 --- a/srcpkgs/master-pdf-editor/template +++ b/srcpkgs/master-pdf-editor/template @@ -1,8 +1,8 @@ # Template file for 'master-pdf-editor' pkgname=master-pdf-editor -version=4.3.89 +version=5.0.28 revision=1 -wrksrc=master-pdf-editor-4 +wrksrc="${pkgname}-5" only_for_archs="x86_64" repository="nonfree" nostrip="yes" @@ -12,13 +12,13 @@ maintainer="Giuseppe Fierro " license="Proprietary" homepage="https://code-industry.net/free-pdf-editor/" distfiles="https://code-industry.net/public/${pkgname}-${version}_qt5.amd64.tar.gz" -checksum=ac77db75bcc5f2bce21d98a55c07176e15682b0abe5a83708c53d38721fdab4c +checksum=f32a0b9fadf5af45502135fb11f2de9f2e02efc323cffd11a54044ce79561a9f do_install() { vlicense license.txt - vinstall masterpdfeditor4.desktop 644 usr/share/applications - rm {license.txt,masterpdfeditor4.desktop} + vinstall masterpdfeditor5.desktop 644 usr/share/applications + rm {license.txt,masterpdfeditor5.desktop} - vmkdir opt/master-pdf-editor-4 - vcopy * opt/master-pdf-editor-4 + vmkdir opt/master-pdf-editor-5 + vcopy * opt/master-pdf-editor-5 } diff --git a/srcpkgs/mate-accountsdialog/template b/srcpkgs/mate-accountsdialog/template deleted file mode 100644 index c4e53415fd2..00000000000 --- a/srcpkgs/mate-accountsdialog/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'mate-accountsdialog' -pkgname=mate-accountsdialog -version=1.8.1 -revision=2 -build_style=gnu-configure -configure_args="--disable-systemd" -hostmakedepends="mate-common itstool apg" -makedepends="mate-polkit-devel accountsservice-devel dbus-glib-devel gtk+-devel mate-desktop-devel libunique1-devel" -depends="accountsservice apg iso-codes" -short_desc="An application to view and modify user accounts information for MATE" -maintainer="Juan RP " -license="LGPL-2" -homepage="http://mate-desktop.org" -distfiles="https://github.com/NiceandGently/${pkgname}/archive/v${version}.tar.gz" -checksum=b3a4d91b10b925ae5d4468cf0ad7936b8e1575ef5399743696fdc4b09efecb86 - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} diff --git a/srcpkgs/mate-applets-data b/srcpkgs/mate-applets-data new file mode 120000 index 00000000000..493b4bab36b --- /dev/null +++ b/srcpkgs/mate-applets-data @@ -0,0 +1 @@ +mate-applets \ No newline at end of file diff --git a/srcpkgs/mate-applets/template b/srcpkgs/mate-applets/template index b55b5a0b643..043380d78cf 100644 --- a/srcpkgs/mate-applets/template +++ b/srcpkgs/mate-applets/template @@ -9,7 +9,7 @@ makedepends="NetworkManager-devel gtksourceview-devel libSM-devel libgtop-devel libmate-panel-devel libmateweather-devel libnotify-devel libwnck-devel mate-desktop-devel mate-icon-theme mate-settings-daemon-devel polkit-devel upower-devel wireless_tools-devel" -depends="mate-icon-theme" +depends="mate-icon-theme mate-applets-data-${version}_${revision}" short_desc="Applets for MATE panel" maintainer="Juan RP " license="GPL-2.0-or-later" @@ -23,3 +23,11 @@ case "$XBPS_TARGET_MACHINE" in makedepends+=" libcpupower-devel" ;; esac + +mate-applets-data_package() { + noarch=yes + short_desc+=" - architecture independent data" + pkg_install() { + vmove usr/share + } +} diff --git a/srcpkgs/mate-calc/template b/srcpkgs/mate-calc/template index 75258adc50b..2ca8f8a6bbf 100644 --- a/srcpkgs/mate-calc/template +++ b/srcpkgs/mate-calc/template @@ -1,6 +1,6 @@ # Template file for 'mate-calc' pkgname=mate-calc -version=1.20.1 +version=1.20.2 revision=1 build_style=gnu-configure hostmakedepends="glib-devel intltool itstool pkg-config" @@ -10,4 +10,4 @@ maintainer="Álvaro Castillo " license="GPL-2.0-or-later" homepage="https://mate-desktop.org/" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0761c2fff146d9976d586f21598d1ea39812171de3e0f02edb9435a2e2306002 +checksum=a0536986f9c1adf04a1e59110c29277caedb06e27ac7876096f9399ae4001fbe diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template index 292ee6af6fd..e907477d7a8 100644 --- a/srcpkgs/mate-control-center/template +++ b/srcpkgs/mate-control-center/template @@ -1,6 +1,6 @@ # Template file for 'mate-control-center' pkgname=mate-control-center -version=1.20.2 +version=1.20.3 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb" @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d49a26afa11c13328f40bff8a9762110811786786a6d445d5b3fc3f0737f80f4 +checksum=6d7e4c23cbfee2ec3682b6b07c0226742775c669f6e47862691d84ffc742f172 post_install() { rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache @@ -27,6 +27,7 @@ libmate-control-center_package() { vmove usr/lib/*.so.* } } + libmate-control-center-devel_package() { short_desc+=" - development files" depends="librsvg-devel mate-desktop-devel mate-menus-devel ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/mate-icon-theme/template b/srcpkgs/mate-icon-theme/template index c445ec68a3c..b7712e21dfc 100644 --- a/srcpkgs/mate-icon-theme/template +++ b/srcpkgs/mate-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'mate-icon-theme' pkgname=mate-icon-theme -version=1.20.0 +version=1.20.1 revision=1 noarch=yes build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " license="CC-BY-SA-3.0" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=65b6a654245a05db63d09b78c8ef98a19f46cd511ca73033363abc5795aeba52 +checksum=6a6fb81be131c5a9cc2b3e39868e07458e8d619f55039d89d2d3caf079e5f4f7 post_install() { rm -f ${DESTDIR}/usr/share/icons/mate/icon-theme.cache diff --git a/srcpkgs/mate-media/template b/srcpkgs/mate-media/template index c3e6213275d..a1a2fa144b5 100644 --- a/srcpkgs/mate-media/template +++ b/srcpkgs/mate-media/template @@ -1,16 +1,15 @@ # Template file for 'mate-media' pkgname=mate-media -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config intltool itstool glib-devel" -makedepends="libcanberra-devel mate-desktop-devel libmate-panel-devel - libxml2-devel libmatemixer-devel" +hostmakedepends="pkg-config intltool glib-devel" +makedepends="libcanberra-devel mate-desktop-devel libmatemixer-devel" depends="sound-theme-freedesktop" short_desc="MATE Media Tools" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=99c50f56c93c5a010806658525b189c2fe7f38802c2f5d6ab79286c4ece16b27 +checksum=49273998491d802df97306c10dfd49178fc266ddbce3f0b2ef61390c503d64b5 diff --git a/srcpkgs/mate-menus/template b/srcpkgs/mate-menus/template index babb86709af..d326928c7e7 100644 --- a/srcpkgs/mate-menus/template +++ b/srcpkgs/mate-menus/template @@ -1,6 +1,6 @@ # Template file for 'mate-menus' pkgname=mate-menus -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure configure_args="--disable-static $(vopt_enable python)" @@ -8,10 +8,10 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection makedepends="libglib-devel $(vopt_if python python-devel)" short_desc="MATE menu specifications" maintainer="Juan RP " -license="GPL-2.0-or-later" +license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0fdadb1ba0950c14a72802c8a5afae99c46ca20ef3c7b9f1854bd5a5da3433f0 +checksum=c6eb74022f9cb283cd7603e9e5aac25258bfe970da661ca9c050f8a50c9f17dd build_options="gir python" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/mate-netbook/template b/srcpkgs/mate-netbook/template index 7967626f4d5..775b73a47c3 100644 --- a/srcpkgs/mate-netbook/template +++ b/srcpkgs/mate-netbook/template @@ -1,13 +1,13 @@ # Template file for 'mate-netbook' pkgname=mate-netbook -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool itstool glib-devel" -makedepends="mate-desktop-devel libmate-panel-devel libunique-devel libXtst-devel libwnck-devel libfakekey-devel" +hostmakedepends="pkg-config intltool glib-devel" +makedepends="libmate-panel-devel libXtst-devel libwnck-devel libfakekey-devel" short_desc="The MATE netbook extension" maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3f2f1ebb1cdf778769bafaea9d3ba17beb1d74b1a078b4085e9c5a17bc9d22f1 +checksum=58331b140c7b2c38edba9ab200aebd2e3a4655fbc65ff1df4ce748b315059ac6 diff --git a/srcpkgs/mate-notification-daemon/template b/srcpkgs/mate-notification-daemon/template index 9ac8f4138a8..50334468f4a 100644 --- a/srcpkgs/mate-notification-daemon/template +++ b/srcpkgs/mate-notification-daemon/template @@ -1,15 +1,15 @@ # Template file for 'mate-notification-daemon' pkgname=mate-notification-daemon -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config intltool itstool glib-devel dbus-glib-devel" -makedepends="gtk+3-devel libnotify-devel dbus-glib-devel libwnck-devel libcanberra-devel" +hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel" +makedepends="libnotify-devel dbus-glib-devel libwnck-devel libcanberra-devel" depends="dconf hicolor-icon-theme desktop-file-utils" short_desc="Notification daemon for MATE" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ae304c5beca9aae5bf757d41692edabcb887dd43b0bdc89d07a2c57fed290437 +checksum=e85cd01f40d238c57b3da30537fbd561102e652f492b20ebfea79938d8e39a43 diff --git a/srcpkgs/mate-polkit/template b/srcpkgs/mate-polkit/template index 3bfe885855c..4dd14d1ae05 100644 --- a/srcpkgs/mate-polkit/template +++ b/srcpkgs/mate-polkit/template @@ -1,19 +1,14 @@ # Template file for 'mate-polkit' pkgname=mate-polkit -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure -configure_args="--disable-static $(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)" +configure_args="--disable-static" +hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel polkit-devel" short_desc="PolicyKit integration for the MATE desktop" maintainer="Juan RP " -license="GPL-2.0-or-later" +license="LGPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=242988d0033f878b967dea5ad380cc7cb49910b9b2ea33e95061bf3062cd8101 - -build_options="gir" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi +checksum=53d3249a0abbcb6eacccbf7898f113e546c8ca0fc683b81ab8e90e907e99e615 diff --git a/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template index 829762b22f7..941e3058f10 100644 --- a/srcpkgs/mate-power-manager/template +++ b/srcpkgs/mate-power-manager/template @@ -1,16 +1,16 @@ # Template file for 'mate-power-manager' pkgname=mate-power-manager -version=1.20.1 +version=1.20.2 revision=1 build_style=gnu-configure -configure_args="--sbindir=/usr/bin --disable-schemas-compile" -hostmakedepends="dbus-glib-devel mate-common mate-desktop-devel" +configure_args="--disable-schemas-compile" +hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel" makedepends="libcanberra-devel libgnome-keyring-devel libmate-panel-devel - libnotify-devel libunique-devel mate-desktop-devel upower-devel" + libnotify-devel upower-devel" depends="dconf upower" short_desc="Power management tool for the MATE desktop" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d6a965f85ef9bbf45c02a8f8010b7530a6154488c73730c5ea26aacce49686e8 +checksum=506e58d23cdfd06f65159effbfd5ebd2e3e5625a9d8de77ae7502b6ebb24e5fc diff --git a/srcpkgs/mate-screensaver/template b/srcpkgs/mate-screensaver/template index a1374d9dbb9..f817be06ea3 100644 --- a/srcpkgs/mate-screensaver/template +++ b/srcpkgs/mate-screensaver/template @@ -1,18 +1,18 @@ # Template file for 'mate-screensaver' pkgname=mate-screensaver -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool glib-devel" -makedepends="gtk+3-devel dbus-glib-devel libnotify-devel libXScrnSaver-devel +makedepends="dbus-glib-devel libnotify-devel libXScrnSaver-devel libmatekbd-devel mate-menus-devel mate-desktop-devel pam-devel" depends="mate-desktop mate-session-manager" short_desc="Screensaver for MATE" maintainer="Juan RP " -license="GPL-2.0-or-later" +license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=69927e32b49b9723ab26a9cc0005f84ff904103d9eb71e926dc44d5311302899 +checksum=109309499e1d2d1794ee1df80af65aeaeb9696a1e08b5a8a97bc7a5e421299d5 post_install() { vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname} diff --git a/srcpkgs/mate-sensors-applet/template b/srcpkgs/mate-sensors-applet/template index 09086f785f0..4654241a4b0 100644 --- a/srcpkgs/mate-sensors-applet/template +++ b/srcpkgs/mate-sensors-applet/template @@ -1,16 +1,16 @@ # Template file for 'mate-sensors-applet' pkgname=mate-sensors-applet -version=1.20.1 +version=1.20.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" hostmakedepends="dbus-glib-devel glib-devel intltool itstool libxslt pkg-config" makedepends="dbus-glib-devel libatasmart-devel libmate-panel-devel - libnotify-devel libsensors-devel mate-desktop-devel" + libnotify-devel libsensors-devel" depends="dconf" short_desc="Sensors applet for MATE" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bd00e792ec3948bf895c8ff590184da30fa5614bc6969d450cfc8381a51cd952 +checksum=cb0458deeac0d83ce94cce3d225186d0708af7b61e4469544df7092725ff1d4e diff --git a/srcpkgs/mate-session-manager/template b/srcpkgs/mate-session-manager/template index 3e00c68bd03..ec523adccbb 100644 --- a/srcpkgs/mate-session-manager/template +++ b/srcpkgs/mate-session-manager/template @@ -1,6 +1,6 @@ # Template file for 'mate-session-manager' pkgname=mate-session-manager -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4f5c4068f3e1f4d63bb86340b375c2f73dec8fb54066d7da589f70a89337f96f +checksum=251eec7ae8a79627d736138c6eb87206f4bf53ba772210f3d5dd017d0d51bd3d diff --git a/srcpkgs/mate-system-monitor/template b/srcpkgs/mate-system-monitor/template index 523bb23aeb2..07f6d35799e 100644 --- a/srcpkgs/mate-system-monitor/template +++ b/srcpkgs/mate-system-monitor/template @@ -1,16 +1,15 @@ # Template file for 'mate-system-monitor' pkgname=mate-system-monitor -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure -configure_args="--disable-python" hostmakedepends="glib-devel intltool itstool pkg-config" makedepends="dbus-glib-devel gtkmm-devel libgtop-devel librsvg-devel - libwnck-devel mate-icon-theme" + libwnck-devel" depends="dbus mate-icon-theme" -short_desc="A system monitor for MATE" +short_desc="The MATE system monitor" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c5f2ab0884b338cad0819b5e5f3b869e5039e16455db140e8b9afc07a4cf2a15 +checksum=96e9952ef286c7eff8ba5a590c7b34ac6537a5ef8a89ea900005b2750f8dc8a8 diff --git a/srcpkgs/mate-terminal/template b/srcpkgs/mate-terminal/template index 9127b8c4083..96a59e1544b 100644 --- a/srcpkgs/mate-terminal/template +++ b/srcpkgs/mate-terminal/template @@ -1,14 +1,14 @@ # Template file for 'mate-terminal' pkgname=mate-terminal -version=1.20.0 -revision=1 +version=1.20.1 +revision=3 build_style=gnu-configure hostmakedepends="glib-devel intltool itstool pkg-config" -makedepends="libSM-devel mate-desktop-devel vte3-devel" -depends="dbus dconf" +makedepends="libSM-devel vte3-devel dconf-devel" +depends="dbus mate-desktop" short_desc="The MATE Terminal Emulator" maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5f81ac98793880c03fea143c49b997c4c616d6bc77146faab15ff57a3434660c +checksum=27a97914d92f5cc1b0744fe10c60d0484d7eeb699bc5dafe2fc3f75b4f41d979 diff --git a/srcpkgs/mate-user-guide/template b/srcpkgs/mate-user-guide/template index 3c2e5c5d719..ad24c14a683 100644 --- a/srcpkgs/mate-user-guide/template +++ b/srcpkgs/mate-user-guide/template @@ -1,6 +1,6 @@ # Template file for 'mate-user-guide' pkgname=mate-user-guide -version=1.20.0 +version=1.20.1 revision=1 noarch=yes build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Juan RP " license="GFDL-1.1-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=82835c4f4fd72d1dd70c4469ee0307e78ccf8dd813a756e5de67a25ffda639d8 +checksum=b9b548ae0ce592fd6c046bd3ed68acbf3da3bed96647b78abf9172529e6429cd diff --git a/srcpkgs/mate-utils/template b/srcpkgs/mate-utils/template index 626a503c429..8f164e29906 100644 --- a/srcpkgs/mate-utils/template +++ b/srcpkgs/mate-utils/template @@ -1,6 +1,6 @@ # Template file for 'mate-utils' pkgname=mate-utils -version=1.20.0 +version=1.20.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" @@ -14,11 +14,12 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f4c2ca4fe533538976412c0fab282a1c8e61f4987bc920d7a452b1131f9a4681 +checksum=6a1e0bba9c117f8ce81bb271d2182006524250fe9e31f2fc904f6403453020cf pre_configure() { NOCONFIGURE=1 ./autogen.sh } + post_install() { rm -r ${DESTDIR}/usr/include rm -r ${DESTDIR}/usr/lib/pkgconfig diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template index 8bef4a53538..05cb7d2daaf 100644 --- a/srcpkgs/matio/template +++ b/srcpkgs/matio/template @@ -1,19 +1,19 @@ # Template file for 'matio' pkgname=matio version=1.5.12 -revision=2 +revision=3 build_style=gnu-configure +configure_args="--disable-static" hostmakedepends="libtool" makedepends="zlib-devel hdf5-devel" -depends="zlib hdf5" short_desc="MATLAB MAT file I/O library" maintainer="Florian Eich " -license="BSD-2" +license="BSD-2-Clause" homepage="https://github.com/tbeu/matio" distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=8695e380e465056afa5b5e20128935afe7d50e03830f9f7778a72e1e1894d8a9 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then configure_args+=" ac_cv_va_copy=C99" fi @@ -23,10 +23,11 @@ post_install() { matio-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}-${version}_${revision}" pkg_install() { - vmove /usr/include - vmove /usr/lib/*.a - vmove /usr/lib/*.so + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + vmove usr/share/man/man3 } } diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template index 2176dbd1adc..dfc9ed38516 100644 --- a/srcpkgs/mbedtls/template +++ b/srcpkgs/mbedtls/template @@ -1,17 +1,18 @@ # Template file for 'mbedtls' pkgname=mbedtls -version=2.8.0 +version=2.11.0 revision=1 wrksrc="mbedtls-mbedtls-${version}" build_style=cmake hostmakedepends="perl" -configure_args="-DENABLE_TESTING=0 -DUSE_SHARED_MBEDTLS_LIBRARY=1" +configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1" short_desc="Portable cryptographic TLS library" maintainer="Juan RP " license="Apache-2.0" homepage="https://tls.mbed.org/" +changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/development/ChangeLog" distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz" -checksum=c544d5a6ea6cf629a3c2d0653b1e8f3ab0491a852b84d9478403c6a3fb699fe4 +checksum=50d715c4bf1c21757b25df192cdff6951a621b32da1c991b513c23b9ddf3333a pre_configure() { sed -i include/mbedtls/config.h \ @@ -23,7 +24,7 @@ mbedtls-utils_package() { short_desc+=" - additional utilities" depends="${sourcepkg}-${version}_${revision}" pkg_install() { - vmove "usr/bin/*" + vmove usr/bin } } @@ -36,3 +37,4 @@ mbedtls-devel_package() { vmove "usr/lib/*.so" } } + diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template index 62cb5423d9d..d127c35bbd2 100644 --- a/srcpkgs/mbuffer/template +++ b/srcpkgs/mbuffer/template @@ -1,6 +1,6 @@ # Template file for 'mbuffer' pkgname=mbuffer -version=20180505 +version=20180625 revision=1 build_style=gnu-configure makedepends="libressl-devel" @@ -9,5 +9,5 @@ maintainer="Diogo Leal " license="GPL-3.0-or-later" homepage="http://www.maier-komor.de/mbuffer.html" distfiles="http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz" -checksum=33eb3f6969be995007fe8d3b0b5e301c8d324efeab37553a492bd23d2f330b72 +checksum=b7bce28e3f75803cb84ea31de7a1c4470fa159a33b3c8bc345666150d71f959c conf_files="/etc/mbuffer.rc" diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template index fceae5499ef..c1587cb2028 100644 --- a/srcpkgs/meld/template +++ b/srcpkgs/meld/template @@ -1,18 +1,18 @@ # Template file for 'meld' pkgname=meld -version=3.18.0 -revision=2 +version=3.18.2 +revision=1 noarch=yes build_style=python3-module hostmakedepends="pkg-config intltool gnome-doc-utils python3 itstool gtk-update-icon-cache" depends="python3-gobject gsettings-desktop-schemas gtksourceview desktop-file-utils hicolor-icon-theme" pycompile_module="meld" short_desc="Visual diff and merge tool" -maintainer="Juan RP " +maintainer="Helmut Pozimski " +license="GPL-2.0-or-later" homepage="http://meldmerge.org/" -license="GPL-2" distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz" -checksum=848158b1e5c7473b9da3ddc16e057aad8951ec82979beb5914b8b4acdf97223e +checksum=1934abf4397e6a31b3c3d3d372ddb2aa6e6be499a71d96b114f14707afe93781 configure_args="--disable-schemas-compile" post_install() { diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template index f982dba1e02..3ffde533070 100644 --- a/srcpkgs/merkaartor/template +++ b/srcpkgs/merkaartor/template @@ -1,14 +1,14 @@ # Template file for 'merkaartor' pkgname=merkaartor version=0.18.3 -revision=3 +revision=4 build_style=qmake hostmakedepends="qt5-qmake qt5-declarative-devel libgdal-tools" makedepends="libgdal-devel proj-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel" short_desc="Openstreetmap map editor" maintainer="John " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://merkaartor.be" distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz" checksum=d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947 diff --git a/srcpkgs/messagelib/update b/srcpkgs/messagelib/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/messagelib/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template index c72695f74dc..3c0d0076973 100644 --- a/srcpkgs/minikube/template +++ b/srcpkgs/minikube/template @@ -1,6 +1,6 @@ # Template file for 'minikube' pkgname=minikube -version=0.27.0 +version=0.28.0 revision=1 only_for_archs="x86_64 x86_64-musl" build_style=go diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template index 639580dc493..6b028ee3292 100644 --- a/srcpkgs/minio/template +++ b/srcpkgs/minio/template @@ -1,9 +1,9 @@ # Template file for 'minio' pkgname=minio -version=2018.03.19 -revision=2 -_version="${version//./-}T19-22-06Z" -wrksrc=$pkgname-RELEASE.$_version +version=2018.06.22 +revision=1 +_version="${version//./-}T23-48-46Z" +wrksrc=${pkgname}-RELEASE.${_version} build_style=go hostmakedepends="git" short_desc="Object storage server compatible with Amazon S3" @@ -11,8 +11,8 @@ maintainer="Gerardo Di Iorio " license="Apache-2.0" homepage="https://github.com/minio/minio" go_import_path="github.com/minio/minio" -distfiles="$homepage/archive/RELEASE.$_version.tar.gz" -checksum=91afb0b5acbfd622a5ea55495b5abca3cfdf23eef213ea15f74f1682d68eca84 +distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz" +checksum=4fdcfaff5979e24c3a7e5c8f580bcf36acc8c87d903534d59c773ee0b6b0ec7a system_accounts="_minio" _minio_homedir="/var/lib/minio" _minio_descr="Minio Daemon User" diff --git a/srcpkgs/minio/update b/srcpkgs/minio/update new file mode 100644 index 00000000000..21bb98cb1c3 --- /dev/null +++ b/srcpkgs/minio/update @@ -0,0 +1 @@ +pattern="/archive/RELEASE\.\K[-\d]+(?=T[-\d]+Z\.tar\.gz)" diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 0e15fe62789..7fb0724bdcf 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,6 +1,6 @@ # Template file for 'mixxx' pkgname=mixxx -version=2.1.0 +version=2.1.1 revision=2 wrksrc="mixxx-release-${version}" hostmakedepends="pkg-config scons" @@ -13,9 +13,9 @@ depends="qt5-plugin-sqlite" short_desc="Open source digital DJing software that allows mixing music" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="http://www.mixxx.org" +homepage="https://www.mixxx.org" distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz" -checksum=148b0ab222fa1c310e62b566d87c0a3d43fdee9435150d40d62055dbc228d396 +checksum=f92f8d9fd34b2b2e7e71dd8c7fd2ce0911180bbbd28407906afeab4db9195236 _scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5" nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 221ee87d83a..d7aa5a7be2b 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,6 +1,6 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix -version=23.0.0 +version=24.0.0 revision=1 build_style=gnu-configure configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt" @@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-only" homepage="https://www.bunkus.org/videotools/mkvtoolnix/" distfiles="${homepage}/sources/${pkgname}-${version}.tar.xz" -checksum=1da0b0cca24f6d45ef614e864bbec0043af0b53062f86a524fe799cc355c1d68 +checksum=7a57caa192150f428fbdf18abfcb8061ce9284c95d3615b88315e66f32321c08 nocross="Fails due to dependency chain eigen -> jack -> pulseaudio" pre_configure() { diff --git a/srcpkgs/mlt/patches/musl-locale.patch b/srcpkgs/mlt/patches/musl-locale.patch deleted file mode 100644 index a53df96d03d..00000000000 --- a/srcpkgs/mlt/patches/musl-locale.patch +++ /dev/null @@ -1,263 +0,0 @@ -Remove the wrong assumptions that if __GLIBC__ isn't defined, -then strtod_l() would not exist. It exists with musl libc as well. - -Also don't assume locale_t == char* if __GLIBC__ isn't defined. - ---- src/framework/mlt_properties.c 2018-01-23 07:41:00.000000000 +0100 -+++ src/framework/mlt_properties.c 2018-01-25 17:49:25.604808390 +0100 -@@ -141,15 +141,9 @@ int mlt_properties_set_lcnumeric( mlt_pr - { - property_list *list = self->local; - --#if defined(__GLIBC__) || defined(__APPLE__) - if ( list->locale ) - freelocale( list->locale ); - list->locale = newlocale( LC_NUMERIC_MASK, locale, NULL ); --#else -- -- free( list->locale ); -- list->locale = strdup( locale ); --#endif - } - else - error = 1; -@@ -181,7 +175,7 @@ const char* mlt_properties_get_lcnumeric - #elif defined(__GLIBC__) - result = list->locale->__names[ LC_NUMERIC ]; - #else -- result = list->locale; -+ result = "C"; - #endif - #if defined(_WIN32) - if ( result ) -@@ -713,12 +707,10 @@ int mlt_properties_set( mlt_properties s - // Determine the value - if ( isdigit( id[ 0 ] ) ) - { --#if defined(__GLIBC__) || defined(__APPLE__) - property_list *list = self->local; - if ( list->locale ) - current = strtod_l( id, NULL, list->locale ); - else --#endif - current = strtod( id, NULL ); - } - else -@@ -1404,14 +1396,9 @@ void mlt_properties_close( mlt_propertie - free( list->name[ index ] ); - } - --#if defined(__GLIBC__) || defined(__APPLE__) - // Cleanup locale - if ( list->locale ) - freelocale( list->locale ); --#else -- -- free( list->locale ); --#endif - - // Clear up the list - pthread_mutex_destroy( &list->mutex ); - ---- src/framework/mlt_property.c 2018-01-23 07:41:00.000000000 +0100 -+++ src/framework/mlt_property.c 2018-01-25 17:45:17.343812836 +0100 -@@ -278,27 +278,10 @@ static int time_clock_to_frames( mlt_pro - s = copy; - pos = strrchr( s, ':' ); - --#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) -- char *orig_localename = NULL; -- if ( locale ) -- { -- // Protect damaging the global locale from a temporary locale on another thread. -- pthread_mutex_lock( &self->mutex ); -- -- // Get the current locale -- orig_localename = strdup( setlocale( LC_NUMERIC, NULL ) ); -- -- // Set the new locale -- setlocale( LC_NUMERIC, locale ); -- } --#endif -- - if ( pos ) { --#if defined(__GLIBC__) || defined(__APPLE__) - if ( locale ) - seconds = strtod_l( pos + 1, NULL, locale ); - else --#endif - seconds = strtod( pos + 1, NULL ); - *pos = 0; - pos = strrchr( s, ':' ); -@@ -312,23 +295,12 @@ static int time_clock_to_frames( mlt_pro - } - } - else { --#if defined(__GLIBC__) || defined(__APPLE__) - if ( locale ) - seconds = strtod_l( s, NULL, locale ); - else --#endif - seconds = strtod( s, NULL ); - } - --#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) -- if ( locale ) { -- // Restore the current locale -- setlocale( LC_NUMERIC, orig_localename ); -- free( orig_localename ); -- pthread_mutex_unlock( &self->mutex ); -- } --#endif -- - free( copy ); - - return floor( fps * hours * 3600 ) + floor( fps * minutes * 60 ) + lrint( fps * seconds ); -@@ -407,7 +379,7 @@ static int time_code_to_frames( mlt_prop - static int mlt_property_atoi( mlt_property self, double fps, locale_t locale ) - { - const char *value = self->prop_string; -- -+ - // Parse a hex color value as #RRGGBB or #AARRGGBB. - if ( value[0] == '#' ) - { -@@ -489,37 +461,13 @@ static double mlt_property_atof( mlt_pro - char *end = NULL; - double result; - --#if defined(__GLIBC__) || defined(__APPLE__) - if ( locale ) - result = strtod_l( value, &end, locale ); - else --#elif !defined(_WIN32) -- char *orig_localename = NULL; -- if ( locale ) { -- // Protect damaging the global locale from a temporary locale on another thread. -- pthread_mutex_lock( &self->mutex ); -- -- // Get the current locale -- orig_localename = strdup( setlocale( LC_NUMERIC, NULL ) ); -- -- // Set the new locale -- setlocale( LC_NUMERIC, locale ); -- } --#endif -- - result = strtod( value, &end ); - if ( end && end[0] == '%' ) - result /= 100.0; - --#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) -- if ( locale ) { -- // Restore the current locale -- setlocale( LC_NUMERIC, orig_localename ); -- free( orig_localename ); -- pthread_mutex_unlock( &self->mutex ); -- } --#endif -- - return result; - } - } -@@ -1030,36 +978,11 @@ static int is_property_numeric( mlt_prop - { - double temp; - char *p = NULL; -- --#if defined(__GLIBC__) || defined(__APPLE__) -+ - if ( locale ) - temp = strtod_l( self->prop_string, &p, locale ); - else --#elif !defined(_WIN32) -- char *orig_localename = NULL; -- if ( locale ) { -- // Protect damaging the global locale from a temporary locale on another thread. -- pthread_mutex_lock( &self->mutex ); -- -- // Get the current locale -- orig_localename = strdup( setlocale( LC_NUMERIC, NULL ) ); -- -- // Set the new locale -- setlocale( LC_NUMERIC, locale ); -- } --#endif -- -- temp = strtod( self->prop_string, &p ); -- --#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) -- if ( locale ) { -- // Restore the current locale -- setlocale( LC_NUMERIC, orig_localename ); -- free( orig_localename ); -- pthread_mutex_unlock( &self->mutex ); -- } --#endif -- -+ temp = strtod( self->prop_string, &p ); - result = ( p != self->prop_string ); - } - return result; -@@ -1535,28 +1458,12 @@ mlt_rect mlt_property_get_rect( mlt_prop - char *p = NULL; - int count = 0; - --#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) -- char *orig_localename = NULL; -- if ( locale ) { -- // Protect damaging the global locale from a temporary locale on another thread. -- pthread_mutex_lock( &self->mutex ); -- -- // Get the current locale -- orig_localename = strdup( setlocale( LC_NUMERIC, NULL ) ); -- -- // Set the new locale -- setlocale( LC_NUMERIC, locale ); -- } --#endif -- - while ( *value ) - { - double temp; --#if defined(__GLIBC__) || defined(__APPLE__) - if ( locale ) - temp = strtod_l( value, &p, locale ); - else --#endif - temp = strtod( value, &p ); - if ( p != value ) - { -@@ -1586,15 +1493,6 @@ mlt_rect mlt_property_get_rect( mlt_prop - value = p; - count ++; - } -- --#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(_WIN32) -- if ( locale ) { -- // Restore the current locale -- setlocale( LC_NUMERIC, orig_localename ); -- free( orig_localename ); -- pthread_mutex_unlock( &self->mutex ); -- } --#endif - } - return rect; - } - ---- src/framework/mlt_property.h 2018-01-23 07:41:00.000000000 +0100 -+++ src/framework/mlt_property.h 2018-01-25 18:01:15.393795679 +0100 -@@ -30,13 +30,7 @@ - #include - #endif - --#if defined(__GLIBC__) && !defined(__APPLE__) - # include --#elif defined(__APPLE__) || (__FreeBSD_version >= 900506) --# include --#else --typedef char* locale_t; --#endif - - extern mlt_property mlt_property_init( ); - extern int mlt_property_set_int( mlt_property self, int value ); diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index b60a4816a8f..01957726732 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -1,6 +1,6 @@ # Template file for 'mlt' pkgname=mlt -version=6.6.0 +version=6.8.0 revision=1 build_style=gnu-configure configure_args="--enable-gpl --enable-gpl3 --disable-swfdec --without-kde @@ -13,11 +13,14 @@ makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk libvidstab-devel" depends="mlt-data>=${version}_${revision} ladspa-sdk-example-plugins" short_desc="Multimedia framework, designed for television broadcasting" +license="GPL-3.0-or-later, LGPL-2.1-or-later" maintainer="Diogo Leal " -license="GPL-3" -homepage="http://mltframework.org/" +homepage="https://mltframework.org/" distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz" -checksum=11515546516b3c54719b6b402cacf46e8d5172450d6e9fe2655b237582490315 +checksum=b348e7a14d289087a99b077480a28dace519f665af9654676b7f5e713d56f0fe + +CFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" +CXXFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" if [ -n "$CROSS_BUILD" ]; then make_build_args="CROSS=${XBPS_CROSS_TRIPLET}-" diff --git a/srcpkgs/mm-common/template b/srcpkgs/mm-common/template index 9e1c024787b..2d4f28955a8 100644 --- a/srcpkgs/mm-common/template +++ b/srcpkgs/mm-common/template @@ -1,6 +1,6 @@ # Template file for 'mm-common' pkgname=mm-common -version=0.9.11 +version=0.9.12 revision=1 noarch=yes build_style=gnu-configure @@ -8,7 +8,7 @@ hostmakedepends="pkg-config intltool itstool" depends="automake libtool intltool pkg-config gtk-doc gettext-devel glib-devel yelp-tools" short_desc="Common development macros for GTK+ C++" maintainer="Juan RP " -license="LGPL-2" -homepage="http://gtkmm.org/" -distfiles="http://download.gnome.org/sources/mm-common/${version%.*}/$pkgname-$version.tar.xz" -checksum=20d1e7466ca4c83c92e29f9e8dfcc8e5721fdf1337f53157bed97be3b73b32a8 +license="LGPL-2.1-or-later" +homepage="https://gtkmm.org/en/" +distfiles="http://download.gnome.org/sources/mm-common/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b diff --git a/srcpkgs/modsecurity/patches/fix-lua-detection.patch b/srcpkgs/modsecurity/patches/fix-lua-detection.patch new file mode 100644 index 00000000000..1181ac47481 --- /dev/null +++ b/srcpkgs/modsecurity/patches/fix-lua-detection.patch @@ -0,0 +1,17 @@ +Source: Arch Linux +Upstream: Unknown +Reason: Fixes lua53 detection + +--- +--- build/find_lua.m4 ++++ build/find_lua.m4 +@@ -16,7 +16,7 @@ LUA_CPPFLAGS="" + LUA_LDADD="" + LUA_LDFLAGS="" + LUA_CONFIG=${PKG_CONFIG} +-LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua lua5.2 lua-5.2 lua_5.2 lua-52 lua_52 lua52 lua5.3 lua-5.3 lua_5.3 lua-53 lua_53 lua53 " ++LUA_PKGNAMES="lua53 lua_53 lua-53 lua_5.3 lua-5.3 lua5.3 lua52 lua_52 lua-52 lua_5.2 lua-5.2 lua5.2 lua lua5 lua51 lua_51 lua-51 lua_5.1 lua-5.1 lua5.1" + LUA_SONAMES="so la sl dll dylib a" + + AC_ARG_WITH( + diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template new file mode 100644 index 00000000000..5af89f7dcbf --- /dev/null +++ b/srcpkgs/modsecurity/template @@ -0,0 +1,28 @@ +# Template file for 'modsecurity' +pkgname=modsecurity +version=2.9.2 +revision=1 +build_style=gnu-configure +configure_args="--enable-standalone-module --enable-htaccess-config" +hostmakedepends="automake libtool pkg-config" +makedepends="apache-devel gdbm-devel libcurl-devel libxml2-devel lua-devel + pcre-devel yajl-devel" +depends="perl-LWP" +short_desc="Rule based web application firwall (WAF)" +maintainer="maxice8 " +license="Apache-2.0" +homepage="https://www.modsecurity.org" +distfiles="https://github.com/SpiderLabs/ModSecurity/releases/download/v${version}/modsecurity-${version}.tar.gz" +checksum=41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" $makedepends" +fi + +pre_configure() { + ./autogen.sh +} + +pre_build() { + sed -ri 's|(hardcode_into_libs)=.*|\1=no|' libtool +} diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 199814bc650..eaf2a7ada00 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=5 +version=0.12.2.0 +revision=1 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 @@ -10,10 +10,10 @@ makedepends="libatomic-devel monero-devel boost-devel libunwind-devel miniupnpc- depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2" short_desc="GUI for the core Monero implementation" maintainer="Helmut Pozimski " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://getmonero.org" distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.gz" -checksum=b915be9ade49e75271033ddfd3ea8956aa3e36ef54d92f99a01532b06a8d3743 +checksum=fcf84d2f3ad68f6542e098aa16785c61a5cacd33894141691db8e290e2441852 pre_configure() { echo "var GUI_VERSION = \"${version}\"" > version.js diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 41efa71065b..b1f109d6c7b 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,6 +1,6 @@ # Template file for 'monero' pkgname=monero -version=0.12.1.0 +version=0.12.2.0 revision=1 conf_files="/etc/monerod.conf" build_style=cmake @@ -8,7 +8,7 @@ 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 - cppzmq czmq-devel" + cppzmq czmq-devel rapidjson" system_accounts="monero" make_dirs=" /var/lib/monero 0750 monero monero @@ -18,7 +18,7 @@ maintainer="Helmut Pozimski " license="BSD-3-Clause" homepage="https://getmonero.org" distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz" -checksum=e5f32361ce39a9849a262afb1d5ce211f593c486dcca7bb0af60fcc26ee52b35 +checksum=804b4200d9673fee2a1e77251848082f9423e49f4d08e350efc476ae8b6a6dd9 if [ "$CROSS_BUILD" ]; then configure_args+=" -DTHREADS_PTHREAD_ARG=OFF" diff --git a/srcpkgs/monocypher/template b/srcpkgs/monocypher/template index d7e5b8c0afd..66572f95364 100644 --- a/srcpkgs/monocypher/template +++ b/srcpkgs/monocypher/template @@ -1,6 +1,6 @@ # Template file for 'monocypher' pkgname=monocypher -version=2.0.2 +version=2.0.4 revision=1 build_style=gnu-makefile short_desc="Easy to use crypto library inspired by libsodium and TweetNaCl" @@ -8,7 +8,7 @@ maintainer="cr6git " license="BSD-2-Clause" homepage="https://monocypher.org" distfiles="https://monocypher.org/download/monocypher-${version}.tar.gz" -checksum=f15f763bca02c33974d92918189c80011b1b894443c24cc3b3b5fba037edb6c3 +checksum=a1e820c30abcc351dba5709ebf80a35a10c3cc97ffea0b0ece2a5834d2f88165 post_install() { vlicense LICENCE.md diff --git a/srcpkgs/mozjs38-devel b/srcpkgs/mozjs38-devel deleted file mode 120000 index 31c380552da..00000000000 --- a/srcpkgs/mozjs38-devel +++ /dev/null @@ -1 +0,0 @@ -mozjs38 \ No newline at end of file diff --git a/srcpkgs/mozjs38/patches/copy-headers.patch b/srcpkgs/mozjs38/patches/copy-headers.patch deleted file mode 100644 index 7f352a795c8..00000000000 --- a/srcpkgs/mozjs38/patches/copy-headers.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Copy headers on install instead of symlinking -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2014-10-29 - ---- - -Index: b/python/mozbuild/mozbuild/backend/recursivemake.py -=================================================================== ---- a/python/mozbuild/mozbuild/backend/recursivemake.py -+++ b/python/mozbuild/mozbuild/backend/recursivemake.py -@@ -796,7 +796,7 @@ - return - - for source, dest, _ in self._walk_hierarchy(obj, exports): -- self._install_manifests['dist_include'].add_symlink(source, dest) -+ self._install_manifests['dist_include'].add_copy(source, dest) - - if not os.path.exists(source): - raise Exception('File listed in EXPORTS does not exist: %s' % source) diff --git a/srcpkgs/mozjs38/patches/fix-icu-check.patch b/srcpkgs/mozjs38/patches/fix-icu-check.patch deleted file mode 100644 index 873697d18f2..00000000000 --- a/srcpkgs/mozjs38/patches/fix-icu-check.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add bracket for sed 4.3 compliance - -Based on upstream fix by Daniel Stenberg in 09 jan 2017 -See: https://hg.mozilla.org/mozilla-central/rev/ebcbf47a83e7 - ---- a/js/src/configure 2017-02-21 16:56:42.350105741 -0300 -+++ b/js/src/configure 2017-02-21 17:33:13.183493978 -0300 -@@ -15231,7 +15231,7 @@ - fi - fi - -- version=`sed -n 's/^[:space:]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` -+ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` - if test x"$version" = x; then - { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; } - fi diff --git a/srcpkgs/mozjs38/patches/gcc-alignment.patch b/srcpkgs/mozjs38/patches/gcc-alignment.patch deleted file mode 100644 index a3a57d54479..00000000000 --- a/srcpkgs/mozjs38/patches/gcc-alignment.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- a/js/src/jit/RegisterSets.h 2017-02-10 17:33:06.210702431 -0800 -+++ b/js/src/jit/RegisterSets.h 2017-02-10 17:43:52.877514146 -0800 -@@ -7,7 +7,6 @@ - #ifndef jit_RegisterSets_h - #define jit_RegisterSets_h - --#include "mozilla/Alignment.h" - #include "mozilla/MathAlgorithms.h" - - #include "jit/JitAllocPolicy.h" -@@ -26,8 +25,8 @@ - Code code_; - - public: -- AnyRegister() -- { } -+ AnyRegister() = default; -+ - explicit AnyRegister(Register gpr) { - code_ = gpr.code(); - } -@@ -156,7 +155,7 @@ - } - #endif - -- ValueOperand() {} -+ ValueOperand() = default; - }; - - // Registers to hold either either a typed or untyped value. -@@ -165,46 +164,25 @@ - // Type of value being stored. - MIRType type_; - -- // Space to hold either an AnyRegister or a ValueOperand. - union U { -- mozilla::AlignedStorage2 typed; -- mozilla::AlignedStorage2 value; -+ AnyRegister typed; -+ ValueOperand value; - } data; - -- AnyRegister& dataTyped() { -- MOZ_ASSERT(hasTyped()); -- return *data.typed.addr(); -- } -- ValueOperand& dataValue() { -- MOZ_ASSERT(hasValue()); -- return *data.value.addr(); -- } -- -- AnyRegister dataTyped() const { -- MOZ_ASSERT(hasTyped()); -- return *data.typed.addr(); -- } -- const ValueOperand& dataValue() const { -- MOZ_ASSERT(hasValue()); -- return *data.value.addr(); -- } -- - public: - -- TypedOrValueRegister() -- : type_(MIRType_None) -- {} -+ TypedOrValueRegister() = default; - - TypedOrValueRegister(MIRType type, AnyRegister reg) - : type_(type) - { -- dataTyped() = reg; -+ data.typed = reg; - } - - MOZ_IMPLICIT TypedOrValueRegister(ValueOperand value) - : type_(MIRType_Value) - { -- dataValue() = value; -+ data.value = value; - } - - MIRType type() const { -@@ -220,11 +198,13 @@ - } - - AnyRegister typedReg() const { -- return dataTyped(); -+ MOZ_ASSERT(hasTyped()); -+ return data.typed; - } - - ValueOperand valueReg() const { -- return dataValue(); -+ MOZ_ASSERT(hasValue()); -+ return data.value; - } - - AnyRegister scratchReg() { -@@ -240,19 +220,18 @@ - // Whether a constant value is being stored. - bool constant_; - -- // Space to hold either a Value or a TypedOrValueRegister. - union U { -- mozilla::AlignedStorage2 constant; -- mozilla::AlignedStorage2 reg; -+ Value constant; -+ TypedOrValueRegister reg; - } data; - - Value& dataValue() { - MOZ_ASSERT(constant()); -- return *data.constant.addr(); -+ return data.constant; - } - TypedOrValueRegister& dataReg() { - MOZ_ASSERT(!constant()); -- return *data.reg.addr(); -+ return data.reg; - } - - public: diff --git a/srcpkgs/mozjs38/patches/js-version.patch b/srcpkgs/mozjs38/patches/js-version.patch deleted file mode 100644 index cc6b3d35b32..00000000000 --- a/srcpkgs/mozjs38/patches/js-version.patch +++ /dev/null @@ -1,65 +0,0 @@ -# HG changeset patch -# Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a -Add major version to shell and js-config filenames. -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2014-10-29 - ---- -diff --git a/js/src/configure b/js/src/configure ---- a/js/src/configure -+++ b/js/src/configure -@@ -1696,8 +1696,13 @@ - MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` - IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` - -+if test -n "$JS_STANDALONE"; then -+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -+else - JS_SHELL_NAME=js - JS_CONFIG_NAME=js-config -+fi - - - if test -n "$IS_ALPHA"; then - -diff --git a/js/src/configure.in b/js/src/configure.in ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI - MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` - IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` - --dnl XXX in a temporary bid to avoid developer anger at renaming files --dnl XXX before "js" symlinks exist, don't change names. --dnl --dnl if test -n "$JS_STANDALONE"; then --dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION --dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config --dnl else -+if test -n "$JS_STANDALONE"; then -+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -+else - JS_SHELL_NAME=js - JS_CONFIG_NAME=js-config --dnl fi -+fi - - changequote([,]) - if test -n "$IS_ALPHA"; then - -diff -r 80a9e64d75f5 js/src/Makefile.in ---- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200 -+++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200 -@@ -273,6 +273,9 @@ - SCRIPTS = $(JS_CONFIG_NAME) - SDK_BINARY = $(JS_CONFIG_NAME) - -+$(JS_CONFIG_NAME): js-config -+ cp $^ $@ -+ - $(LIBRARY_NAME).pc: js.pc - cp $^ $@ - diff --git a/srcpkgs/mozjs38/patches/pkg-config-version.patch b/srcpkgs/mozjs38/patches/pkg-config-version.patch deleted file mode 100644 index 34a43d1f6df..00000000000 --- a/srcpkgs/mozjs38/patches/pkg-config-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add major version to pkg-config filename. -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2015-05-04 - -Index: b/js/src/Makefile.in -=================================================================== ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -214,10 +214,10 @@ - $(JS_CONFIG_NAME): js-config - cp $^ $@ - --$(LIBRARY_NAME).pc: js.pc -+$(JS_LIBRARY_NAME).pc: js.pc - cp $^ $@ - --install:: $(LIBRARY_NAME).pc -+install:: $(JS_LIBRARY_NAME).pc - $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig - - install:: js-config.h diff --git a/srcpkgs/mozjs38/template b/srcpkgs/mozjs38/template deleted file mode 100644 index 86caed33a30..00000000000 --- a/srcpkgs/mozjs38/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'mozjs38' -pkgname=mozjs38 -version=38.8.0 -revision=6 -wrksrc="mozilla-esr${version%.*.*}" -build_wrksrc="js/src" -build_style=gnu-configure -hostmakedepends="perl python pkg-config" -makedepends="icu-devel libffi-devel nspr-devel zlib-devel" -short_desc="Mozilla JavaScript interpreter and library (38.x series)" -homepage="http://www.mozilla.org/js/" -license="MPL-1.1, GPL-2, LGPL-2.1" -maintainer="Juan RP " -distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2" -checksum=9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982 -patch_args="-Np1" -shlib_provides="libmozjs-38.so" - -# Flags for gcc6.3 conceived by Arch Linux developers -CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl -LDFLAGS="-fuse-ld=bfd" - -do_configure() { - local _args - - if [ "$CROSS_BUILD" ]; then - export HOST_CFLAGS="-Os" - export HOST_CXXFLAGS="-Os" - _args+=" --target=$XBPS_CROSS_TRIPLET" - fi - - SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --enable-threadsafe --enable-system-ffi --with-system-zlib \ - --with-system-icu --with-system-nspr ${_args} -} - -mozjs38-devel_package() { - depends="nspr-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/js38-config - vmove usr/include - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/mozjs38/update b/srcpkgs/mozjs38/update deleted file mode 100644 index a1c3f7e43b0..00000000000 --- a/srcpkgs/mozjs38/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="mozjs" diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template index 68630ee5860..54d19c77ee2 100644 --- a/srcpkgs/mozo/template +++ b/srcpkgs/mozo/template @@ -1,7 +1,7 @@ # Template file for 'mozo' pkgname=mozo -version=1.20.0 -revision=2 +version=1.20.1 +revision=1 noarch=yes nocross=yes build_style=gnu-configure @@ -14,4 +14,4 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mozo-${version}.tar.xz" -checksum=ef20df929fa89e33e818be5038cb222ed5022165a751435a53d2ddabda560884 +checksum=377b7fb55c66f3b57593cb800ba997d437f8c8b59a4d402953221634f0e2339b diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index da6266ce496..e30f8fcc83e 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.20.20 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins --enable-soundcloud --enable-pipe-output --disable-twolame-encoder diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template index d9a353199d2..f5fcdd2f139 100644 --- a/srcpkgs/muffin/template +++ b/srcpkgs/muffin/template @@ -1,22 +1,21 @@ # Template file for 'muffin' pkgname=muffin -version=3.6.0 +version=3.8.2 revision=1 short_desc="Cinnamon window manager based on Mutter" build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc --enable-compile-warnings=minimum ac_cv_path_ZENITY=/usr/bin/zenity" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel intltool glib-devel gnome-doc-utils gtk-doc gdk-pixbuf-devel - gnome-doc-utils" -makedepends="clutter-devel startup-notification-devel libcanberra-devel - cinnamon-desktop-devel libXinerama-devel libSM-devel gnome-doc-utils" -depends="dconf zenity" +hostmakedepends="automake gdk-pixbuf-devel gettext-devel glib-devel + gnome-doc-utils gobject-introspection gtk-doc intltool pkg-config" +makedepends="cinnamon-desktop-devel clutter-devel gnome-doc-utils libSM-devel + libcanberra-devel startup-notification-devel" +depends="zenity" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=b343b6bf86d83dad01dcfb12d224c7eb2d4b63e1fbbe8beb3240a618ffecf737 +checksum=b567c96022698f6fdc81118e5ffa5f14d4c95fd20c4ad228eee8c0d1b8cbc902 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template index c366f8e08d9..8fe48b0181d 100644 --- a/srcpkgs/musescore/template +++ b/srcpkgs/musescore/template @@ -1,22 +1,27 @@ # Template file for 'musescore' pkgname=musescore -version=2.1.0 +version=2.2.1 revision=1 wrksrc="MuseScore-${version}" build_style=gnu-makefile make_build_target="PREFIX=/usr release" make_install_target="-C build.release install" hostmakedepends="cmake pkg-config" -makedepends=" - qt5-script-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel - qt5-xmlpatterns-devel qt5-declarative-devel qt5-plugin-mysql - qt5-plugin-pgsql qt5-plugin-odbc qt5-plugin-sqlite qt5-plugin-tds - pulseaudio-devel portaudio-devel alsa-lib-devel lame-devel jack-devel - libsndfile-devel" +makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel + portmidi-devel pulseaudio-devel qt5-declarative-devel qt5-script-devel + qt5-svg-devel qt5-tools-devel qt5-webkit-devel qt5-xmlpatterns-devel + qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite + qt5-plugin-tds" depends="qt5-plugin-sqlite" short_desc="Create, play and print beautiful sheet music" maintainer="Brian Olsen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://musescore.org/" distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz" -checksum=0581b8dd4e9bef51f863baf5b7f03b518f9784c79c0d92d6f0e33b180dd63c47 +checksum=261a39e34ee314780f75259ec2971acf69b5f4a2e0b2eb190acdb7fbbd4a89d6 + +nocross="genManual: cannot execute binary file: Exec format error" + +pre_configure() { + sed -i -e "s/-lporttime//" mscore/CMakeLists.txt +} diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 7f5d1b616d8..a79c38ff576 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,7 +1,7 @@ # Template file for 'mutt' pkgname=mutt -version=1.9.5 -revision=2 +version=1.10.0 +revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl --enable-sidebar @@ -11,14 +11,14 @@ hostmakedepends="libidn-devel perl pkg-config" makedepends="gdbm-devel gpgme-devel libidn-devel libressl-devel libsasl-devel ncurses-devel" depends="mime-types" -conf_files="/etc/$pkgname/Muttrc" +conf_files="/etc/${pkgname}/Muttrc" short_desc="The Mutt Mail Client" maintainer="Jan S. " license="GPL-2.0-or-later" -# changelog="http://www.mutt.org/doc/PGP-Notes.txt" homepage="http://www.mutt.org" +changelog="http://mutt.org/relnotes/1.10" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=bf617e64ae4e08a998bef8e42a965a211587e051f1437a3a4884b351a9385753 +checksum=0215b5f90ef9cc33441a6ca842379b64412ed7f8da83ed68bfaa319179f5535b provides="mutt-0_1" # Begin alternatives: diff --git a/srcpkgs/myrddin/template b/srcpkgs/myrddin/template index 76e99872e22..97c3c7b7ef3 100644 --- a/srcpkgs/myrddin/template +++ b/srcpkgs/myrddin/template @@ -1,18 +1,19 @@ # Template file for 'myrddin' pkgname=myrddin -version=0.2.2 +version=0.3.0 revision=1 wrksrc=mc only_for_archs="x86_64 x86_64-musl" build_style=configure configure_args="--prefix=/usr" +make_build_target="bootstrap" hostmakedepends="bison" short_desc="Myrddin systems programming language compiler and tools" maintainer="Duncaen " license="MIT" homepage="https://myrlang.org/" distfiles="https://myrlang.org/releases/myrddin-${version}.tar.xz" -checksum=b6692384c2863e9832f5966e7f6ce8d791fcbdcda50b68e3fb5fd29925baf6eb +checksum=e740265ba03968be4a5bc3d091b412565e27258c561cd68473d97d40a5d8d596 post_install() { vlicense LICENSE diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index e5d39acb778..6f69010fdde 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -15,14 +15,15 @@ checksum=0a973d0bed8142a0733ef11ca10e4a40dee5fd6c311e77160e4e8dc47a4d1967 configure_args="--with-incompatible-bdb --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" case "${XBPS_TARGET_MACHINE}" in - armv6*) - broken="https://build.voidlinux.eu/builders/armv6l_builder/builds/8244/steps/shell_3/logs/stdio" ;; - *-musl) - broken="https://travis-ci.org/voidlinux/void-packages/builds/184320677" ;; + armv[56]*) + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" + ;; esac pre_configure() { ./autogen.sh + sed -i src/compat.h -e "s;;;" } post_install() { diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index 0aebeb132e7..eaf3a5eebac 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -1,19 +1,16 @@ # Template file for 'nano' pkgname=nano -version=2.9.7 +version=2.9.8 revision=1 build_style=gnu-configure +configure_args="--enable-utf8" makedepends="file-devel ncurses-devel" short_desc="The GNU nano text editor" 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=b64ab017305b1777e97b5b9b07b31db8aeebfc3e8719f61e8da1cf3866d344bd - -case "$XBPS_TARGET_MACHINE" in - *-musl) CFLAGS="-DREG_STARTEND=0";; -esac +checksum=c2deac31ba4d3fd27a42fafcc47ccf499296cc69a422bbecab63f2933ea85488 post_install() { vsconf syntax/nanorc.nanorc diff --git a/srcpkgs/ndctl/patches/fix-musl.patch b/srcpkgs/ndctl/patches/fix-musl.patch new file mode 100644 index 00000000000..cf0621ff66f --- /dev/null +++ b/srcpkgs/ndctl/patches/fix-musl.patch @@ -0,0 +1,15 @@ +Source: maxice8 +Upstream: soon +Reason: Fixes compilation on musl libc by defining missing ssize_t + +--- util/strbuf.h ++++ util/strbuf.h +@@ -17,6 +17,7 @@ + #define __NDCTL_STRBUF_H + #include + #include ++#include /* for ssize_t */ + + /* + * Strbuf's can be use in many ways: as a byte array, or to store arbitrary + diff --git a/srcpkgs/ndctl/template b/srcpkgs/ndctl/template new file mode 100644 index 00000000000..506eaa731e7 --- /dev/null +++ b/srcpkgs/ndctl/template @@ -0,0 +1,51 @@ +# Template file for 'ndctl' +pkgname=ndctl +version=61.1 +revision=1 +build_style=gnu-configure +hostmakedepends="asciidoc automake libtool pkg-config xmlto" +makedepends="eudev-libudev-devel json-c-devel libkmod-devel libuuid-devel" +short_desc="Utility library for managing libnvdimm" +maintainer="maxice8 " +license="LGPL-2.1-only, GPL-2.0-only" +homepage="https://github.com/pmem/ndctl" +distfiles="https://github.com/pmem/ndctl/archive/v${version}.tar.gz" +checksum=815a06600a233326b898504262c359cb7c1282b1f11c011a558bf5f26b8b28be + +pre_configure() { + ./autogen.sh +} + +libndctl_package() { + short_desc+=" - ndctl library" + pkg_install() { + vmove "usr/lib/libndctl.so.*" + } +} + +libdaxctl_package() { + short_desc+=" - daxctl library" + pkg_install() { + vmove "usr/lib/libdaxctl.so.*" + } +} + +libndctl-devel_package() { + depends="libndctl-${version}_${revision}" + short_desc+=" - ndctl development files" + pkg_install() { + vmove usr/include/ndctl + vmove usr/lib/pkgconfig/libndctl.pc + vmove usr/lib/libndctl.so + } +} + +libdaxctl-devel_package() { + depends="libdaxctl-${version}_${revision}" + short_desc+=" - daxctl development files" + pkg_install() { + vmove usr/include/daxctl + vmove usr/lib/pkgconfig/libdaxctl.pc + vmove usr/lib/libdaxctl.so + } +} diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template index 2b41ed18005..861888280ba 100644 --- a/srcpkgs/nemo/template +++ b/srcpkgs/nemo/template @@ -1,37 +1,36 @@ # Template file for 'nemo' pkgname=nemo -version=3.6.5 +version=3.8.3 revision=1 short_desc="The Cinnamon file manager (nautilus fork)" -build_style=gnu-configure +build_style=meson pycompile_dirs="/usr/share/nemo/actions/myaction.py" -configure_args=" --disable-static --disable-update-mimedb - --disable-gtk-doc-html --disable-schemas-compile --disable-selinux" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool xmlto docbook-xml gtk-doc gir-freedesktop - python-polib python-gobject" -makedepends="libexif-devel gvfs-devel dconf-devel exempi-devel tracker-devel - cinnamon-desktop-devel libnotify-devel libxml2-devel xapps-devel" -depends="gvfs dconf cinnamon-translations desktop-file-utils hicolor-icon-theme" +hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection + intltool pkg-config" +makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel + libexif-devel libnotify-devel tracker-devel xapps-devel" +depends="cinnamon-translations dconf gvfs" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=88df121685cb7bf0464a3ef41cf3734768903e832839cc4fe103c0b53ae187d5 +checksum=6111819d07a4d482ef71a5659ce09db0502026c5fc9653d3577b58d57540f049 +nocross="gobject-introspection" build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" fi +do_check() { + : + # requires a display + # Gtk-WARNING **: 18:34:08.533: cannot open display: +} + pre_configure() { - # Fix build - sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.ac - # Rename 'Files' app name to avoid having the same as nautilus - sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in - - NOCONFIGURE=1 ./autogen.sh + sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in } libnemo_package() { diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template index 15543bd8cea..43a15914fec 100644 --- a/srcpkgs/neofetch/template +++ b/srcpkgs/neofetch/template @@ -1,6 +1,6 @@ # Template file for 'neofetch' pkgname=neofetch -version=4.0.2 +version=5.0.0 revision=1 noarch=yes build_style=gnu-makefile @@ -9,8 +9,9 @@ short_desc="Simple system information script" maintainer="Muhammad Herdiansyah " license="MIT" homepage="https://github.com/dylanaraps/neofetch" +changelog="https://raw.githubusercontent.com/dylanaraps/neofetch/master/CHANGELOG.md" distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=3cd4db97d732dd91424b357166d38edccec236c21612b392318b48a3ffa29004 +checksum=2a4f4853bf83b88a037994dbc53a90c8bd5708f5eeb3392f56d4e49c49d995b3 post_install() { vlicense LICENSE.md diff --git a/srcpkgs/neovim-remote/template b/srcpkgs/neovim-remote/template index e4183369cc6..43cb23d1751 100644 --- a/srcpkgs/neovim-remote/template +++ b/srcpkgs/neovim-remote/template @@ -1,7 +1,8 @@ # Template file for 'neovim-remote' pkgname=neovim-remote -version=2.0.4 +version=2.0.10 revision=1 +noarch=yes build_style=python3-module pycompile_module="nvr" hostmakedepends="python3-setuptools" @@ -12,8 +13,7 @@ maintainer="dleeram " license="MIT" homepage="https://github.com/mhinz/neovim-remote" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=6c97c501cb21fc96b2881e80c7e2754d300098736c712e3ebb53147c2e10c05e -noarch=yes +checksum=07710d2a9da08962d5b0d0946f376aaf691e3329356a2a2221c29af2921ae464 do_check() { python3 -m pytest diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index 14adc33157c..54ca9290d54 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,7 +1,7 @@ # Template file for 'neovim' pkgname=neovim -version=0.2.2 -revision=2 +version=0.3.0 +revision=1 build_style=cmake configure_args="-DENABLE_JEMALLOC=0 -DUSE_BUNDLED_LIBTERMKEY=OFF" hostmakedepends="pkg-config gperf LuaJIT-devel lua51-lpeg lua51-mpack" @@ -11,7 +11,7 @@ maintainer="Steve Prybylski " license="Apache-2.0, GPL-2" homepage="http://neovim.io" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" -checksum=a838ee07cc9a2ef8ade1b31a2a4f2d5e9339e244ade68e64556c1f4b40ccc5ed +checksum=f7acb61b16d3f521907d99c486b7a9f1e505e8b2a18c9ef69a6d7f18f29f74b8 do_check() { # requires downloading stuff from the outside and also adds the following deps diff --git a/srcpkgs/nestopia/template b/srcpkgs/nestopia/template index 18c73821448..236bd372ecd 100644 --- a/srcpkgs/nestopia/template +++ b/srcpkgs/nestopia/template @@ -1,15 +1,18 @@ # Template file for 'nestopia' pkgname=nestopia -version=1.48 +version=1.49 revision=1 -wrksrc="rdanbrook-nestopia-f0540f9" -build_style=cmake -hostmakedepends="pkg-config" -makedepends="SDL2-devel gtk+3-devel glu-devel libarchive-devel libao-devel" -depends="desktop-file-utils" -short_desc="NES/Famicom emulator designed to emulate the NES hardware accurately" +build_style=gnu-configure +hostmakedepends="autoconf-archive automake pkg-config" +makedepends="SDL2-devel gtk+3-devel libao-devel libarchive-devel" +depends="desktop-file-utils hicolor-icon-theme" +short_desc="Portable NES/Famicom emulator written in C++" maintainer="Juan RP " -license="GPL-2" -homepage="http://nestopia.sourceforge.net/" -distfiles="https://github.com/rdanbrook/nestopia/tarball/${version}>${pkgname}-${version}.tar.gz" -checksum=ee14b9476748669ac1af73116beb2a6e3dd6b41c0b1d2f7149fb8716bb02d749 +license="GPL-2.0-only" +homepage="http://0ldsk00l.ca/nestopia/" +distfiles="https://github.com/0ldsk00l/nestopia/archive/${version}.tar.gz" +checksum=c5a8b5e74a904c4e624152f8dfa081bdd7991796a24439811fc518564aa04b55 + +pre_configure() { + autoreconf -vif +} diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template index d2a01f34eff..ca016f60464 100644 --- a/srcpkgs/netbsd-wtf/template +++ b/srcpkgs/netbsd-wtf/template @@ -1,19 +1,16 @@ # Template file for 'netbsd-wtf' pkgname=netbsd-wtf -reverts=20150223_1 -version=20131125 +version=20180621 revision=1 -_commit=678eae8b35998045af4b99bc8b10f3e7cd9cc826 +_commit=b1e5be48e340146f63b174cc14fef892a783168b noarch=yes build_style=gnu-makefile -make_build_args="DATADIR=/usr/share" -make_install_args="PREFIX=/usr DATADIR=/usr/share" short_desc="The NetBSD's wtf(6) utility" maintainer="Juan RP " license="Public domain" -homepage="http://www.NetBSD.org" -distfiles="https://github.com/voidlinux/netbsd-wtf/archive/$_commit.tar.gz" -checksum=2283a4c9e73993daa6a3b4a598ec704196e1ee9914f1e36e95241ecd5c6c6508 +homepage="https://www.netbsd.org" +distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz" +checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7 wrksrc="$pkgname-$_commit" diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 08f51e2f1f9..ae4d54c3b07 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,10 +1,10 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.82.01 +version=10.82.03 revision=1 -_githash=41940d88c082a27d5b52d584fc044d6fa832aabd -_githash_guide=42098725cc6d9484c2d8b5c0427f38754c0a17c8 +_githash=3be1029c5d1e62ae6f243e62d0853ca3f17ba0da +_githash_guide=a615465999de69b20b7d4b2981477a90b6cc3db3 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="pkg-config perl python flex" @@ -17,8 +17,8 @@ homepage="http://netpbm.sourceforge.net/" nocross=yes distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="ae0228bf864221a749c5878e0cb0b5fa7814015c641ac61ac9905070834900c1 - b2f1a0d9f622c37e98fafbed69f42b7a497938eb0164f37a001a5e54051160b6" +checksum="c1825ec9942b16e21b0cb0e0c2f576287fa16da20a891f1f3c33ce64bd7e1d1a + 9060b6af454fddfa53379177600f68040b2ce83995e1ab4d58e70158bf1efdd5" post_extract() { cd $build_wrksrc diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template index a7258ee602a..f37a51bb0a6 100644 --- a/srcpkgs/newsboat/template +++ b/srcpkgs/newsboat/template @@ -1,6 +1,6 @@ # Template file for 'newsboat' pkgname=newsboat -version=r2.11.1 +version=r2.12 revision=1 build_style=configure configure_script="./config.sh" @@ -11,9 +11,10 @@ makedepends="json-c-devel libcurl-devel libxml2-devel sqlite-devel stfl-devel" short_desc="Newsboat is a fork of Newsbeuter the Mutt of RSS feed readers" maintainer="maxice8 " license="MIT" -homepage="http://www.newsboat.org" +homepage="https://www.newsboat.org" +changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md" distfiles="https://github.com/newsboat/newsboat/archive/${version}.tar.gz" -checksum=0c48ec60e1abafd7b62cf8e376eff9e92dcb7bbc6e7dfed9b9ac141853d826d8 +checksum=8f2f511703d3218ab195fa48dc94306f5e13ceff86d94dcf78d917cb57090c88 make_build_target="all doc" CXXFLAGS=" -Wno-error=sign-compare" @@ -38,5 +39,4 @@ post_install() { vlicense LICENSE vsconf doc/example-bookmark-plugin.sh bookmark-plugin.sh mv "${DESTDIR}/usr/share/doc/$pkgname/examples/config" "${DESTDIR}/usr/share/examples/${pkgname}" - } diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template index 843202c4edf..6ad9c2b38f1 100644 --- a/srcpkgs/nfdump/template +++ b/srcpkgs/nfdump/template @@ -1,17 +1,21 @@ # Template file for 'nfdump' pkgname=nfdump -version=1.6.16 -revision=2 +version=1.6.17 +revision=1 build_style=gnu-configure configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd" -hostmakedepends="flex" -makedepends="libpcap-devel bzip2-devel" +hostmakedepends="automake flex libtool pkg-config" +makedepends="bzip2-devel libpcap-devel" short_desc="A toolset in order to collect and process netflow and sflow data" maintainer="Andrew Benson " -license="BSD" +license="BSD-3-Clause" homepage="https://github.com/phaag/nfdump" distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz" -checksum=b18479215c51a98fbdf973ef548464780e7a9d9f7fe73e4fab9ab7ec8a3bdc8f +checksum=f71c2c57bdcd0731b2cfecf6d45f9bf57fc7c946858644caf829f738c67c393d + +pre_configure() { + autoreconf -fi +} post_install() { vlicense LICENSE diff --git a/srcpkgs/ngspice/template b/srcpkgs/ngspice/template index 3f9bb21b426..9ab99871721 100644 --- a/srcpkgs/ngspice/template +++ b/srcpkgs/ngspice/template @@ -1,7 +1,7 @@ # Template file for 'ngspice' pkgname=ngspice -version=27 -revision=2 +version=28 +revision=1 build_style=gnu-configure configure_args="--with-readline=yes --with-ngshared --enable-xspice --enable-cider" hostmakedepends="bison byacc" @@ -11,7 +11,7 @@ maintainer="Toyam Cox " license="LGPL-2.1" homepage="http://ngspice.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz" -checksum=0c08c7d57a2e21cf164496f3237f66f139e0c78e38345fbe295217afaf150695 +checksum=94804fa78c8db2f90f088902e8c27f7b732a66767a58c70f37612bff5a16df66 nocross="https://travis-ci.org/Vaelatern/void-packages/jobs/207472663 but really should be possible with clearing CFLAGS for that binary" case "$XBPS_TARGET_MACHINE" in @@ -23,6 +23,7 @@ ngspice-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index 6b4dd1884f1..15d1ca75e56 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,16 +1,19 @@ # Template file for 'nheko' pkgname=nheko -version=0.4.2 +version=0.4.3 revision=1 build_style=cmake +configure_args="-DTWEENY_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/tweeny + -DCMAKE_SKIP_RPATH=TRUE" hostmakedepends="git qt5-host-tools qt5-qmake" -makedepends="lmdb-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel" +makedepends="lmdb-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel + tweeny" short_desc="Desktop client for the Matrix protocol" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/mujx/nheko" distfiles="https://github.com/mujx/nheko/archive/v${version}.tar.gz" -checksum=8a66fb40d75d08dabe61246e89bfb6be9aaee66a96bc9439876de8bfd48fb78f +checksum=17f2313a505eece0fb10da4b4c8aa604bf22791866ef908a2d56084126faf7cd pre_configure() { sed -i 's/Werror/Wno-error/g' cmake/CompilerFlags.cmake diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template index f8b5bbd6ad4..38d0384e14b 100644 --- a/srcpkgs/nim/template +++ b/srcpkgs/nim/template @@ -1,7 +1,7 @@ # Template file for 'nim' pkgname=nim version=0.18.0 -revision=1 +revision=2 _cversion=0.18.0 _nimbleversion=0.8.10 depends="gcc" @@ -9,7 +9,7 @@ hostmakedepends="ed" short_desc="The Nim programming language" maintainer="allan " license="MIT" -homepage="http://nim-lang.org/" +homepage="https://nim-lang.org/" distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz https://github.com/nim-lang/csources/archive/v${_cversion}.tar.gz>csources-${_cversion}.tar.gz https://github.com/nim-lang/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz" @@ -31,7 +31,7 @@ do_build() { cd .. ed lib/wrappers/openssl.nim <<-EDIT - ,s/versions = "(/versions = "(|.43|.41/ + ,s/versions = "(/versions = "(.45|/ w q EDIT diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template index 3e94a4044c7..602288a39a2 100644 --- a/srcpkgs/nnn/template +++ b/srcpkgs/nnn/template @@ -1,16 +1,17 @@ # Template file for 'nnn' pkgname=nnn -version=1.7 -revision=2 +version=1.8 +revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="readline-devel" short_desc="The missing terminal file browser for X" maintainer="Dennis Kraus " license="BSD-2-Clause" +changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG" homepage="https://github.com/jarun/nnn" distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz" -checksum=fbe26efbed8b467352f313b92f8617d873c8cf0209fb6377572cf8d1ddc2747c +checksum=65c364a9797178e40ec7ec653b2cfa8e211e556b75250bf72eb5eea57f5e0cdc post_install() { vlicense LICENSE diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template index 109bdf1b224..cda626fb608 100644 --- a/srcpkgs/nodejs-lts/template +++ b/srcpkgs/nodejs-lts/template @@ -1,7 +1,7 @@ # Template file for 'nodejs-lts' pkgname=nodejs-lts -version=8.9.4 -revision=2 +version=8.11.3 +revision=1 wrksrc=node-v${version} hostmakedepends="pkg-config python $(vopt_if icu icu)" makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) @@ -12,7 +12,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=729b44b32b2f82ecd5befac4f7518de0c4e3add34e8fe878f745740a66cbbc01 +checksum=0d7e795c0579226c8b197353bbb9392cae802f4fefa4787a2c0e678beaf85cce build_options="ssl libuv http_parser icu" desc_option_libuv="Enable shared libuv" diff --git a/srcpkgs/notepadqq/files/notepadqq b/srcpkgs/notepadqq/files/notepadqq new file mode 100644 index 00000000000..3831e5a8ff9 --- /dev/null +++ b/srcpkgs/notepadqq/files/notepadqq @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/lib/notepadqq/notepadqq-bin "$@" diff --git a/srcpkgs/notepadqq/patches/disable-stats.patch b/srcpkgs/notepadqq/patches/disable-stats.patch new file mode 100644 index 00000000000..505b1d54fe6 --- /dev/null +++ b/srcpkgs/notepadqq/patches/disable-stats.patch @@ -0,0 +1,11 @@ +# disable collection of system statics +--- src/ui/stats.cpp ++++ src/ui/stats.cpp +@@ -19,6 +19,7 @@ + + void Stats::init() + { ++ return; // statistics collection disabled by Void Linux + NqqSettings &settings = NqqSettings::getInstance(); + + Stats::askUserPermission(); diff --git a/srcpkgs/notepadqq/template b/srcpkgs/notepadqq/template index 05d9fe6efc8..40f82f5b135 100644 --- a/srcpkgs/notepadqq/template +++ b/srcpkgs/notepadqq/template @@ -1,6 +1,6 @@ # Template file for 'notepadqq' pkgname=notepadqq -version=1.3.6 +version=1.4.0 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-tools" @@ -9,15 +9,17 @@ depends="desktop-file-utils hicolor-icon-theme" maintainer="Orphaned " short_desc="Text editor for developers" homepage="https://notepadqq.com" -license="GPL-3" +license="GPL-3.0-or-later" distfiles="https://github.com/notepadqq/notepadqq/archive/v${version}.tar.gz" -checksum=a2c6b97fe1943c9548eb9cdebac046c192f5b2f71007a8e7d858e124b38ca38f - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://github.com/voidlinux/void-packages/issues/9481" ;; -esac +checksum=f295353224848c06fafcc71c7f6a38780a98890075ab33f0179181ebf21bad08 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-svg-devel qt5-webkit-devel" fi +post_install() { + # no need for upstream's weird magic, leads to segfaults anyway + rm "${DESTDIR}/usr/bin/notepadqq" + # use our simple start scipt + vbin ${FILESDIR}/notepadqq +} diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template index db97a2c3a75..308aa6d1898 100644 --- a/srcpkgs/nqp/template +++ b/srcpkgs/nqp/template @@ -1,6 +1,6 @@ -# Template build file for 'nqp'. +# Template file for 'nqp' pkgname=nqp -version=2018.04.1 +version=2018.06 revision=1 build_style=configure configure_script="perl Configure.pl" @@ -13,6 +13,6 @@ maintainer="Ruslan " license="Artistic-2.0" homepage="https://github.com/perl6/nqp" distfiles="https://github.com/perl6/nqp/archive/${version}.tar.gz" -checksum=19ed3ea5a5884a41ec04aad5e642e12415d298398d27099d4ff3c8a40f97f945 +checksum=f2c50bef725eddd232f6080c3bb78c6c60751b22300eb6fbfe71a15876f8c4f5 nocross=yes -make_check_target="test" +make_check_target=test diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 6845ee1e42c..cd0bdab0bcb 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,6 +1,6 @@ # Template file for 'nsjail' pkgname=nsjail -version=2.6 +version=2.7 revision=2 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf-devel" @@ -9,17 +9,17 @@ short_desc="A light-weight process isolation tool" maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://nsjail.com" -distfiles=" - https://github.com/google/nsjail/archive/${version}.tar.gz - https://github.com/google/kafel/archive/9a8568c8f91a91d93893a61a48665dc329e075f1.tar.gz -" -checksum=" - 866c181266e33f94e22e1bba72c04883d8bd5694929b19d8aa183a72acc8519b - 6fc048e72499fd0bc0414e4ab9c32fabefc04a2a36a8af46799557aa3150d1dd -" +distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz +https://github.com/google/kafel/archive/409ccb2113e1f82f497d1dcfb5ae18376ff7056c.tar.gz" +checksum="28afa89c7dbed94528408e4f11d724622d24ea582739b254fa2a739320e87481 +bfebebaf501f9dbd0d0c374797d3c07ee0dd3537b5a6bc70e80408f081d051fe" only_for_archs="aarch64 aarch64-musl armv5tel armv5tel-musl armv6l armv6l-musl armv7l armv7l-musl x86_64 x86_64-musl" +case "$XBPS_TARGET_MACHINE" in + armv[67]*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/9674/steps/shell_3/logs/stdio";; +esac + post_extract() { rmdir kafel ln -s ../kafel-* kafel diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template index 9f99ac3a651..509e7fdf9c6 100644 --- a/srcpkgs/numactl/template +++ b/srcpkgs/numactl/template @@ -1,15 +1,15 @@ # Template file for 'numactl' pkgname=numactl -version=2.0.11 +version=2.0.12 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" short_desc="Simple NUMA policy support" maintainer="Juan RP " -license="LGPL-2.1" +license="LGPL-2.1-only" homepage="https://github.com/numactl/numactl" distfiles="https://github.com/numactl/numactl/archive/v${version}.tar.gz" -checksum=3e099a59b2c527bcdbddd34e1952ca87462d2cef4c93da9b0bc03f02903f7089 +checksum=7c3e819c2bdeb883de68bafe88776a01356f7ef565e75ba866c4b49a087c6bdf only_for_archs="i686 i686-musl x86_64 x86_64-musl" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then @@ -30,13 +30,15 @@ libnuma_package() { vmove "usr/lib/*.so.*" } } + libnuma-devel_package() { depends="libnuma>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/share/man/man3 + vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/obconf-qt/template b/srcpkgs/obconf-qt/template index 065361aefb4..453f1b96297 100644 --- a/srcpkgs/obconf-qt/template +++ b/srcpkgs/obconf-qt/template @@ -1,15 +1,15 @@ # Template file for 'obconf-qt' pkgname=obconf-qt -version=0.12.0 +version=0.13.0 revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools-devel" -makedepends="lxqt-build-tools qt5-x11extras-devel qt5-tools-devel liblxqt-devel openbox-devel" -depends="desktop-file-utils hicolor-icon-theme qt5-x11extras gtk-update-icon-cache" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="qt5-x11extras-devel qt5-tools-devel openbox-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="LXQt Openbox configuration tool" maintainer="Juan RP " -license="GPL-2" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/obconf-qt/releases/download/${version}/obconf-qt-${version}.tar.xz" -checksum=040105d8129c21ad058b762036de46ddacbee4ab7beb60db5af530fc0a37b964 +license="GPL-2.0-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/obconf-qt/releases/download/${version}/obconf-qt-${version}.tar.xz" +checksum=cec24a319ad87c6c04459c66ad9d14f0ce9d6b0cad6eb5584376b72a6eb07fb9 diff --git a/srcpkgs/octave/patches/01-qscintilla.patch b/srcpkgs/octave/patches/01-qscintilla.patch deleted file mode 100644 index 68c992affcf..00000000000 --- a/srcpkgs/octave/patches/01-qscintilla.patch +++ /dev/null @@ -1,14 +0,0 @@ -# reason: configure looks for the wrong filename -# note: should be fixed in the next release - ---- configure -+++ configure -@@ -34697,7 +34697,7 @@ - case "$qt_version" in - 4) - QT_MODULES="QtCore QtGui QtNetwork QtOpenGL" -- octave_qscintilla_libnames=qscintilla2 -+ octave_qscintilla_libnames=qscintilla2 qscintilla_qt5 - ;; - 5) - QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template index 3e54a681cff..3acde0d86f6 100644 --- a/srcpkgs/octave/template +++ b/srcpkgs/octave/template @@ -1,7 +1,7 @@ # Template file for 'octave' pkgname=octave -version=4.2.2 -revision=2 +version=4.4.0 +revision=1 build_style=gnu-configure configure_args=" --with-blas=openblas --with-lapack=openblas $(vopt_if largearrays --enable-64)" @@ -10,10 +10,10 @@ makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel lcms2-devel glpk-devel" short_desc="High-level language, primarily intended for numerical computations" maintainer="Diogo Leal " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://gnu.org/software/octave/" distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz" -checksum=77b84395d8e7728a1ab223058fe5e92dc38c03bc13f7358e6533aab36f76726e +checksum=72f846379fcec7e813d46adcbacd069d72c4f4d8f6003bcd92c3513aafcd6e96 # Package build options # TODO: some options are still missing, such as @@ -69,7 +69,7 @@ makedepends+=" $(vopt_if curl libcurl-devel) $(vopt_if fftw3 fftw-devel) $(vopt_if graphicsmagick libgraphicsmagick-devel) - $(vopt_if gui 'qt5-devel qscintilla-qt5-devel') + $(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel') $(vopt_if hdf5 hdf5-devel) $(vopt_if imagemagick libmagick-devel) $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel") diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template index 9708d8dba1b..4c7bda26e5b 100644 --- a/srcpkgs/offlineimap/template +++ b/srcpkgs/offlineimap/template @@ -1,6 +1,6 @@ # Template file for 'offlineimap' pkgname=offlineimap -version=7.2.0 +version=7.2.1 revision=1 noarch=yes build_style=python2-module @@ -11,8 +11,9 @@ short_desc="Powerful IMAP/Maildir synchronization and reader support" maintainer="Juan RP " license="GPL-2.0-or-later" homepage="http://offlineimap.org/" +changelog="https://raw.githubusercontent.com/OfflineIMAP/offlineimap/master/Changelog.md" distfiles="https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz" -checksum=b6c8c6dbd67ec7cd6228a40866b5d6143f707d78faf9603d9328c9bc43fdf7c4 +checksum=1d4164941413234cf4669ae57d27176701a7e07214fe49fa265df5c085eb4280 post_install() { make -C docs man diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template index 9c02ba1a31f..d00a724250f 100644 --- a/srcpkgs/okular/template +++ b/srcpkgs/okular/template @@ -1,6 +1,6 @@ # Template file for 'okular' pkgname=okular -version=18.04.1 +version=18.04.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2.0-only" homepage="http://kde.org/applications/graphics/okular/" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=0fa82f9a31de184966303395148dd03f627c64be2d5a2eb070bf13c5a95c0e3a +checksum=bf9e4e9ce6cc6f7fae3dfe021ea7954403c7bab77a33434974eb3efe999999c9 libokular_package() { short_desc+=" - runtime library" diff --git a/srcpkgs/olm-devel b/srcpkgs/olm-devel new file mode 120000 index 00000000000..38ebca23ad7 --- /dev/null +++ b/srcpkgs/olm-devel @@ -0,0 +1 @@ +olm \ No newline at end of file diff --git a/srcpkgs/olm-python b/srcpkgs/olm-python new file mode 120000 index 00000000000..38ebca23ad7 --- /dev/null +++ b/srcpkgs/olm-python @@ -0,0 +1 @@ +olm \ No newline at end of file diff --git a/srcpkgs/olm-python3 b/srcpkgs/olm-python3 new file mode 120000 index 00000000000..38ebca23ad7 --- /dev/null +++ b/srcpkgs/olm-python3 @@ -0,0 +1 @@ +olm \ No newline at end of file diff --git a/srcpkgs/olm/patches/python-find-olm.patch b/srcpkgs/olm/patches/python-find-olm.patch new file mode 100644 index 00000000000..a13f04fb3ad --- /dev/null +++ b/srcpkgs/olm/patches/python-find-olm.patch @@ -0,0 +1,19 @@ +--- python/olm/_base.py ++++ python/olm/_base.py +@@ -1,14 +1,13 @@ + import os.path + + from ctypes import * ++from ctypes import util + + def read_random(n): + with open("/dev/urandom", "rb") as f: + return f.read(n) + +-lib = cdll.LoadLibrary(os.path.join( +- os.path.dirname(__file__), "..", "..", "build", "libolm.so.2") +-) ++lib = cdll.LoadLibrary(util.find_library("olm")) + + lib.olm_error.argtypes = [] + lib.olm_error.restypes = c_size_t diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template new file mode 100644 index 00000000000..0aef7d179aa --- /dev/null +++ b/srcpkgs/olm/template @@ -0,0 +1,58 @@ +# Template file for 'olm' +pkgname=olm +version=2.2.2 +revision=1 +build_style=gnu-makefile +make_check_target=test +hostmakedepends="python-devel python3-devel" +makedepends="python-devel python3-devel" +short_desc="An implementation of the Double Ratchet cryptographic ratchet" +maintainer="Adam Beckmeyer " +license="Apache-2.0" +homepage="https://git.matrix.org/git/olm/about/" +distfiles="https://git.matrix.org/git/olm/snapshot/${pkgname}-${version}.tar.gz" +checksum=0c00127e6c4fcb4ec2cb3f78805a9218551b878f75441a1bc282b94c9fdd7b9a + +post_configure() { + # -O0 prevents _FORTIFY_SOURCE working + for _f in $(find ${wrksrc} -name Makefile); do + sed -i $_f -e "s; -O0;;" + done +} + +do_install() { + make DESTDIR=${DESTDIR} PREFIX=/usr install + for pysl in $py2_sitelib $py3_sitelib; do + mkdir -p ${DESTDIR}${pysl} + cp -r ${wrksrc}/python/olm ${DESTDIR}${pysl} + done +} + +olm-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + } +} + +olm-python_package() { + noarch=yes + short_desc+=" - python bindings" + depends="${sourcepkg}>=${version}_${revision} python" + pycompile_module=olm + pkg_install() { + vmove ${py2_sitelib} + } +} + +olm-python3_package() { + noarch=yes + short_desc+=" - python3 bindings" + depends="${sourcepkg}>=${version}_${revision} python3" + pycompile_module=olm + pkg_install() { + vmove ${py3_sitelib} + } +} diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch new file mode 100644 index 00000000000..ca802c1e5af --- /dev/null +++ b/srcpkgs/opencolorio/patches/disable_werror.patch @@ -0,0 +1,30 @@ +diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt +index 1eb691b..cff9bd8 100644 +--- src/core/CMakeLists.txt ++++ src/core/CMakeLists.txt +@@ -23,8 +23,6 @@ if(WIN32) + if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX") + endif() +-else() +- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror") + endif() + + # SHARED +diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt +index a90ca1c..b1f0361 100644 +--- src/pyglue/CMakeLists.txt ++++ src/pyglue/CMakeLists.txt +@@ -20,12 +20,6 @@ if(WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275") + endif() + +-# Process all warnings as errors +-# Unfortunately Windows still has a warning +-if(UNIX) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +-endif() +- + find_package(PythonLibs) + if(NOT PYTHONLIBS_FOUND) + message(FATAL "Python libraries were not found, exiting.") diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template index f27d0a611eb..a4f959783dd 100644 --- a/srcpkgs/opencolorio/template +++ b/srcpkgs/opencolorio/template @@ -1,6 +1,6 @@ # Template file for 'opencolorio' pkgname=opencolorio -version=1.0.9 +version=1.1.0 revision=1 wrksrc=OpenColorIO-${version} build_style=cmake @@ -9,14 +9,15 @@ case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) ;; *) configure_args+=" -DOCIO_USE_SSE=OFF" ;; esac -hostmakedepends="pkg-config" +hostmakedepends="pkg-config git" makedepends="tinyxml-devel lcms2-devel" short_desc="A complete color management solution" maintainer="lemmi " license="openimageio" homepage="http://opencolorio.org" +changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog" distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz" -checksum=27c81e691c15753cd2b560c2ca4bd5679a60c2350eedd43c99d44ca25d65ea7f +checksum=228589879e1f11e455a555304007748a8904057088319ebbf172d9384b93c079 post_install() { vlicense LICENSE @@ -29,6 +30,5 @@ opencolorio-devel_package() { vmove usr/lib/pkgconfig vmove usr/include vmove "usr/lib/*.so" - vmove "usr/lib/*.a" } } diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 62e521aa5ae..b859de4ebc0 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,11 +1,12 @@ # Template file for 'openimageio' pkgname=openimageio -version=1.7.18 -revision=1 +version=1.8.12 +revision=2 wrksrc=oiio-Release-${version} build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 - -DSTOP_ON_WARNING=0 -DCMAKE_SYSTEM_PROCESSOR=${XBPS_TARGET_MACHINE}" + -DSTOP_ON_WARNING=0 -DCMAKE_SYSTEM_PROCESSOR=${XBPS_TARGET_MACHINE} + -DUSE_STD_REGEX_EXITCODE=0" hostmakedepends="pkg-config" makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel @@ -14,8 +15,9 @@ short_desc="Library for reading and writing images" maintainer="lemmi " license="BSD" homepage="https://sites.google.com/site/openimageio/home" +changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md" distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz" -checksum=8ef724ebd09720bdb16d7af2df4c0fed2385d5c56d4ec56d18bb248dc1f81c1e +checksum=93e807d7c77a5c4c12598cc7932aa08239bc4198e3e31dca0998a3e0ab163386 CXXFLAGS="-faligned-new" case "$XBPS_TARGET_MACHINE" in @@ -26,8 +28,8 @@ esac pre_build() { local f # Replace -isystem with -I to avoid "#include_next " file not found - sed -i CMakeLists.txt -e "s;-isystem;-I;g" - find ${wrksrc} -type f -exec sed -i "{}" -e "s;;;g" \; + sed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g" + case "$XBPS_TARGET_MACHINE" in armv[56]*|mips*) # Add libatomic to the targets diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index db449a7b247..73110b6213f 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -1,11 +1,12 @@ # Template file for 'openvpn' pkgname=openvpn version=2.4.6 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-pkcs11 --enable-iproute2 --disable-systemd" hostmakedepends="iproute2 pkg-config" -makedepends="libressl-devel lzo-devel pam-devel pkcs11-helper-devel" +makedepends="libressl-devel lzo-devel pam-devel pkcs11-helper-devel + cmocka-devel" depends="iproute2" short_desc="An easy-to-use, robust, and highly configurable VPN" maintainer="Juan RP " diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 257651a22a2..3d10f248a2e 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=53.0.2907.68 +version=53.0.2907.99 revision=1 only_for_archs="x86_64" repository="nonfree" @@ -11,7 +11,7 @@ maintainer="Diogo Leal " license="Proprietary" homepage="https://www.opera.com/computer" distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" -checksum=f38a9f835e55c088a66f15c1b62a99d235133e905809724df77d502080efea65 +checksum=9dd7d6fe1d0f89616b15275c3fc135b1f380a2cc4d64b66a2e47ec7e0828303a do_extract() { ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}_amd64.deb diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index d1692e0db13..239bbf6c026 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,7 +1,8 @@ # Template file for 'orca' pkgname=orca -version=3.28.1 +version=3.28.2 revision=1 +noarch=yes build_style=gnu-configure hostmakedepends="intltool itstool pkg-config" makedepends="at-spi2-atk-devel liblouis-devel python-gobject-devel" @@ -12,6 +13,5 @@ short_desc="Screen reader for individuals who are blind or visually impaired" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnome.org/projects/orca" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=4f14144a722d26c6e5492298600df0161ce841bf8eae81fd2b27387e2c638512 -noarch=yes +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=188d168a135a3fad1c73ae4b51a426e0717b78ee591e2b78b6e50164a2343023 diff --git a/srcpkgs/ortp-devel b/srcpkgs/ortp-devel new file mode 120000 index 00000000000..223f1f69f13 --- /dev/null +++ b/srcpkgs/ortp-devel @@ -0,0 +1 @@ +ortp \ No newline at end of file diff --git a/srcpkgs/ortp/template b/srcpkgs/ortp/template new file mode 100644 index 00000000000..c8751b22bed --- /dev/null +++ b/srcpkgs/ortp/template @@ -0,0 +1,24 @@ +# Template file for 'ortp' +pkgname=ortp +version=1.0.2 +revision=1 +build_style=cmake +configure_args="-DENABLE_STATIC=OFF" +makedepends="bctoolbox-devel" +short_desc="Real-Time Transport Protocol (RFC 3550) library" +maintainer="maxice8 " +license="GPL-2.0-only" +homepage="https://www.linphone.org/technical-corner/ortp/overview" +distfiles="https://github.com/BelledonneCommunications/ortp/archive/${version}.tar.gz" +checksum=f8069cbb0c9679545e52d4080e07b4c2bea049f2571100332c90539490240d76 + +ortp-devel_package() { + depends="ortp-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/oRTP/cmake + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/osg/update b/srcpkgs/osg/update index 1d5b1586f6c..5b4d44bb1bf 100644 --- a/srcpkgs/osg/update +++ b/srcpkgs/osg/update @@ -1,2 +1,2 @@ -pattern='OpenSceneGraph-\K[\d]+\.([\d]+)?[02468]+\.[\d]+(-rc.*)?' +pattern='OpenSceneGraph-\K3\.4\.[\d]+(-rc.*)?' ignore="*-rc*" diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template index b36642120fc..46bc55a6932 100644 --- a/srcpkgs/osinfo-db-tools/template +++ b/srcpkgs/osinfo-db-tools/template @@ -1,13 +1,14 @@ # Template file for 'osinfo-db-tools'# pkgname=osinfo-db-tools -version=1.1.0 +version=1.2.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="glib-devel libarchive-devel libxslt-devel" short_desc="Tools for managing osinfo database" maintainer="maxice8 " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://libosinfo.org" -distfiles="https://releases.pagure.org/libosinfo/$pkgname-$version.tar.gz" -checksum=a141cd2fc07c30d84801b5dbf6b11f2c2e708b0e81216277d052ac0b57fe546b +changelog="https://gitlab.com/libosinfo/osinfo-db-tools/raw/master/NEWS" +distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.gz" +checksum=3b50829e5b58db15fe9fc8caf005aa18300262fea4562da0c2dfbe56355ff81f diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template index 140ae713505..e045444c856 100644 --- a/srcpkgs/osinfo-db/template +++ b/srcpkgs/osinfo-db/template @@ -1,15 +1,15 @@ # Template file for 'osinfo-db' pkgname=osinfo-db -version=20180416 +version=20180612 revision=1 create_wrksrc=yes hostmakedepends="osinfo-db-tools" short_desc="Osinfo database about operating systems" -maintainer="maxice8 " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://libosinfo.org" -distfiles="https://releases.pagure.org/libosinfo/$pkgname-$version.tar.xz" -checksum=0686cc2281b35c6834aa1e20a5ad36ebb64843f068c1192f203f7f9e171e5561 +distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz" +checksum=d32d3d5443ee71e3bfb6be8fb070508de01cb1ac459569564530ac70e7588b06 skip_extraction="${pkgname}-${version}.tar.xz" do_install() { diff --git a/srcpkgs/osmid/patches/musl.patch b/srcpkgs/osmid/patches/musl.patch new file mode 100644 index 00000000000..c7f247c7258 --- /dev/null +++ b/srcpkgs/osmid/patches/musl.patch @@ -0,0 +1,29 @@ +--- JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-03-27 16:52:31.000000000 +0200 ++++ JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-06-26 02:41:16.728143943 +0200 +@@ -126,9 +126,15 @@ + return result; + } + ++#if defined(__GLIBC__) + String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); } + String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); } + String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } ++#else ++String SystemStats::getUserLanguage() { return "en"; } ++String SystemStats::getUserRegion() { return "US"; } ++String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } ++#endif + + //============================================================================== + void CPUInformation::initialise() noexcept +--- external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-03-27 16:52:31.000000000 +0200 ++++ external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-06-26 02:45:39.903133450 +0200 +@@ -343,7 +343,7 @@ + return "Unkown error"; + + #elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || \ +- ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version ++ !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version + + if (strerror_r(err_num, buf, buf_size) == 0) + return std::string(buf); diff --git a/srcpkgs/osmid/template b/srcpkgs/osmid/template new file mode 100644 index 00000000000..6da7cb2b44c --- /dev/null +++ b/srcpkgs/osmid/template @@ -0,0 +1,30 @@ +# Template file for 'osmid' +pkgname=osmid +version=0.6.1 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="alsa-lib-devel libX11-devel" +short_desc="Tool to convert MIDI to OSC and OSC to MIDI" +maintainer="Jürgen Buchmüller " +license="MIT, GPL-2.0-or-later" +homepage="https://github.com/llloret/osmid/" +distfiles="https://github.com/llloret/osmid/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=3dd7c62e8a13f37252bd021d3855d7fc07449218c1e9c41315d01de4059a830e + +case "$XBPS_TARGET_MACHINE" in + *-musl) makedepends+=" libexecinfo-devel" ;; +esac + +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + *-musl) sed -i CMakeLists.txt \ + -e "/target_link_libraries/s/X11)/X11 execinfo)/" + ;; + esac +} + +post_install() { + vlicense LICENSE.md + vdoc README.md +} diff --git a/srcpkgs/othman/template b/srcpkgs/othman/template new file mode 100644 index 00000000000..f02343c1bb6 --- /dev/null +++ b/srcpkgs/othman/template @@ -0,0 +1,31 @@ +# Template file for 'othman' +pkgname=othman +version=0.5.1 +revision=2 +noarch=yes +build_style=python2-module +pycompile_module="othman" +hostmakedepends="python ImageMagick sqlite intltool" +depends="gtk+3 python-gobject amiri-font" +short_desc="Quran browser and search engine " +maintainer="John " +license="WAQFv2" +homepage="https://github.com/ojuba-org/othman/" +distfiles="https://github.com/ojuba-org/othman/archive/${version}.tar.gz" +checksum=45bb59dd35dc5c8b731cc58b2ddc016cb60dcc937c1289a182ebaacab9ae07fd +repository=nonfree + +pre_build() { + sed -i 's|python gen-index|python2 gen-index|' Makefile + make icons + make Othman.desktop + make othman-data/ix.db +} + +post_install() { + for _i in 128 96 72 64 48 36 32 24 22 16; do + vinstall Othman-${_i}.png 644 usr/share/icons/${_i}x${_i}/apps/ Othman.png + done + vinstall Othman.desktop 644 usr/share/applications/ + vlicense waqf2-ar.pdf +} diff --git a/srcpkgs/pam_rundir/patches/fix.diff b/srcpkgs/pam_rundir/patches/fix.diff new file mode 100644 index 00000000000..859d1d4a8d9 --- /dev/null +++ b/srcpkgs/pam_rundir/patches/fix.diff @@ -0,0 +1,21 @@ +--- pam_rundir.c ++++ pam_rundir.c +@@ -24,6 +24,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -396,6 +398,9 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) + goto done; + } + ++ /* to bypass permission checks for mkdir, in case it isn't group ++ * writable */ ++ prctl (PR_SET_SECUREBITS, SECBIT_NO_SETUID_FIXUP); + /* set euid so if we do create the dir, it is own by the user */ + if (seteuid (pw->pw_uid) < 0) + { diff --git a/srcpkgs/pam_rundir/template b/srcpkgs/pam_rundir/template index 34149cb55f9..bff04fedd70 100644 --- a/srcpkgs/pam_rundir/template +++ b/srcpkgs/pam_rundir/template @@ -1,7 +1,7 @@ # Template file for 'pam_rundir-1.0.0' pkgname=pam_rundir version=1.0.0 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --with-parentdir=/run/user" makedepends="pam-devel" diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template index 65af66e2d4f..5af1c576784 100644 --- a/srcpkgs/pantheon-screenshot/template +++ b/srcpkgs/pantheon-screenshot/template @@ -1,15 +1,15 @@ # Template file for 'pantheon-screenshot' pkgname=pantheon-screenshot -version=0.1.4 -revision=2 -build_style=cmake -hostmakedepends="intltool pkg-config vala" -makedepends="granite-devel gtk+3-devel libcanberra-devel" -depends="desktop-file-utils hicolor-icon-theme" -maintainer="cr6git " -short_desc="Screenshot tool" -homepage="https://github.com/elementary/screenshot-tool" -license="LGPL-3" -distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz" -checksum=b01ef495818cc026a3eaf5446aac7b7e507a7625ea855c012c8ae4ee5c38a572 +version=0.1.5 +revision=1 wrksrc="screenshot-tool-${version}" +build_style=meson +hostmakedepends="desktop-file-utils intltool pkg-config vala" +makedepends="granite-devel libcanberra-devel" +depends="desktop-file-utils hicolor-icon-theme" +short_desc="Screenshot tool" +maintainer="cr6git " +license="LGPL-3.0-only" +homepage="https://github.com/elementary/screenshot-tool" +distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz" +checksum=7b214d7f7ae75902a8dac0ddc692930b1231753ed1e66e26cee0e8b30f8046be diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index 6fed31e373d..1074acd4a82 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,16 +1,17 @@ # Template file for 'parallel' pkgname=parallel -version=20180522 +version=20180622 revision=1 noarch=yes build_style=gnu-configure depends="perl" +checkdepends="perl" short_desc="Shell tool for executing jobs in parallel" 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=eb017e2aea57464c3c91bd1120d419a303d2c204c35ec41fc156e6536ffa0cce +distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=f2cc6ac37d0b68d90b81570c0e4be589dd8c131d204320acaa173544ad6d21d9 pre_configure() { # no html and pdf doc diff --git a/srcpkgs/pass-otp/template b/srcpkgs/pass-otp/template index 8a988fd9bd1..448575f8ae3 100644 --- a/srcpkgs/pass-otp/template +++ b/srcpkgs/pass-otp/template @@ -1,13 +1,13 @@ # Template file for 'pass-otp' pkgname=pass-otp -version=1.1.0 +version=1.1.1 revision=1 noarch=yes build_style=gnu-makefile depends="pass oath-toolkit qrencode" short_desc="A pass extension for managing one-time-password (OTP) tokens" maintainer="Alif Rachmawadi " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/tadfisher/pass-otp" distfiles="https://github.com/tadfisher/pass-otp/archive/v${version}.tar.gz" -checksum=3971467475f8ed573eb860c7a44bd268d464d169dddbc0a4da89232d5beee144 +checksum=edb3142ab81d70af4e6d1c7f13abebd7c349be474a3f9293d9648ee91b75b458 diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template index fdc16998f8d..37443066c27 100644 --- a/srcpkgs/pass/template +++ b/srcpkgs/pass/template @@ -1,20 +1,20 @@ # Template file for 'pass' pkgname=pass -version=1.7.1 -revision=2 -wrksrc="password-store-${version}" +version=1.7.2 +revision=1 noarch=yes +wrksrc="password-store-${version}" build_style=gnu-makefile -make_install_args="FORCE_BASHCOMP=1 FORCE_ZSHCOMP=1" +make_install_args="WITH_BASHCOMP=yes WITH_ZSHCOMP=yes WITH_FISHCOMP=yes" depends="bash gnupg2 tree xclip" checkdepends="${depends} git" short_desc="Stores, retrieves, generates, and synchronizes passwords securely" maintainer="Eivind Uggedal " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.passwordstore.org/" distfiles="http://git.zx2c4.com/password-store/snapshot/password-store-${version}.tar.xz" -checksum=f6d2199593398aaefeaa55e21daddfb7f1073e9e096af6d887126141e99d9869 -make_check_target="test" +checksum=4768c5e1965c4d2aeb28818681e484fb105b6f46cbd75a97608615c4ec6980ea +make_check_target=test passmenu_package() { short_desc="A dmenu-based interface to pass" diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template index 6b0e81d7c4e..bceb80bf629 100644 --- a/srcpkgs/pavucontrol-qt/template +++ b/srcpkgs/pavucontrol-qt/template @@ -1,18 +1,14 @@ # Template file for 'pavucontrol-qt' pkgname=pavucontrol-qt -version=0.3.0 +version=0.4.0 revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="pkg-config xdg-user-dirs" -makedepends="lxqt-build-tools qt5-tools-devel liblxqt-devel pulseaudio-devel" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="qt5-tools-devel pulseaudio-devel" short_desc="Pulseaudio mixer in Qt" maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/pavucontrol-qt/releases/download/${version}/pavucontrol-qt-${version}.tar.xz" -checksum=35e5641f6f982332d14b8d70ec2ab6b4b3b3f672fb135ab016718d009062995e - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-tools-devel" -fi +license="GPL-2.0-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/pavucontrol-qt/releases/download/${version}/pavucontrol-qt-${version}.tar.xz" +checksum=e6b2edc4079c067fa8710eee8bd7f11f148128a9f08d5d38e600b4c31f841b5f diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template index a083c024454..dba6688f00c 100644 --- a/srcpkgs/pcmanfm-qt/template +++ b/srcpkgs/pcmanfm-qt/template @@ -1,15 +1,15 @@ # Template file for 'pcmanfm-qt' pkgname=pcmanfm-qt -version=0.12.0 -revision=3 +version=0.13.0 +revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="qt5-host-tools qt5-tools-devel libfm-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel" makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel" short_desc="LXQt pcmanfm Qt frontend" maintainer="Juan RP " -homepage="http://www.lxqt.org" -license="GPL-2" -distfiles="https://github.com/lxde/pcmanfm-qt/releases/download/${version}/pcmanfm-qt-${version}.tar.xz" -checksum=1fa187e304217b7c2d06f0600a1eebf1d5c6e825c3132e884f7ab3a605fe76f7 +homepage="https://www.lxqt.org" +license="GPL-2.0-or-later" +distfiles="https://github.com/lxqt/pcmanfm-qt/releases/download/${version}/pcmanfm-qt-${version}.tar.xz" +checksum=bf961a6d91a50a3e7e69ae4b249d41b11f01d70142759a3019f30a33e7cc5722 replaces="lxqt-common>=0" diff --git a/srcpkgs/pdd/template b/srcpkgs/pdd/template index ffdbc807e96..279e93e0cc3 100644 --- a/srcpkgs/pdd/template +++ b/srcpkgs/pdd/template @@ -1,14 +1,14 @@ # Template file for 'pdd' pkgname=pdd -version=1.1 +version=1.2 revision=1 build_style=gnu-makefile depends="python3-dateutil" -# Tests aren't on 1.1 yet but they are already on upstream checkdepends="python3-dateutil python3-pytest" short_desc="Tiny date, time diff calculator" maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://github.com/jarun/pdd" +#changelog="https://raw.githubusercontent.com/jarun/pdd/master/CHANGELOG" distfiles="https://github.com/jarun/pdd/archive/v${version}.tar.gz" -checksum=5806bb119af6d8672b1173073225cc398c8807a4c1a4da8751be68b05d3d43d7 +checksum=89821804026815be80ad2ae84b0afcb7203e34a49f0654e78852d0394950cdbc diff --git a/srcpkgs/peframe/template b/srcpkgs/peframe/template new file mode 100644 index 00000000000..d6af0ea73e9 --- /dev/null +++ b/srcpkgs/peframe/template @@ -0,0 +1,25 @@ +# Template file for 'peframe' +pkgname=peframe +version=5.0.1 +revision=2 +noarch=yes +_gitver=b8f46740d6870c4e3d60a1f157773af9221c2f67 +wrksrc="${pkgname}-${_gitver}" +build_style=python2-module +pycompile_module="peframe" +hostmakedepends="python-setuptools" +depends="python-setuptools python-simplejson" +short_desc="Perform static analysis on Portable Executables" +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/guelfoweb/peframe" +distfiles="https://github.com/guelfoweb/peframe/archive/${_gitver}.tar.gz" +checksum=74cfdc51e999a4b86102dd383e7bf5e170da70f796a7cedb341e5c81774c7891 + +pre_configure() { + sed -n '5,24p' peframe/peframe.py > LICENSE +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/perl-Config-IniFiles/template b/srcpkgs/perl-Config-IniFiles/template index 67dbfb6cd83..f343eb8c11b 100644 --- a/srcpkgs/perl-Config-IniFiles/template +++ b/srcpkgs/perl-Config-IniFiles/template @@ -1,16 +1,17 @@ # Template file for 'perl-Config-IniFiles' pkgname=perl-Config-IniFiles -version=2.95 +version=2.98 revision=1 noarch=yes wrksrc="Config-IniFiles-${version}" build_style=perl-module hostmakedepends="perl" -makedepends="${hostmakedepends}" -depends="${makedepends}" +makedepends="$hostmakedepends" +depends="$makedepends" short_desc="A module for reading .ini-style configuration files" maintainer="ibrokemypie " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Config-IniFiles" +changelog="https://fastapi.metacpan.org/source/SHLOMIF/Config-IniFiles-${version}/Changes" distfiles="${CPAN_SITE}/Config/Config-IniFiles-${version}.tar.gz" -checksum=414a19f98cc745769ce762aefce01fa52d031bc244403cd32fd1f6257f2dedc2 +checksum=9d5fc5c2192058e58ad35150ddae3043a2679f2aa4e1fb7e18e36794622b1797 diff --git a/srcpkgs/perl-Config-Tiny/template b/srcpkgs/perl-Config-Tiny/template new file mode 100644 index 00000000000..b454dd7be84 --- /dev/null +++ b/srcpkgs/perl-Config-Tiny/template @@ -0,0 +1,15 @@ +# Template file for 'perl-Config-Tiny' +pkgname=perl-Config-Tiny +version=2.23 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="perl" +short_desc="Read/Write .ini style files with as little code as possible" +maintainer="John " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="http://search.cpan.org/dist/${pkgname/perl-/}/" +distfiles="${CPAN_SITE}/Config/${pkgname/perl-/}-${version}.tgz" +checksum=9a8a66e3ed420cbc6585c43abeff788368309a46355cf69a64c2a47e1911e50c diff --git a/srcpkgs/perl-Crypt-CAST5/template b/srcpkgs/perl-Crypt-CAST5/template new file mode 100644 index 00000000000..99e4b1614ee --- /dev/null +++ b/srcpkgs/perl-Crypt-CAST5/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Crypt-CAST5' +pkgname=perl-Crypt-CAST5 +version=0.05 +revision=1 +wrksrc="${pkgname#perl-}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +checkdepends="perl-Crypt-CBC" +depends="perl" +short_desc="Perl interface to CAST5 block cipher" +maintainer="newbluemoon " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Crypt-CAST5" +distfiles="${CPAN_SITE}/Crypt/Crypt-CAST5-${version}.tar.gz" +checksum=9b51fc769c34ebb7b605927705af31af277e2532f0c03ed53755d064cdde1307 diff --git a/srcpkgs/perl-Crypt-CBC/template b/srcpkgs/perl-Crypt-CBC/template new file mode 100644 index 00000000000..185a1256bbe --- /dev/null +++ b/srcpkgs/perl-Crypt-CBC/template @@ -0,0 +1,18 @@ +# Template file for 'perl-Crypt-CBC' +pkgname=perl-Crypt-CBC +version=2.33 +revision=1 +noarch=yes +wrksrc="${pkgname#perl-}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +checkdepends="perl-Crypt-Blowfish perl-Crypt-Blowfish_PP perl-Crypt-CAST5 + perl-Crypt-DES perl-Crypt-DES_EDE3 perl-Crypt-IDEA perl-Crypt-Rijndael" +depends="perl" +short_desc="Encrypt Data with Cipher Block Chaining Mode" +maintainer="newbluemoon " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Crypt-CBC" +distfiles="${CPAN_SITE}/Crypt/Crypt-CBC-${version}.tar.gz" +checksum=6a70de21b6cc7f2b100067e8e188db966e9a8001b5db6fa976e7cb5b294ae645 diff --git a/srcpkgs/perl-Crypt-DES/template b/srcpkgs/perl-Crypt-DES/template new file mode 100644 index 00000000000..a976246536d --- /dev/null +++ b/srcpkgs/perl-Crypt-DES/template @@ -0,0 +1,20 @@ +# Template file for 'perl-Crypt-DES' +pkgname=perl-Crypt-DES +version=2.07 +revision=1 +wrksrc="${pkgname#perl-}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +checkdepends="perl-Crypt-CBC" +depends="perl" +short_desc="Perl interface to DES block cipher" +maintainer="newbluemoon " +license="Custom" +homepage="https://metacpan.org/release/Crypt-DES" +distfiles="${CPAN_SITE}/Crypt/Crypt-DES-${version}.tar.gz" +checksum=2db1ebb5837b4cb20051c0ee5b733b4453e3137df0a92306034c867621edd7e7 + +post_install() { + vlicense COPYRIGHT +} diff --git a/srcpkgs/perl-Crypt-DES_EDE3/template b/srcpkgs/perl-Crypt-DES_EDE3/template new file mode 100644 index 00000000000..b706d9a75a5 --- /dev/null +++ b/srcpkgs/perl-Crypt-DES_EDE3/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Crypt-DES_EDE3' +pkgname=perl-Crypt-DES_EDE3 +version=0.01 +revision=1 +noarch=yes +wrksrc="${pkgname#perl-}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl perl-Crypt-DES" +depends="perl" +short_desc="Perl interface to Triple-DES EDE block cipher" +maintainer="newbluemoon " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Crypt-DES_EDE3" +distfiles="${CPAN_SITE}/Crypt/Crypt-DES_EDE3-${version}.tar.gz" +checksum=9cb2e04b625e9cc0833cd499f76fd12556583ececa782a9758a55e3f969748d6 diff --git a/srcpkgs/perl-Crypt-IDEA/template b/srcpkgs/perl-Crypt-IDEA/template new file mode 100644 index 00000000000..81c2aead971 --- /dev/null +++ b/srcpkgs/perl-Crypt-IDEA/template @@ -0,0 +1,19 @@ +# Template file for 'perl-Crypt-IDEA' +pkgname=perl-Crypt-IDEA +version=1.10 +revision=1 +wrksrc="${pkgname#perl-}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="perl" +short_desc="Perl interface to IDEA block cipher" +maintainer="newbluemoon " +license="Custom" +homepage="https://metacpan.org/release/Crypt-IDEA" +distfiles="${CPAN_SITE}/Crypt/Crypt-IDEA-${version}.tar.gz" +checksum=33bd78c11924a0fc1ff3eedde94078cbbf6b6ca9ede046d2b2f561e9e9a72019 + +post_install() { + vlicense COPYRIGHT +} diff --git a/srcpkgs/perl-Data-Validate-IP/template b/srcpkgs/perl-Data-Validate-IP/template new file mode 100644 index 00000000000..d8dfa779e2f --- /dev/null +++ b/srcpkgs/perl-Data-Validate-IP/template @@ -0,0 +1,17 @@ +# Template build file for 'perl-Data-Validate-IP' +pkgname=perl-Data-Validate-IP +version=0.27 +revision=1 +wrksrc="Data-Validate-IP-$version" +build_style=perl-module +hostmakedepends="perl perl-NetAddr-IP" +makedepends="perl" +checkdepends="$hostmakedepends perl-Test-Requires" +depends="$hostmakedepends" +short_desc="IPv4 and IPv6 validation methods" +maintainer="Leah Neukirchen " +homepage="https://metacpan.org/release/Data-Validate-IP" +license="Artistic-1.0-Perl, GPL-1.0-or-later" +distfiles="${CPAN_SITE}/Data/Data-Validate-IP-${version}.tar.gz" +checksum=e1aa92235dcb9c6fd9b6c8cda184d1af73537cc77f4f83a0f88207a8bfbfb7d6 +noarch=yes diff --git a/srcpkgs/perl-File-Copy-Recursive/template b/srcpkgs/perl-File-Copy-Recursive/template new file mode 100644 index 00000000000..edaabb38146 --- /dev/null +++ b/srcpkgs/perl-File-Copy-Recursive/template @@ -0,0 +1,17 @@ +# Template file for 'perl-File-Copy-Recursive' +pkgname=perl-File-Copy-Recursive +version=0.44 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl perl-Path-Tiny" +depends="$makedepends" +checkdepends="perl-Test-Deep perl-Test-Fatal perl-Test-File perl-Test-Warnings" +short_desc="Perl extension for recursively copying files and directories" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/File-Copy-Recursive" +distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz" +checksum=ae19a0b58dc1b3cded9ba9cfb109288d8973d474c0b4bfd28b27cf60e8ca6ee4 diff --git a/srcpkgs/perl-File-DesktopEntry/template b/srcpkgs/perl-File-DesktopEntry/template new file mode 100644 index 00000000000..abc994b8dd0 --- /dev/null +++ b/srcpkgs/perl-File-DesktopEntry/template @@ -0,0 +1,16 @@ +# Template file for 'perl-File-DesktopEntry' +pkgname=perl-File-DesktopEntry +version=0.22 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends} perl-File-BaseDir perl-URI" +depends="${makedepends}" +short_desc="Perl module to handle .desktop files" +maintainer="Frank Steinborn " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/File-DesktopEntry" +distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz" +checksum=169c01e3dae2f629767bec1a9f1cdbd6ec6d713d1501e0b2786e4dd1235635b8 diff --git a/srcpkgs/perl-File-MimeInfo/template b/srcpkgs/perl-File-MimeInfo/template index 7a7dbea280c..acc468b71ff 100644 --- a/srcpkgs/perl-File-MimeInfo/template +++ b/srcpkgs/perl-File-MimeInfo/template @@ -1,12 +1,12 @@ # Template file for 'perl-File-MimeInfo' pkgname=perl-File-MimeInfo version=0.28 -revision=1 +revision=2 noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" -makedepends="${hostmakedepends} perl-File-BaseDir" +makedepends="${hostmakedepends} perl-File-BaseDir perl-File-DesktopEntry" depends="${makedepends}" short_desc="Perl utility to detect file mimetypes and open them accordingly" maintainer="crater2150 " diff --git a/srcpkgs/perl-File-ShareDir/template b/srcpkgs/perl-File-ShareDir/template index 4752610f281..b367b3fea5d 100644 --- a/srcpkgs/perl-File-ShareDir/template +++ b/srcpkgs/perl-File-ShareDir/template @@ -1,6 +1,6 @@ # Template file for 'perl-File-ShareDir' pkgname=perl-File-ShareDir -version=1.106 +version=1.116 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -13,4 +13,4 @@ maintainer="newbluemoon " homepage="https://metacpan.org/release/File-ShareDir" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz" -checksum=6f22ee9c79f383a3eac4271486c1c68a7489dfbe15be0db803b0d8bf713a125e +checksum=59d90bfdf98c4656ff4173e62954ea8cf0de66565e35d108ecd7050596cb8328 diff --git a/srcpkgs/perl-HTTP-Server-Simple/template b/srcpkgs/perl-HTTP-Server-Simple/template index 6b41761bfab..c22017f0276 100644 --- a/srcpkgs/perl-HTTP-Server-Simple/template +++ b/srcpkgs/perl-HTTP-Server-Simple/template @@ -1,16 +1,16 @@ -# Template build file for 'perl-HTTP-Server-Simple'. +# Template file for 'perl-HTTP-Server-Simple' pkgname=perl-HTTP-Server-Simple version=0.52 -revision=1 +revision=2 +noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" makedepends="${hostmakedepends}" depends="${makedepends} perl-URI" -noarch="yes" short_desc="HTTP::Server::Simple - Lightweight HTTP server" maintainer="Leah Neukirchen " homepage="https://metacpan.org/release/HTTP-Server-Simple" -license="Artistic, GPL-1" +license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/HTTP/${pkgname/perl-/}-$version.tar.gz" checksum=d8939fa4f12bd6b8c043537fd0bf96b055ac3686b9cdd9fa773dca6ae679cb4c diff --git a/srcpkgs/perl-Inline-C/template b/srcpkgs/perl-Inline-C/template new file mode 100644 index 00000000000..9f12ab5e319 --- /dev/null +++ b/srcpkgs/perl-Inline-C/template @@ -0,0 +1,18 @@ +# Template file for 'perl-Inline-C' +pkgname=perl-Inline-C +version=0.78 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl perl-File-ShareDir-Install" +makedepends="perl-File-Copy-Recursive perl-Inline perl-Parse-RecDescent + perl-Pegex perl-YAML-LibYAML perl-File-ShareDir-Install" +depends="$makedepends" +checkdepends="perl-Test-Warn" +short_desc="C language support for Inline" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Inline-C" +distfiles="${CPAN_SITE}/Inline/${pkgname/perl-/}-${version}.tar.gz" +checksum=9a7804d85c01a386073d2176582b0262b6374c5c0341049da3ef84c6f53efbc7 diff --git a/srcpkgs/perl-Inline/template b/srcpkgs/perl-Inline/template new file mode 100644 index 00000000000..1d75936aefa --- /dev/null +++ b/srcpkgs/perl-Inline/template @@ -0,0 +1,17 @@ +# Template file for 'perl-Inline' +pkgname=perl-Inline +version=0.80 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="$makedepends" +checkdepends="perl-Test-Warn" +short_desc="Write Perl Subroutines in Other Programming Languages" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Inline" +distfiles="${CPAN_SITE}/Inline/${pkgname/perl-/}-${version}.tar.gz" +checksum=7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6 diff --git a/srcpkgs/perl-Mojolicious/template b/srcpkgs/perl-Mojolicious/template index 87f44ea1e9f..f0781fd690f 100644 --- a/srcpkgs/perl-Mojolicious/template +++ b/srcpkgs/perl-Mojolicious/template @@ -1,6 +1,6 @@ # Template file for 'perl-Mojolicious' pkgname=perl-Mojolicious -version=7.84 +version=7.85 revision=1 noarch=yes wrksrc="${pkgname//perl-/}-${version}" @@ -12,5 +12,5 @@ maintainer="Urs Schulz " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Mojolicious" distfiles="${CPAN_SITE}/${pkgname//perl-/}/${pkgname//perl-/}-${version}.tar.gz" -checksum=7461a27e8e8665b436a60c708cf6ce4164b84dfb1b2435480a65597085d26ebc +checksum=b4c6109597bfe29261fe2861a93247cde22e1894f092b2984ecf2092610e6758 diff --git a/srcpkgs/perl-Parallel-ForkManager/template b/srcpkgs/perl-Parallel-ForkManager/template new file mode 100644 index 00000000000..4c30f9b60be --- /dev/null +++ b/srcpkgs/perl-Parallel-ForkManager/template @@ -0,0 +1,17 @@ +# Template build file for 'perl-Parallel-ForkManager' +pkgname=perl-Parallel-ForkManager +version=1.19 +revision=1 +wrksrc="Parallel-ForkManager-$version" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +checkdepends="$hostmakedepends perl-Test-Warn" +depends="$hostmakedepends" +short_desc="Simple parallel processing fork manager" +maintainer="Leah Neukirchen " +homepage="https://metacpan.org/release/Parallel-ForkManager" +license="Artistic-1.0-Perl, GPL-1.0-or-later" +distfiles="${CPAN_SITE}/Parallel/Parallel-ForkManager-${version}.tar.gz" +checksum=f1de2e9875eeb77d65f80338905dedd522f3913822502982f805aa71cde5a472 +noarch=yes diff --git a/srcpkgs/perl-Pegex/template b/srcpkgs/perl-Pegex/template new file mode 100644 index 00000000000..9a2e0952386 --- /dev/null +++ b/srcpkgs/perl-Pegex/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Pegex' +pkgname=perl-Pegex +version=0.64 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl perl-File-ShareDir-Install" +makedepends="perl perl-File-ShareDir-Install perl-YAML-LibYAML" +depends="${makedepends}" +short_desc="Acmeist PEG Parser Framework" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Pegex" +distfiles="http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Pegex-${version}.tar.gz" +checksum=27e00264bdafb9c2109212b9654542032617fecf7b7814915d2bdac198f067cd diff --git a/srcpkgs/perl-Test-File/template b/srcpkgs/perl-Test-File/template new file mode 100644 index 00000000000..db31a136556 --- /dev/null +++ b/srcpkgs/perl-Test-File/template @@ -0,0 +1,17 @@ +# Template file for 'perl-Test-File' +pkgname=perl-Test-File +version=1.443 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="$makedepends" +checkdepends="perl-Test-utf8" +short_desc="Test file attributes" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Test-File" +distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz" +checksum=61b4a6ab8f617c8c7b5975164cf619468dc304b6baaaea3527829286fa58bcd5 diff --git a/srcpkgs/perl-Test-HTTP-Server-Simple/template b/srcpkgs/perl-Test-HTTP-Server-Simple/template new file mode 100644 index 00000000000..b5858a62d5c --- /dev/null +++ b/srcpkgs/perl-Test-HTTP-Server-Simple/template @@ -0,0 +1,17 @@ +# Template file for 'perl-Test-HTTP-Server-Simple' +pkgname=perl-Test-HTTP-Server-Simple +version=0.11 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl-HTTP-Server-Simple" +depends="$makedepends" +checkdepends="perl-Test-Pod perl-Test-Pod-Coverage" +short_desc="Test::More functions for HTTP::Server::Simple" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Test-HTTP-Server-Simple" +distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz" +checksum=85c97ebd4deb805291b17277032da48807228f24f89b1ce2fb3c09f7a896bb78 diff --git a/srcpkgs/perl-Test-Time/template b/srcpkgs/perl-Test-Time/template index 500f6935940..8cad9c6dfca 100644 --- a/srcpkgs/perl-Test-Time/template +++ b/srcpkgs/perl-Test-Time/template @@ -1,6 +1,6 @@ # Template file for 'perl-Test-Time' pkgname=perl-Test-Time -version=0.05 +version=0.06 revision=1 noarch=yes wrksrc="${pkgname#perl-}-${version}" @@ -13,4 +13,4 @@ maintainer="newbluemoon " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Test-Time" distfiles="${CPAN_SITE}/Test/${pkgname#perl-}-$version.tar.gz" -checksum=abef8885a811440114bfe067edc32f08500fbfd624902f8c3a81fc224ac4b410 +checksum=c99b373247748a2560a6e07b4eddea0bd90f8241a27ac096ee54e5aed1791754 diff --git a/srcpkgs/perl-Test-UseAllModules/template b/srcpkgs/perl-Test-UseAllModules/template new file mode 100644 index 00000000000..43c46454f2a --- /dev/null +++ b/srcpkgs/perl-Test-UseAllModules/template @@ -0,0 +1,16 @@ +# Template build file for 'perl-Test-UseAllModules' +pkgname=perl-Test-UseAllModules +version=0.17 +revision=1 +wrksrc="Test-UseAllModules-$version" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="$hostmakedepends" +short_desc="Do use_ok() for all the MANIFESTed modules" +maintainer="Leah Neukirchen " +homepage="https://metacpan.org/release/Test-UseAllModules" +license="Artistic-1.0-Perl, GPL-1.0-or-later" +distfiles="${CPAN_SITE}/Test/Test-UseAllModules-${version}.tar.gz" +checksum=a71f2fe8b96ab8bfc2760aa1d3135ea049a5b20dcb105457b769a1195c7a2509 +noarch=yes diff --git a/srcpkgs/perl-Test-Warn/template b/srcpkgs/perl-Test-Warn/template index ef537b542e1..d3e342124b9 100644 --- a/srcpkgs/perl-Test-Warn/template +++ b/srcpkgs/perl-Test-Warn/template @@ -1,6 +1,6 @@ # Template file for 'perl-Test-Warn' pkgname=perl-Test-Warn -version=0.35 +version=0.36 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -9,8 +9,9 @@ hostmakedepends="perl" makedepends="${hostmakedepends} perl-Sub-Uplevel" depends="$makedepends" short_desc="Test::Warn - Perl extension to test methods for warnings" -maintainer="Leah Neukirchen " +maintainer="maxice8 " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Test-Warn" +changelog="https://fastapi.metacpan.org/source/BIGJ/Test-Warn-${version}/Changes" distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz" -checksum=24e410963cc8a3bf76851f475e322e1d232ea93d73d700f6b9e7888201b354c5 +checksum=ecbca346d379cef8d3c0e4ac0c8eb3b2613d737ffaaeae52271c38d7bf3c6cda diff --git a/srcpkgs/perl-Test-YAML/template b/srcpkgs/perl-Test-YAML/template index f7922080af2..d9e09868a17 100644 --- a/srcpkgs/perl-Test-YAML/template +++ b/srcpkgs/perl-Test-YAML/template @@ -1,7 +1,7 @@ # Template file for 'perl-Test-YAML' pkgname=perl-Test-YAML -version=1.06 -revision=2 +version=1.07 +revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,7 +13,7 @@ maintainer="maxice8 " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Test-YAML" distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz" -checksum=27376103163c12d7d13ae45bf22caf5a0c38478362425bf68613c3748f76b943 +checksum=1f300d034f46298cb92960912cc04bac33fb27f05b8852d8f051e110b9cd995f post_install() { rm -f "$DESTDIR"/usr/bin/test-yaml diff --git a/srcpkgs/perl-Test-utf8/template b/srcpkgs/perl-Test-utf8/template new file mode 100644 index 00000000000..ff2086ffae9 --- /dev/null +++ b/srcpkgs/perl-Test-utf8/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Test-utf8' +pkgname=perl-Test-utf8 +version=1.01 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="$makedepends" +short_desc="Handy UTF8 tests" +maintainer="maxice8 " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Test-utf8" +distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz" +checksum=ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a diff --git a/srcpkgs/perl-Time-modules/template b/srcpkgs/perl-Time-modules/template new file mode 100644 index 00000000000..ee6b3bd933e --- /dev/null +++ b/srcpkgs/perl-Time-modules/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Time-modules' +pkgname=perl-Time-modules +version=2013.0912 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="$makedepends" +short_desc="Tools for dealing with time, time formats, timezones and calendars" +maintainer="maxice8 " +license="Unknown" +homepage="https://metacpan.org/release/MUIR/Time-modules-${version}" +distfiles="${CPAN_SITE}/Time/${pkgname/perl-/}-${version}.tar.gz" +checksum=45bcab023e1853d27e53c6a214bc860a4026c65ec16c422a757235e836fb648c diff --git a/srcpkgs/perl-XML-LibXML-PrettyPrint/template b/srcpkgs/perl-XML-LibXML-PrettyPrint/template new file mode 100644 index 00000000000..756bda6aec9 --- /dev/null +++ b/srcpkgs/perl-XML-LibXML-PrettyPrint/template @@ -0,0 +1,17 @@ +# Template file for 'perl-XML-LibXML-PrettyPrint' +pkgname=perl-XML-LibXML-PrettyPrint +version=0.006 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="$makedepends perl-Exporter-Tiny perl-XML-LibXML" +checkdepends="$depends perl-Test-Warnings" +short_desc="Perl extension to PrettyPrint XML" +maintainer="John " +license="Artistic-1.0-perl, GPL-1.0-or-later" +homepage="https://metacpan.org/pod/XML::LibXML::PrettyPrint" +distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz" +checksum=89fb31725e90ecde0fc3623cb1e22decbaa4dbe30d6af56d38a0a8b45c4789f0 diff --git a/srcpkgs/perl-strictures/template b/srcpkgs/perl-strictures/template index 3d7e0f3472f..a64c815f68f 100644 --- a/srcpkgs/perl-strictures/template +++ b/srcpkgs/perl-strictures/template @@ -1,16 +1,16 @@ # Template file for 'perl-strictures' pkgname=perl-strictures -version=2.000004 +version=2.000005 revision=1 +noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" makedepends="perl" -depends="${makedepends}" +depends="$makedepends" short_desc="Turn on strict and make most warnings fatal" maintainer="maxice8 " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/strictures" -distfiles="https://cpan.org/authors/id/H/HA/HAARG/strictures-${version}.tar.gz" -checksum=23842430a3fe1d664aa9399a7356b0463a24fe4f7ed3f68f7bdb4c3e0d06f753 -noarch=yes +distfiles="https://cpan.org/authors/id/E/ET/ETHER/strictures-${version}.tar.gz" +checksum=960bdb9f82c8f09caebc417bce3fdf75b27de81f4408d0ba0b0a6d61ab86dd99 diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index 8bea3e3643d..ef37b07e991 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -1,7 +1,7 @@ # Template build file for 'perl'. pkgname=perl version=5.26.1 -revision=5 +revision=6 _perl_cross_version=1.1.6 build_style=gnu-configure hostmakedepends="less" @@ -175,11 +175,11 @@ do_configure() { export HOSTLDFLAGS CFLAGS+=" -D_FILE_OFFSET_BITS=64 -DLARGE_FILE_SUPPORT64 ";; *-musl) - HOSTCFLAGS+=" -D_DEFAULT_SOURCE" + HOSTCFLAGS+=" -D_GNU_SOURCE" export HOSTCFLAGS HOSTLDFLAGS+=" -pthread" export HOSTLDFLAGS - CFLAGS+=" -D_DEFAULT_SOURCE";; + CFLAGS+=" -D_GNU_SOURCE";; esac export LD="$CC" diff --git a/srcpkgs/php/patches/fix-libressl-2.7.patch b/srcpkgs/php/patches/fix-libressl-2.7.patch deleted file mode 100644 index 19517ed34ea..00000000000 --- a/srcpkgs/php/patches/fix-libressl-2.7.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- ext/openssl/openssl.c.orig 2018-04-24 17:49:42.959226505 +0200 -+++ ext/openssl/openssl.c 2018-04-24 18:05:49.423593182 +0200 -@@ -72,7 +72,8 @@ - #ifdef HAVE_OPENSSL_MD2_H - #define OPENSSL_ALGO_MD2 4 - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - #define OPENSSL_ALGO_DSS1 5 - #endif - #define OPENSSL_ALGO_SHA224 6 -@@ -566,7 +567,8 @@ ZEND_GET_MODULE(openssl) - #endif - - /* {{{ OpenSSL compatibility functions and macros */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa - #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh - #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa -@@ -683,7 +685,8 @@ static const unsigned char *ASN1_STRING_ - return M_ASN1_STRING_data(asn1); - } - --#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - static int X509_get_signature_nid(const X509 *x) - { -@@ -1243,7 +1246,8 @@ static void php_openssl_dispose_config(s - } - /* }}} */ - --#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) -+#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) - #define PHP_OPENSSL_RAND_ADD_TIME() ((void) 0) - #else - #define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval() -@@ -1330,7 +1334,8 @@ static EVP_MD * php_openssl_get_evp_md_f - mdtype = (EVP_MD *) EVP_md2(); - break; - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - case OPENSSL_ALGO_DSS1: - mdtype = (EVP_MD *) EVP_dss1(); - break; -@@ -1418,7 +1423,8 @@ PHP_MINIT_FUNCTION(openssl) - le_x509 = zend_register_list_destructors_ex(php_openssl_x509_free, NULL, "OpenSSL X.509", module_number); - le_csr = zend_register_list_destructors_ex(php_openssl_csr_free, NULL, "OpenSSL X.509 CSR", module_number); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - OPENSSL_config(NULL); - SSL_library_init(); - OpenSSL_add_all_ciphers(); -@@ -1461,7 +1467,8 @@ PHP_MINIT_FUNCTION(openssl) - #ifdef HAVE_OPENSSL_MD2_H - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT); - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT); - #endif - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT); -@@ -1599,7 +1606,8 @@ PHP_MINFO_FUNCTION(openssl) - */ - PHP_MSHUTDOWN_FUNCTION(openssl) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - EVP_cleanup(); - - /* prevent accessing locking callback from unloaded extension */ -@@ -3644,7 +3652,8 @@ PHP_FUNCTION(openssl_csr_get_public_key) - RETURN_FALSE; - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - /* Due to changes in OpenSSL 1.1 related to locking when decoding CSR, - * the pub key is not changed after assigning. It means if we pass - * a private key, it will be returned including the private part. -@@ -3655,7 +3664,8 @@ PHP_FUNCTION(openssl_csr_get_public_key) - /* Retrieve the public key from the CSR */ - tpubkey = X509_REQ_get_pubkey(csr); - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - /* We need to free the CSR as it was duplicated */ - X509_REQ_free(csr); - #endif diff --git a/srcpkgs/php/template b/srcpkgs/php/template index dc90f864d60..5164bfd2e3e 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,6 +1,6 @@ -# Template build file for 'php' +# Template file for 'php' pkgname=php -version=7.2.5 +version=7.2.7 revision=1 hostmakedepends="bison pkg-config" makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel @@ -10,13 +10,13 @@ makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel short_desc="An HTML-embedded scripting language" maintainer="Steve Prybylski " license="PHP-3.01" -homepage="http://www.php.net" +homepage="https://www.php.net" distfiles="http://www.php.net/distributions/php-${version}.tar.xz" -checksum=af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2 +checksum=eb01c0153b3baf1f64b8b044013ce414b52fede222df3f509e8ff209478f31f0 conf_files="/etc/php/php.ini" # Needs (probably a lot of) work to make it cross compile -nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/16307/steps/shell_3/logs/stdio" +nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/16307/steps/shell_3/logs/stdio lib32disabled=yes replaces="php-mcrypt<7.2.0" diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template index 30c06748cd7..c0d1ad5d3d4 100644 --- a/srcpkgs/pianobar/template +++ b/srcpkgs/pianobar/template @@ -1,20 +1,18 @@ # Template file for 'pianobar' pkgname=pianobar -version=2017.08.30 -revision=3 +version=2018.06.22 +revision=1 +build_style=gnu-makefile +make_build_args="V=1" hostmakedepends="pkg-config" -makedepends="libcurl-devel faad2-devel libao-devel gnutls-devel libgcrypt-devel json-c-devel ffmpeg-devel" -short_desc="A free/open-source, console-based client for Pandora radio" +makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel libcurl-devel" +short_desc="Free/open-source, console-based client for Pandora radio" maintainer="Juan RP " license="MIT" -homepage="http://6xq.net/projects/pianobar/" +homepage="https://6xq.net/pianobar/" distfiles="https://github.com/PromyLOPh/pianobar/archive/${version}.tar.gz" -checksum=d164416e01cb0f1fd05fd9db20aa75f42659d71acbe50375e7f3f894e3de66e0 +checksum=a616ef70c04ceea8294caaba091d6a16bf35293bdc587151a235fb0e6a00ad90 -do_build() { - make CC="$CC -std=c99" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" V=1 ${makejobs} -} -do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install - vlicense COPYING LICENSE +post_install() { + vlicense COPYING } diff --git a/srcpkgs/pimcommon/update b/srcpkgs/pimcommon/update deleted file mode 100644 index 0bfbdced6f9..00000000000 --- a/srcpkgs/pimcommon/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://download.kde.org/stable/applications/" -pattern='href="\K[\d\.]+(?=/")' diff --git a/srcpkgs/pipewire-doc b/srcpkgs/pipewire-doc new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/pipewire-doc @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index d60347d2f8a..9abfb0ceac1 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,27 +1,78 @@ # Template file for 'pipewire' pkgname=pipewire version=0.1.9 -revision=1 -configure_args="-Denable_man=true -Denable_gstreamer=false" +revision=2 +configure_args="-Denable_man=true -Denable_gstreamer=true -Denable_docs=true" build_style=meson -hostmakedepends="pkg-config xmltoman" -makedepends="dbus-devel jack-devel alsa-lib-devel v4l-utils-devel SDL2-devel - ffmpeg-devel libX11-devel" +hostmakedepends="doxygen graphviz pkg-config xmltoman" +makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel + sbc-devel v4l-utils-devel" short_desc="Server and user space API to deal with multimedia pipelines" maintainer="maxice8 " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="https://pipewire.org/" distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz" checksum=d7dc591d60c3544f3c24b2b0ab1db458991dd69d0610337fd0accf136373916b -# XXX: There is potential to further divide into more subpkgs one for libpipewire -# and another for libspa -pipewire-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" +libpipewire_package() { + short_desc+=" - pipewire library" pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" + vmove "usr/lib/libpipewire-0.1.so.*" + } +} + +pipewire-devel_package() { + depends="libpipewire-${version}_${revision}" + short_desc+=" - pipewire development files" + pkg_install() { + vmove usr/include/pipewire + vmove usr/lib/pkgconfig/libpipewire-0.1.pc + vmove usr/lib/libpipewire-0.1.so + } +} + +libspa-lib_package() { + short_desc+=" - spa-lib library" + pkg_install() { + vmove "usr/lib/libspa-lib.so.*" + } +} + +libspa-lib-devel_package() { + depends="libspa-lib-${version}_${revision}" + short_desc+=" - spa-lib development files" + pkg_install() { + vmove usr/include/spa + vmove usr/lib/libspa-lib.so + vmove usr/lib/pkgconfig/libspa-0.1.pc + } +} + +libspa-ffmpeg_package() { + short_desc+=" - ffmpeg plugins" + pkg_install() { + vmove usr/lib/spa/ffmpeg + } +} + +libspa-bluetooth_package() { + short_desc+=" - bluetooth plugins" + pkg_install() { + vmove usr/lib/spa/bluez5 + } +} + +gstreamer1-pipewire_package() { + short_desc+=" - gstreamer plugin" + pkg_install() { + vmove usr/lib/gstreamer-1.0 + } +} + +pipewire-doc_package() { + noarch=yes + short_desc+=" - documentation" + pkg_install() { + vmove usr/share/doc } } diff --git a/srcpkgs/pixiewps/template b/srcpkgs/pixiewps/template new file mode 100644 index 00000000000..eacf8c408ba --- /dev/null +++ b/srcpkgs/pixiewps/template @@ -0,0 +1,11 @@ +# Template file for 'pixiewps' +pkgname=pixiewps +version=1.4.2 +revision=1 +build_style=gnu-makefile +short_desc="Tool used to bruteforce offline the WPS PIN" +maintainer="1is7ac3 " +license="GPL-3.0-only" +homepage="https://github.com/wiire-a/pixiewps/releases" +distfiles="https://github.com/wiire-a/${pkgname}/archive/v${version}.tar.gz" +checksum=c73ffd58c461a88504cca36e5a29981dc68b78f8fdd31d7c546bc204fad7c435 diff --git a/srcpkgs/pkcs11-helper/patches/libressl-2.7.patch b/srcpkgs/pkcs11-helper/patches/libressl-2.7.patch deleted file mode 100644 index ad474bc5ed4..00000000000 --- a/srcpkgs/pkcs11-helper/patches/libressl-2.7.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- lib/pkcs11h-openssl.c 2017-02-11 23:13:00.000000000 +0100 -+++ lib/pkcs11h-openssl.c 2018-04-27 17:46:48.160261853 +0200 -@@ -96,6 +96,7 @@ - }; - - #if OPENSSL_VERSION_NUMBER < 0x10100001L -+#if !defined(LIBRESSL_VERSION_NUMBER) - static RSA_METHOD * - RSA_meth_dup (const RSA_METHOD *meth) - { -@@ -123,6 +124,7 @@ - _pkcs11h_mem_free ((void *)&meth); - } - } -+#endif /* defined(LIBRESSL_VERSION_NUMBER) */ - - static int - RSA_meth_set1_name (RSA_METHOD *meth, const char *name) -@@ -139,6 +141,7 @@ - return 1; - } - -+#if !defined(LIBRESSL_VERSION_NUMBER) - static int - RSA_meth_set_priv_enc ( - RSA_METHOD *meth, -@@ -198,6 +201,7 @@ - _pkcs11h_mem_free ((void *)&meth); - } - } -+#endif /* defined(LIBRESSL_VERSION_NUMBER) */ - - static int - DSA_meth_set1_name (DSA_METHOD *meth, const char *name) -@@ -207,6 +211,7 @@ - return rv == CKR_OK ? 1 : 0; - } - -+#if !defined(LIBRESSL_VERSION_NUMBER) - static int - DSA_meth_set_sign (DSA_METHOD *meth, - DSA_SIG *(*sign) (const unsigned char *, int, DSA *)) -@@ -224,6 +229,7 @@ - sig->s = s; - return 1; - } -+#endif /* defined(LIBRESSL_VERSION_NUMBER) */ - #endif - - static struct { diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template index 5fadaa08ac7..e5445ab155e 100644 --- a/srcpkgs/pkcs11-helper/template +++ b/srcpkgs/pkcs11-helper/template @@ -1,18 +1,18 @@ # Template file for 'pkcs11-helper' pkgname=pkcs11-helper -version=1.22 -revision=4 +version=1.24 +revision=1 +wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure -configure_args="--enable-doc" +configure_args="--enable-doc --disable-static" hostmakedepends="automake libtool pkg-config doxygen" makedepends="libressl-devel" short_desc="A library to help simplify interacting with PKCS#11 providers" maintainer="Aloz1 " -license="GPL-2, BSD" +license="GPL-2.0-only, BSD-3-Clause" homepage="https://github.com/OpenSC/${pkgname}/wiki" distfiles="https://github.com/OpenSC/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=b1f290585d006541c186e72dd66cc8d642e910dcca1958cae29168dea5ada54f -wrksrc=${pkgname}-${pkgname}-${version} +checksum=f524977d2e49abc836460c556c03311855f5cfa79976102a1dbd553a002e3111 pre_configure() { autoreconf -fi @@ -25,22 +25,20 @@ post_install() { } pkcs11-helper-devel_package() { + depends="${sourcepkg}-${version}_${revision}" short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" pkg_install() { - vmove "usr/include" - vmove "usr/lib/*.a" + vmove usr/include vmove "usr/lib/*.so" - vmove "usr/lib/*.la" - vmove "usr/lib/pkgconfig" - vmove "usr/share/aclocal" + vmove usr/lib/pkgconfig + vmove usr/share/aclocal } } pkcs11-helper-doc_package() { short_desc+=" - documentation files" pkg_install() { - vmove "usr/share/man" - vmove "usr/share/doc" + vmove usr/share/man + vmove usr/share/doc } } diff --git a/srcpkgs/pkgconf-devel b/srcpkgs/pkgconf-devel new file mode 120000 index 00000000000..243cd47f2e6 --- /dev/null +++ b/srcpkgs/pkgconf-devel @@ -0,0 +1 @@ +pkgconf \ No newline at end of file diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index 6e23ab71459..9e25051fa2b 100644 --- a/srcpkgs/pkgconf/template +++ b/srcpkgs/pkgconf/template @@ -1,6 +1,6 @@ # Template file for 'pkgconf' pkgname=pkgconf -version=1.4.2 +version=1.5.1 revision=1 conflicts="pkg-config" build_style=gnu-configure @@ -9,10 +9,24 @@ checkdepends="kyua" short_desc="Provides compiler and linker configuration" maintainer="Enno Boland " license="MIT" -homepage="https://github.com/pkgconf/pkgconf" -distfiles="https://distfiles.dereferenced.org/pkgconf/$pkgname-$version.tar.xz" -checksum=bab39371d4ab972be1d539a8b10b6cc21f8eafc97f617102e667e82bd32eb234 +homepage="https://git.dereferenced.org/pkgconf/pkgconf" +changelog="https://git.dereferenced.org/pkgconf/pkgconf/raw/branch/master/NEWS" +distfiles="https://distfiles.dereferenced.org/pkgconf/${pkgname}-${version}.tar.xz" +checksum=d6877d721f84b59f137da48b237f16e68b598f5afc4f2a04d0a5c9e7e2bf5462 post_install() { vlicense COPYING } + +pkgconf-devel_package() { + depends="pkgconf-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + vmove usr/share/man/man7 + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template new file mode 100644 index 00000000000..efa6e7a0d4a --- /dev/null +++ b/srcpkgs/plasma-browser-integration/template @@ -0,0 +1,14 @@ +# Template file for 'plasma-browser-integration' +pkgname=plasma-browser-integration +version=5.13.0 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF" +hostmakedepends="extra-cmake-modules pkg-config" +makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel" +short_desc="Integration of web browsers with the KDE Plasma 5 desktop" +maintainer="1is7ac3 " +license="GPL-3.0-or-later" +homepage="https://projects.kde.org/projects/plasma/plasma-browser-integration" +distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" +checksum=0cf7b09b66d075eb9c91f46d9e6c252ceb296e92dffe410f616354470588dfde diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template index 06f6e6582be..a33b3713554 100644 --- a/srcpkgs/plasma-workspace-wallpapers/template +++ b/srcpkgs/plasma-workspace-wallpapers/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace-wallpapers' pkgname=plasma-workspace-wallpapers -version=5.12.0 +version=5.13.0 revision=1 noarch=yes build_style=cmake @@ -8,7 +8,7 @@ configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules" short_desc="KDE Plasma wallpapers" maintainer="Denis Revin " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-workspace-wallpapers" -distfiles="http://download.kde.org/stable/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=c1366566cbfff626964b05e5c8655aa456a4ada0f1614717dfb6d0f09da38e97 +distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" +checksum=cb37bb8149f306cd9d8df0ef7660de71d35694d1ce295fa82b0565ad3ed3daf6 diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index c4b132a88c1..5df1aba4605 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,7 +1,7 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace version=5.12.0 -revision=3 +revision=4 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules iso-codes pkg-config" @@ -12,9 +12,9 @@ makedepends="qt5-devel qt5-declarative-devel qt5-script-devel plasma-framework-d depends="kactivitymanagerd kde-cli-tools kwin iso-codes milou plasma-integration libxcb-devel" short_desc="KDE Window manager" maintainer="Denis Revin " -license="GPL-2" +license="GPL-2.0-or-later,GFDL-2.1, LGPL-2.1-or-later" homepage="https://projects.kde.org/projects/plasma/plasma-workspace" -distfiles="http://download.kde.org/stable/plasma/${version}/${pkgname}-${version}.tar.xz" +distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=d5e58c98a43eec206396cd7d3b1d3008c6edba07e9e92c593c24d321f13548b3 plasma-workspace-devel_package() { diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template index 74d511898b1..84a8dd10fc9 100644 --- a/srcpkgs/po4a/template +++ b/srcpkgs/po4a/template @@ -1,6 +1,6 @@ # Template file for 'po4a' pkgname=po4a -version=0.53 +version=0.54 revision=1 build_style="perl-ModuleBuild" noarch=yes @@ -10,7 +10,7 @@ makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build" depends="${_perldeps} opensp gettext" short_desc="PO for anything (po4a) project to ease translations using gettext tools" maintainer="newbluemoon " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://po4a.org/" distfiles="https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz" -checksum=c9005e816da220912f364766d39df5efd4cc28dcae9467a8dc5fca7f46cb780c +checksum=596f7621697f9dd12709958c229e256b56683d25997ac73c9625a2cc0c603d51 diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index 118de33bf0c..d247f9fb102 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,10 +1,10 @@ # Template file for 'ppsspp' pkgname=ppsspp -version=1.6.2 +version=1.6.3 revision=1 build_wrksrc="ppsspp-${version}" build_style=cmake -configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1" +configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON" hostmakedepends="pkg-config" makedepends="zlib-devel glew-devel SDL2-devel ffmpeg-devel libzip-devel snappy-devel" @@ -19,7 +19,7 @@ distfiles=" 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="a2a33693324e798c68c6738994896faa368f3bb3c147f170c29f664f4876a390 +checksum="366f8b3c545071d919e1f51a5c4e0da48ba55cf1c15ff8d78a90985b3d5e8eb3 5a97d1a2949482082bb4e7dff7704cb0fe8263a828cc66773e1d70c7bce472dc 5e20a5758c13cc3967a2c31e7017fe4d8135c005733662be4585d9d19b5d8f34 282d1f17bd3003162dd945b8ba5c5a10cb5738a7750949a8200ff6555f10ff28 diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template index 2ec8d6afaa1..4594eb8815b 100644 --- a/srcpkgs/pragha/template +++ b/srcpkgs/pragha/template @@ -1,7 +1,7 @@ # Template file for 'pragha' pkgname=pragha version=1.3.3 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config" makedepends=" diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template index e6fb09ec646..c58516c6c71 100644 --- a/srcpkgs/print-manager/template +++ b/srcpkgs/print-manager/template @@ -1,6 +1,6 @@ # Template file for 'print-manager' pkgname=print-manager -version=17.12.1 +version=18.04.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -8,7 +8,7 @@ hostmakedepends="extra-cmake-modules" makedepends="plasma-framework-devel kcmutils-devel cups-devel" short_desc="Printing management for KDE 5" maintainer="Giuseppe Fierro " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/KDE/print-manager" -distfiles="https://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=ad601ce2c3d8dfb961396d086d16fd37bb3830208083a736378b052505fb9008 +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=e9d9c671e3e1095210d68a9f94ef8309a1c05e3e54266529112ab88c93aca7cd diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template index 97f1af115dc..ef1c88a2ff4 100644 --- a/srcpkgs/profanity/template +++ b/srcpkgs/profanity/template @@ -1,21 +1,22 @@ # Template file for 'profanity' pkgname=profanity version=0.5.1 -revision=1 -# Package build options -build_options="notify xscreensaver" -build_options_default="notify xscreensaver" +revision=2 build_style=gnu-configure configure_args="$(vopt_enable notify notifications) $(vopt_with xscreensaver) --disable-python-plugins" hostmakedepends="pkg-config python-devel" -makedepends="libglib-devel expat-devel ncurses-devel libgcrypt-devel libotr-devel - libcurl-devel libstrophe-devel readline-devel libuuid-devel python-devel - $(vopt_if notify libnotify-devel) - $(vopt_if xscreensaver libXScrnSaver-devel)" +makedepends="libcurl-devel libgcrypt-devel libglib-devel libotr-devel + libstrophe-devel python-devel readline-devel cmocka-devel + $(vopt_if notify 'libnotify-devel') + $(vopt_if xscreensaver 'libXScrnSaver-devel')" short_desc="A console based XMPP client" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.profanity.im/" distfiles="http://www.profanity.im/${pkgname}-${version}.tar.gz" checksum=e3513713e74ec3363fbdbac2919bdc17e249988780cc5a4589d1425807a7feb8 + +# Package build options +build_options="notify xscreensaver" +build_options_default="notify xscreensaver" diff --git a/srcpkgs/proftpd-devel b/srcpkgs/proftpd-devel new file mode 120000 index 00000000000..0d0a16c9130 --- /dev/null +++ b/srcpkgs/proftpd-devel @@ -0,0 +1 @@ +proftpd \ No newline at end of file diff --git a/srcpkgs/proftpd/template b/srcpkgs/proftpd/template new file mode 100644 index 00000000000..380449ea435 --- /dev/null +++ b/srcpkgs/proftpd/template @@ -0,0 +1,23 @@ +# Template file for 'proftpd' +pkgname=proftpd +version=1.3.6 +revision=1 +build_style=gnu-configure +short_desc="Highly configurable GPL-licensed FTP server software" +maintainer="John " +license="GPL-3.0-or-later" +changelog="https://github.com/proftpd/proftpd/blob/${version}/RELEASE_NOTES" +homepage="http://www.proftpd.org/" +distfiles="https://github.com/proftpd/proftpd/archive/v${version}.tar.gz" +checksum=91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf +conf_files="/etc/proftpd.conf" +nocross="https://travis-ci.org/Johnnynator/void-packages/jobs/385821450" + +proftpd-devel_package() { + short_desc+=" - development files" + depends="proftpd>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/progress/template b/srcpkgs/progress/template index 261d50f1b08..ee8616553f6 100644 --- a/srcpkgs/progress/template +++ b/srcpkgs/progress/template @@ -1,14 +1,14 @@ # Template file for progress' pkgname=progress -version=0.13.1 -revision=2 +version=0.14 +revision=1 maintainer="Leah Neukirchen " makedepends="ncurses-devel" -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/Xfennec/progress" short_desc="Tool for showing the progress of cp, rm, dd and more" distfiles="https://github.com/Xfennec/progress/archive/v${version}.tar.gz" -checksum=064c95e8b93893dbf4b4b8152290cbb3b0c005eda0cae500353561048c9939a5 +checksum=214a0d84b3ee5dde57ec9952ec9aa68ad9261fb336ef025324b344ed7ab48af1 provides="cv-${version}_${revision}" replaces="cv>=0" diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template index 3d0c08cc91e..36ef898294b 100644 --- a/srcpkgs/proj/template +++ b/srcpkgs/proj/template @@ -1,14 +1,14 @@ # Template file for 'proj' pkgname=proj -version=5.0.1 +version=5.1.0 revision=1 build_style=gnu-configure short_desc="Cartographic Projections Library" maintainer="John " license="MIT" -homepage="http://proj4.org" -distfiles="http://download.osgeo.org/proj/proj-${version}.tar.gz" -checksum=a792f78897482ed2c4e2af4e8a1a02e294c64e32b591a635c5294cb9d49fdc8c +homepage="https://proj4.org" +distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz" +checksum=6b1379a53317d9b5b8c723c1dc7bf2e3a8eb22ceb46b8807a1ce48ef65685bb3 post_install() { vlicense COPYING @@ -20,6 +20,7 @@ proj-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove usr/share/man/man3 vmove "usr/lib/*.a" vmove "usr/lib/*.so" } diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template index d0689166ad4..3ccbb223147 100644 --- a/srcpkgs/prometheus/template +++ b/srcpkgs/prometheus/template @@ -1,7 +1,7 @@ # Template file for 'prometheus' pkgname=prometheus -version=2.2.1 -revision=3 +version=2.3.1 +revision=1 build_style=go go_import_path="github.com/prometheus/prometheus" go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool" @@ -11,11 +11,11 @@ go_ldflags="-X ${go_import_path}/version.Version=${version} -X ${go_import_path}/version.BuildUser=VoidLinux" conf_files="/etc/prometheus/prometheus.yml" maintainer="Toyam Cox " +short_desc="Monitoring system and time series database" license="Apache-2.0" homepage="https://prometheus.io/" -short_desc="Monitoring system and time series database" distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz" -checksum=4f75427449bb72d1886f6cd46f752fe6300242da48b8bb870dbbd7ffc879ed92 +checksum=3aab85d3cb59540b6b43f5a80b14d13937fc0d51e8e82a29f0efebf6addd5f75 system_accounts="_prometheus" diff --git a/srcpkgs/proxychains-ng/template b/srcpkgs/proxychains-ng/template index 434c1034801..16abcdcd20c 100644 --- a/srcpkgs/proxychains-ng/template +++ b/srcpkgs/proxychains-ng/template @@ -1,13 +1,13 @@ # Template file for 'proxychains-ng' pkgname=proxychains-ng -version=4.12 +version=4.13 revision=1 build_style=gnu-configure make_install_target="install install-config" conf_files="/etc/proxychains.conf" short_desc="A hook preloader to redirect TCP traffic through SOCKS or HTTP proxies" maintainer="David " -license="GPL-2" -homepage="http://github.com/rofl0r/proxychains-ng" -distfiles="https://github.com/rofl0r/proxychains-ng/releases/download/v${version}/proxychains-ng-${version}.tar.xz" -checksum=482a549935060417b629f32ddadd14f9c04df8249d9588f7f78a3303e3d03a4e +license="GPL-2.0-only" +homepage="https://github.com/rofl0r/proxychains-ng" +distfiles="http://ftp.barfooze.de/pub/sabotage/tarballs/${pkgname}-${version}.tar.xz" +checksum=77502b3f67641214c2360b366b23e2068a2f1379cbd3def3cf83b807d1762810 diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 7761bd9cc7f..e607d4d9ce3 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,42 +1,42 @@ # Template file for 'pulseaudio' pkgname=pulseaudio -version=11.1 -revision=4 +version=12.0 +revision=1 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-bluez4 --disable-esound --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset - --disable-systemd --disable-systemd-journal --enable-webrtc-aec - --with-bash-completion-dir=/usr/share/bash-completion/completions" -hostmakedepends="automake libtool pkg-config intltool gettext-devel orc-devel" -makedepends=" - zlib-devel libltdl-devel libglib-devel eudev-libudev-devel speex-devel libXi-devel - libXtst-devel xcb-util-devel libsoxr-devel libsndfile-devel libasyncns-devel - dbus-devel tdb-devel libcap-devel avahi-libs-devel libressl-devel - webrtc-audio-processing-devel orc-devel jack-devel fftw-devel - libcap-progs sbc-devel libxcb-devel libXtst-devel libSM-devel" + --disable-systemd-login --disable-system-daemon --disable-systemd-journal + --enable-webrtc-aec --with-bash-completion-dir=/usr/share/bash-completion/completions" +hostmakedepends="automake gettext-devel intltool libtool orc-devel pkg-config" +makedepends="avahi-libs-devel eudev-libudev-devel fftw-devel jack-devel + libSM-devel libXtst-devel libasyncns-devel libcap-devel libcap-progs + libglib-devel libltdl-devel libressl-devel libsndfile-devel libsoxr-devel + orc-devel sbc-devel speex-devel tdb-devel webrtc-audio-processing-devel + xcb-util-devel" depends="rtkit" conf_files="/etc/pulse/*" short_desc="A featureful, general-purpose sound server" maintainer="Juan RP " -homepage="http://www.freedesktop.org/wiki/Software/PulseAudio" -license="LGPL-2" +license="LGPL-2.1-or-later" +homepage="https://www.freedesktop.org/wiki/Software/PulseAudio" +distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz" +checksum=6e422dbdc9fd11c0cb6af869e5eda73dc24a8be3c14725440edd51ce6b464444 system_groups="pulse-access" system_accounts="pulse" pulse_groups="audio" pulse_homedir="/var/run/pulse" -distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz" -checksum=f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" glib" +fi case "$XBPS_TARGET_MACHINE" in # Disable neon optimizations for the arm* architectures arm*) configure_args+=" --disable-neon-opt" ;; esac -pre_configure() { - NOCONFIGURE=1 ./bootstrap.sh -} post_install() { rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf vsv pulseaudio @@ -52,6 +52,7 @@ libpulseaudio_package() { vmove usr/lib/pulseaudio } } + pulseaudio-devel_package() { depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template index cf25922c44f..148b9608d86 100644 --- a/srcpkgs/pysolfc/template +++ b/srcpkgs/pysolfc/template @@ -1,6 +1,6 @@ # Template file for 'pysolfc' pkgname=pysolfc -version=2.2.0 +version=2.4.0 revision=1 noarch=yes wrksrc="PySolFC-${pkgname}-${version}" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0" homepage="http://pysolfc.sourceforge.net/" distfiles="https://github.com/shlomif/PySolFC/archive/${pkgname}-${version}.tar.gz" -checksum=0610c72391a9972ebac2903107b22abc24b6a991795612506ba62e714a928564 +checksum=b93a61eca8d4196b3d8101a4bf63ba56a1ad2a8c839c071f016dd1c961b599e6 post_build() { make mo rules diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template index a7507f3fd38..3a81b302d9c 100644 --- a/srcpkgs/python-Cheroot/template +++ b/srcpkgs/python-Cheroot/template @@ -1,7 +1,7 @@ # Template file for 'python-Cheroot' pkgname=python-Cheroot -version=6.3.1 -revision=2 +version=6.3.2 +revision=1 noarch=yes wrksrc="cheroot-${version}" build_style=python-module @@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni " license="BSD-3-Clause" homepage="https://github.com/cherrypy/cheroot" distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz" -checksum=e83ecc6bd473c340a10adac19cc69c65607638fa3e8b37cf0b26b6fdf4db4994 +checksum=52f915d077ce6201e59c95c4a2ef89617d9b90e6185defb40c03ff3515d2066f alternatives="cheroot:cheroot:/usr/bin/cheroot2" pre_build() { diff --git a/srcpkgs/python-CherryPy/template b/srcpkgs/python-CherryPy/template index 2acabc5575d..f54cc745d57 100644 --- a/srcpkgs/python-CherryPy/template +++ b/srcpkgs/python-CherryPy/template @@ -1,7 +1,7 @@ # Template file for 'python-CherryPy' pkgname=python-CherryPy -version=15.0.0 -revision=2 +version=16.0.2 +revision=1 noarch=yes wrksrc="CherryPy-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="BSD-3-Clause" homepage="https://cherrypy.org/" distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz" -checksum=7404638da9cf8c6be672505168ccb63e16d33cb3aa16a02ec30a44641f7546af +checksum=858fbff27235a392026b1d821ad815b587815c94fbb14312e2e64cc23766b9c3 alternatives="cherrypy:cherryd:/usr/bin/cherryd2" pre_build() { diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template index 9e1617dc734..f24b8480e33 100644 --- a/srcpkgs/python-SQLAlchemy/template +++ b/srcpkgs/python-SQLAlchemy/template @@ -1,6 +1,6 @@ # Template file for 'python-SQLAlchemy' pkgname=python-SQLAlchemy -version=1.2.8 +version=1.2.9 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="http://www.sqlalchemy.org/" license="MIT" distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz" -checksum=2d5f08f714a886a1382c18be501e614bce50d362384dc089474019ce0768151c +checksum=e21e5561a85dcdf16b8520ae4daec7401c5c24558e0ce004f9b60be75c4b6957 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-alabaster/template b/srcpkgs/python-alabaster/template index 949fb5fe437..f256a47e121 100644 --- a/srcpkgs/python-alabaster/template +++ b/srcpkgs/python-alabaster/template @@ -1,19 +1,19 @@ # Template file for 'python-alabaster' pkgname=python-alabaster -version=0.7.10 -revision=2 +version=0.7.11 +revision=1 noarch=yes wrksrc="alabaster-${version}" build_style=python-module +pycompile_module="alabaster" hostmakedepends="python-setuptools python3-setuptools" depends="python" -pycompile_module="alabaster" short_desc="Configurable sidebar-enabled Sphinx theme (Python2)" maintainer="Alessio Sergi " -homepage="https://github.com/bitprophet/alabaster" -license="3-clause-BSD" +homepage="https://alabaster.readthedocs.io/" +license="BSD-3-Clause" distfiles="${PYPI_SITE}/a/alabaster/alabaster-${version}.tar.gz" -checksum=37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0 +checksum=b63b1f4dc77c074d386752ec4a8a7517600f6c0db8cd42980cae17ab7b3275d7 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-ansible-lint/template b/srcpkgs/python-ansible-lint/template index 3cab365e1fa..365f654803e 100644 --- a/srcpkgs/python-ansible-lint/template +++ b/srcpkgs/python-ansible-lint/template @@ -1,6 +1,6 @@ # Template file for 'python-ansible-lint' pkgname=python-ansible-lint -version=3.4.21 +version=3.4.23 revision=1 noarch=yes wrksrc="ansible-lint-${version}" @@ -10,10 +10,11 @@ hostmakedepends="python-setuptools" depends="ansible python-setuptools python-six python-yaml" short_desc="Python2 linter for Ansible files" maintainer="Joseph LaFreniere " -homepage="https://github.com/willthames/ansible-lint" license="MIT" +homepage="https://github.com/willthames/ansible-lint" +changelog="https://raw.githubusercontent.com/willthames/ansible-lint/master/CHANGELOG.md" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=230f741382d4b86e726cf2c65e82c45636e84e334d2c751ff1876dd2f5794225 +checksum=c5e1c6500d65fa9655ef155fecd67b775701b5e427d5d978a677e5d53d584ef4 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template index 80d9323a8c1..f7fe88a9320 100644 --- a/srcpkgs/python-automat/template +++ b/srcpkgs/python-automat/template @@ -8,6 +8,7 @@ build_style=python-module pycompile_module="automat" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools python-attrs python-six" +checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz" short_desc="Finite-state machines in Python (Python2)" maintainer="Juan RP " homepage="https://github.com/glyph/Automat" @@ -22,6 +23,11 @@ pre_build() { -e '/setup_requires=/,+3d' \ -e "s/use_scm_version=True/version='${version}'/" } + +do_check() { + python3 setup.py test +} + post_install() { vlicense LICENSE } diff --git a/srcpkgs/python-blessings/template b/srcpkgs/python-blessings/template index 5b2c754a175..0ae88d44809 100644 --- a/srcpkgs/python-blessings/template +++ b/srcpkgs/python-blessings/template @@ -1,19 +1,19 @@ # Template file for 'python-blessings' pkgname=python-blessings -version=1.6.1 +version=1.7 revision=1 noarch=yes wrksrc="blessings-${version}" build_style=python-module pycompile_module="blessings" hostmakedepends="python-setuptools python3-setuptools" -depends="python" +depends="python-six" short_desc="Wrapper around terminal coloring, styling, and positioning (Python2)" maintainer="Maurizio Porrato " homepage="https://github.com/erikrose/blessings" license="MIT" distfiles="${PYPI_SITE}/b/blessings/blessings-${version}.tar.gz" -checksum=74919575885552e14bc24a68f8b539690bd1b5629180faa830b1a25b8c7fb6ea +checksum=98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d post_install() { vlicense LICENSE @@ -21,8 +21,8 @@ post_install() { python3-blessings_package() { noarch=yes + depends="python3-six" pycompile_module="blessings" - depends="python3" 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 8db35e5f7f3..a9031a71a4c 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.6 +version=0.23.7 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=9fff4cc105b63b64b79e602760e89d4e622d8a1193fe69a42bb17ad53e5a6020 +checksum=3cf0153965414ce3e0827c01050baf048d2f2d7c3e188b027eac4be6fcd9a3bb python3-chess_package() { noarch=yes diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template index 20a4467b7b9..10ec5ec37f9 100644 --- a/srcpkgs/python-dbus/template +++ b/srcpkgs/python-dbus/template @@ -1,20 +1,20 @@ # Template file for 'python-dbus' pkgname=python-dbus -version=1.2.4 -revision=2 +version=1.2.8 +revision=1 lib32disabled=yes wrksrc="dbus-python-${version}" build_style=gnu-configure hostmakedepends="pkg-config python-devel python3-devel" -makedepends="libglib-devel dbus-glib-devel ${hostmakedepends/pkg-config/}" +makedepends="libglib-devel ${hostmakedepends/pkg-config/}" depends="python dbus" pycompile_module="dbus" short_desc="D-Bus Python2 bindings" maintainer="Juan RP " -license="GPL-2, LGPL-2.1" +license="MIT" homepage="https://www.freedesktop.org/wiki/Software/DBusBindings" distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz" -checksum=e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc +checksum=abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f pre_configure() { mkdir -p dbus-${py2_ver} @@ -22,18 +22,19 @@ pre_configure() { cp -a dbus-${py2_ver} dbus-${py3_ver} } do_configure() { + local py_abiver= for pyver in $py2_ver $py3_ver; do if [ "$pyver" != "$py2_ver" ]; then - pyinc="$py3_inc" - pyabi="m" + py_inc="$py3_inc" + py_abiver="$py3_abiver" else - pyinc="$py2_inc" + py_inc="$py2_inc" fi cd ${wrksrc}/dbus-${pyver} - export PYTHON_INCLUDES="-I${XBPS_CROSS_BASE}/${pyinc}" - export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${pyabi}" - export PYTHON="python${pyver}" + export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}" + export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}" + export PYTHON_VERSION="${pyver}" ./configure ${configure_args} done } @@ -47,6 +48,7 @@ do_install() { for pyver in $py2_ver $py3_ver; do cd ${wrksrc}/dbus-${pyver} make DESTDIR=${DESTDIR} install + vlicense COPYING done } @@ -56,17 +58,15 @@ python3-dbus_package() { depends="python3 dbus" short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove ${py3_sitelib} + vmove usr/lib/python3* } } python-dbus-devel_package() { - lib32disabled=yes depends="python-devel python3-devel python-dbus>=${version}_${revision} python3-dbus>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/doc } } diff --git a/srcpkgs/python-docker/template b/srcpkgs/python-docker/template index 344c57ed1a4..d6546bf859b 100644 --- a/srcpkgs/python-docker/template +++ b/srcpkgs/python-docker/template @@ -1,6 +1,6 @@ # Template file for 'python-docker' pkgname=python-docker -version=3.3.0 +version=3.4.1 revision=1 noarch=yes wrksrc="docker-${version}" @@ -11,10 +11,10 @@ depends="python-requests python-six python-websocket-client python-ipaddress python-backports.ssl_match_hostname python-docker-pycreds" short_desc="Python2 library for the Docker Engine API" maintainer="Sergi Alvarez " -homepage="https://github.com/docker/docker-py" license="Apache-2.0" +homepage="https://github.com/docker/docker-py" distfiles="${PYPI_SITE}/d/docker/docker-${version}.tar.gz" -checksum=dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a +checksum=ad077b49660b711d20f50f344f70cfae014d635ef094bf21b0d7df5f0aeedf99 python3-docker_package() { noarch=yes diff --git a/srcpkgs/python-fishnet/template b/srcpkgs/python-fishnet/template index 6b153764a7a..b76b4eb9561 100644 --- a/srcpkgs/python-fishnet/template +++ b/srcpkgs/python-fishnet/template @@ -1,7 +1,8 @@ # Template file for 'python-fishnet' pkgname=python-fishnet -version=1.15.9 +version=1.15.11 revision=1 +noarch=yes wrksrc="fishnet-${version}" build_style=python-module pycompile_module="fishnet.py" @@ -9,11 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python-requests" short_desc="Distributed Stockfish analysis for lichess.org (Python2)" maintainer="maxice8 " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/niklasf/fishnet" distfiles="https://github.com/niklasf/fishnet/archive/v${version}.tar.gz" -checksum=dc5f5b1b8aaa53b58c48fb1be7cd59e39c60947424aeed1681f32c3bf28176e5 -noarch=yes +checksum=33da1211d84b5832d7c9a92f9ed4427011ebdadf33b26e366d9d9698e6be420e python3-fishnet_package() { noarch=yes diff --git a/srcpkgs/python-gevent/template b/srcpkgs/python-gevent/template index bfbe9015344..d5731460740 100644 --- a/srcpkgs/python-gevent/template +++ b/srcpkgs/python-gevent/template @@ -1,6 +1,6 @@ # Template file for 'python-gevent' pkgname=python-gevent -version=1.3.3 +version=1.3.4 revision=1 wrksrc="gevent-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="http://www.gevent.org/" license="MIT" distfiles="https://github.com/gevent/gevent/archive/${version}.tar.gz" -checksum=c9270781266c241c09ad06ab7b4375a6325c2993ea67074902a3f47b26d7bbf8 +checksum=720fc7203e9fd349bdba469e095d91ad1b3d6015c10b1c963394f8bce9e59a82 export LIBEV_EMBED=0 export CARES_EMBED=0 diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template index fe3c1887bc6..707555efcf8 100644 --- a/srcpkgs/python-gitlab/template +++ b/srcpkgs/python-gitlab/template @@ -1,20 +1,26 @@ # Template file for 'python-gitlab' pkgname=python-gitlab -version=1.3.0 +version=1.4.0 revision=1 noarch=yes build_style=python-module pycompile_module="gitlab" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools python-requests python-six" +checkdepends="${depends} python-httmock python-mock" short_desc="Wrapper for GitLab's API (Python2)" maintainer="Joseph LaFreniere " -homepage="https://github.com/gpocentek/python-gitlab" license="LGPL-3.0-or-later" +homepage="https://github.com/gpocentek/python-gitlab" +changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst" distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz" -checksum=74ef4e98383043403d786d1719579b9a638666809b47d93a9fa8f0bd9f12ab84 +checksum=34a5eb1704e68a23bafb9b122c456ff72b3e1a2d3bdcd44346bbde6a5d7af511 alternatives="python-gitlab:gitlab:/usr/bin/gitlab2" +do_check() { + python setup.py test +} + python3-gitlab_package() { noarch=yes depends="python3-setuptools python3-requests python3-six" diff --git a/srcpkgs/python-httmock/template b/srcpkgs/python-httmock/template new file mode 100644 index 00000000000..d1eaec60d50 --- /dev/null +++ b/srcpkgs/python-httmock/template @@ -0,0 +1,31 @@ +# Template file for 'python-httmock' +pkgname=python-httmock +version=1.2.6 +revision=1 +noarch=yes +wrksrc="httmock-${version}" +build_style=python-module +pycompile_module="httmock.py" +hostmakedepends="python3-setuptools python-setuptools" +depends="python-requests" +checkdepends="python3-requests" +short_desc="Mocking library for requests (Python2)" +maintainer="maxice8 " +license="Apache-2.0" +homepage="https://github.com/patrys/httmock" +distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz" +checksum=0a5646eff603c58f3cf2d619f5ec1c760cafe5c6049e28f8b8189ba23da4b31f + +do_check() { + python3 setup.py test +} + +python3-httmock_package() { + noarch=yes + pycompile_module="httmock.py" + depends="python3-requests" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-icalendar/template b/srcpkgs/python-icalendar/template index ddd1add0828..98045b7f733 100644 --- a/srcpkgs/python-icalendar/template +++ b/srcpkgs/python-icalendar/template @@ -1,19 +1,20 @@ # Template file for 'python-icalendar' pkgname=python-icalendar -version=4.0.1 +version=4.0.2 revision=1 wrksrc="icalendar-${version}" noarch=yes build_style=python-module pycompile_module="icalendar" hostmakedepends="python-setuptools python3-setuptools" -depends="python-dateutil python-pytz" +depends="python-setuptools python-dateutil python-pytz" short_desc="Parser/generator of iCalendar files for use with Python2" maintainer="Oliver Kiddle " license="BSD-2-Clause" -homepage="http://icalendar.readthedocs.org/" +homepage="https://github.com/collective/icalendar" distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz" -checksum=682a42023d3d43a3a83933b4e329d109aabb07c9e11cb94a4d83ca687c3a3e8d +checksum=80362a9f3c2686b88791fdb78c063f33bd96451f7b1b12140c5aad2df81c008c +alternatives="icalendar:icalendar:/usr/bin/icalendar2" post_install() { vlicense LICENSE.rst LICENSE @@ -22,9 +23,11 @@ post_install() { python3-icalendar_package() { noarch=yes pycompile_module="icalendar" - depends="python3-dateutil python3-pytz" + depends="python3-setuptools python3-dateutil python3-pytz" + alternatives="icalendar:icalendar:/usr/bin/icalendar3" short_desc="${short_desc/Python2/Python3}" pkg_install() { + vmove usr/bin/*3 vmove usr/lib/python3* vlicense LICENSE.rst LICENSE } diff --git a/srcpkgs/python-irc/template b/srcpkgs/python-irc/template index 8c5ee18784e..bc70b19af90 100644 --- a/srcpkgs/python-irc/template +++ b/srcpkgs/python-irc/template @@ -1,8 +1,9 @@ # Template file for 'python-irc' pkgname=python-irc -version=16.2.1 +version=16.3 revision=1 -wrksrc=irc-${version} +noarch=yes +wrksrc="irc-${version}" build_style=python-module pycompile_module="irc" hostmakedepends="python-setuptools python3-setuptools" @@ -12,8 +13,7 @@ maintainer="Toyam Cox " license="MIT" homepage="https://github.com/jaraco/irc" distfiles="${PYPI_SITE}/i/irc/irc-${version}.tar.gz" -checksum=c030a5df6cf505177b0481d9b93ffc63a02a3cfdacb3c96bbb70a8e5a89e1290 -noarch=yes +checksum=8b56ac7311de80fe4b0bc95cc991d46267455401f83d37a2bef135c2885e4730 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-keyring/template b/srcpkgs/python-keyring/template index 0e0a4139d47..95ccd48c701 100644 --- a/srcpkgs/python-keyring/template +++ b/srcpkgs/python-keyring/template @@ -1,6 +1,6 @@ # Template file for 'python-keyring' pkgname=python-keyring -version=12.2.1 +version=13.1.0 revision=1 noarch=yes wrksrc="keyring-${version}" @@ -13,7 +13,7 @@ maintainer="Oliver Kiddle " license="MIT" homepage="https://github.com/jaraco/keyring" distfiles="https://github.com/jaraco/keyring/archive/${version}.tar.gz" -checksum=b004db75b6f1fb112f5cc09fa0f5bafba532e8ca80aa914a4f59fd8eb1134012 +checksum=dc48b7ab8df197912cf08b1648549bac1dbcd5af494a291a473d68fe104e8900 alternatives="keyring:keyring:/usr/bin/keyring2" pre_build() { diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template index c64c98b9d2e..2459017095a 100644 --- a/srcpkgs/python-lxml/template +++ b/srcpkgs/python-lxml/template @@ -1,26 +1,28 @@ # Template file for 'python-lxml' pkgname=python-lxml -version=4.2.1 +version=4.2.3 revision=1 wrksrc="lxml-lxml-${version}" build_style=python-module +pycompile_module="lxml" hostmakedepends="libxslt-devel python-Cython python-setuptools python3-Cython python3-setuptools" makedepends="libxslt-devel python-devel python3-devel" checkdepends="python3" -pycompile_module="lxml" short_desc="Python2 binding for the libxml2 and libxslt libraries" maintainer="Juan RP " -homepage="http://lxml.de/" -license="BSD-3-Clause, ElementTree, GPL-2.0-or-later, ZPL-2.0" # ElementTree isn't SPDX +homepage="https://lxml.de/" +license="BSD-3-Clause, ElementTree" distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz" -checksum=e09b4ae8bdc55bd1983dbacc467ef2da62591faec42e6c8a8864f12c1844028d +checksum=b398434856f0f1399da8f8b48e72cb9075db195cb64ddbb05cb7725f0461d571 do_check() { python3 test.py } post_install() { - vlicense LICENSES.txt LICENSES + vlicense LICENSES.txt + vlicense doc/licenses/BSD.txt + vlicense doc/licenses/elementtree.txt } python3-lxml_package() { @@ -28,6 +30,8 @@ python3-lxml_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* - vlicense LICENSES.txt LICENSES + vlicense LICENSES.txt + vlicense doc/licenses/BSD.txt + vlicense doc/licenses/elementtree.txt } } diff --git a/srcpkgs/python-lz4/template b/srcpkgs/python-lz4/template index 1123a1ff47c..f20b43b3bb1 100644 --- a/srcpkgs/python-lz4/template +++ b/srcpkgs/python-lz4/template @@ -1,7 +1,7 @@ # Template file for 'python-lz4' pkgname=python-lz4 -version=1.1.0 -revision=2 +version=2.0.1 +revision=1 wrksrc="lz4-${version}" build_style=python-module pycompile_module="lz4" @@ -14,7 +14,7 @@ maintainer="Oliver Kiddle " license="BSD-3-Clause" homepage="https://github.com/python-lz4/python-lz4" distfiles="${PYPI_SITE}/l/lz4/lz4-${version}.tar.gz" -checksum=9ede632d668995d6148942022c025c0f7ea0d97c275c099f9ad156e02cc1711e +checksum=ad2829319cf151720724399cb5a14f6fb90abe5edfe2fabc1233e765d3e718b1 pre_build() { sed -i setup.py \ diff --git a/srcpkgs/python-msp430-tools/template b/srcpkgs/python-msp430-tools/template index acbcd613232..f6750a116b5 100644 --- a/srcpkgs/python-msp430-tools/template +++ b/srcpkgs/python-msp430-tools/template @@ -1,6 +1,6 @@ # Template file for 'python-msp430-tools' pkgname=python-msp430-tools -version=0.9 +version=0.9.2 revision=1 noarch=yes build_style=python2-module @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://pypi.org/project/python-msp430-tools/" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=09435855b14c3a1113056a847d5dbd192021b6e9400fff1ebeb47dd2cc422f55 +checksum=544de0c333a4e58a9f5585454a515c6f6159547a5e9a6103cc1e1f064d8323d8 post_install() { vlicense LICENSE.txt LICENSE diff --git a/srcpkgs/python-mysqlclient/template b/srcpkgs/python-mysqlclient/template index e4b872c9b51..186dfd9d766 100644 --- a/srcpkgs/python-mysqlclient/template +++ b/srcpkgs/python-mysqlclient/template @@ -1,7 +1,7 @@ # Template file for 'python-mysqlclient' pkgname=python-mysqlclient -version=1.3.12 -revision=2 +version=1.3.13 +revision=1 wrksrc="mysqlclient-${version}" build_style=python-module pycompile_module="MySQLdb _mysql_exceptions.py" @@ -9,10 +9,10 @@ hostmakedepends="python-setuptools python3-setuptools" makedepends="libmysqlclient-devel python-devel python3-devel zlib-devel libressl-devel" short_desc="Python2 interface to MySQL/MariaDB" maintainer="Alin Dobre " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/PyMySQL/mysqlclient-python" distfiles="${PYPI_SITE}/m/mysqlclient/mysqlclient-${version}.tar.gz" -checksum=2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5 +checksum=ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f python3-mysqlclient_package() { pycompile_module="MySQLdb _mysql_exceptions.py" diff --git a/srcpkgs/python-numpy-stl/template b/srcpkgs/python-numpy-stl/template index 0660c135894..2d4a8443e95 100644 --- a/srcpkgs/python-numpy-stl/template +++ b/srcpkgs/python-numpy-stl/template @@ -1,6 +1,6 @@ # Template file for 'python-numpy-stl' pkgname=python-numpy-stl -version=2.6.0 +version=2.7.0 revision=1 wrksrc="numpy-stl-v${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Karl Nilsson " license="BSD-3-Clause" homepage="https://github.com/WoLpH/numpy-stl/" distfiles="https://github.com/WoLpH/numpy-stl/releases/download/v${version}/numpy-stl-v${version}.tar.xz" -checksum=48d0f3c23cddec6975be5367d8eb4ce09508c2527101cf1c034da01ff702bf3d +checksum=d90d3ef004b8b6dfe28e295164cb883bf4650509ce231cd8e386af83e4e08f59 alternatives=" numpy-stl:stl:/usr/bin/stl2 diff --git a/srcpkgs/python-pam/template b/srcpkgs/python-pam/template index d024e4f01ae..1a89d71323a 100644 --- a/srcpkgs/python-pam/template +++ b/srcpkgs/python-pam/template @@ -1,17 +1,30 @@ # Template file for 'python-pam' pkgname=python-pam -version=0.1.4 -revision=6 +version=1.8.4 +revision=2 noarch=yes -wrksrc="${pkgname/python-}-${version}" -build_style=python2-module -hostmakedepends="python-setuptools" -makedepends="python-devel pam-devel" -depends="python pam" +build_style=python-module pycompile_module="pam.py" +hostmakedepends="python-setuptools python3-setuptools" +depends="python pam" short_desc="Python2 module for PAM authentication" -maintainer="Juan RP " -homepage="http://atlee.ca/software/pam/" +maintainer="John " license="MIT" -distfiles="${PYPI_SITE}/p/pam/${pkgname/python-/}-${version}.tar.gz" -checksum=35e88575afc37a2a5f96e20b22fa55d3e3213370d4ce640af1597c2a1dde226b +homepage="https://github.com/FirefighterBlu3/python-pam" +distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz" +checksum=fa048ca74f08de1390b2576754c05327700a7ebc3d05511f0329a04ebe1aeaa3 + +post_install() { + vlicense LICENSE +} + +python3-pam_package() { + noarch=yes + depends="python3 pam" + pycompile_module="pam.py" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense LICENSE + } +} diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template index 6e29bffdf7a..f0410dccde2 100644 --- a/srcpkgs/python-peewee/template +++ b/srcpkgs/python-peewee/template @@ -1,6 +1,6 @@ # Template file for 'python-peewee' pkgname=python-peewee -version=3.5.0 +version=3.5.1 revision=1 wrksrc="peewee-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="johannes " license="MIT" homepage="https://github.com/coleifer/peewee" distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz" -checksum=1a910438c1394fa74c3ba4c926f19a48d02ae6223719181e2d866c5063edf547 +checksum=9b1ef00ce6e50507f1bf392d369e04d32c38510fc933b9bc90a24bca67105572 alternatives="peewee:pwiz:/usr/bin/pwiz.py2" post_install() { diff --git a/srcpkgs/python-progress/template b/srcpkgs/python-progress/template index 3a3a6b47e92..3a26a4f15af 100644 --- a/srcpkgs/python-progress/template +++ b/srcpkgs/python-progress/template @@ -1,7 +1,7 @@ # Template file for 'python-progress' pkgname=python-progress -version=1.3 -revision=2 +version=1.4 +revision=1 noarch=yes wrksrc="progress-${version}" build_style=python-module @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python" short_desc="Easy to use progress bars (Python2)" maintainer="Joseph LaFreniere " -homepage="https://github.com/verigak/progress" license="ISC" +homepage="https://github.com/verigak/progress" distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz" -checksum=c88d89ee3bd06716a0b8b5504d9c3bcb3c1c0ab98f96dc7f1dc5f56812a4f60a +checksum=5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a post_install() { vlicense LICENSE diff --git a/srcpkgs/python-psycopg2/template b/srcpkgs/python-psycopg2/template index 76bddd7b226..874c9393f03 100644 --- a/srcpkgs/python-psycopg2/template +++ b/srcpkgs/python-psycopg2/template @@ -1,6 +1,6 @@ # Template file for 'python-psycopg2' pkgname=python-psycopg2 -version=2.7.4 +version=2.7.5 revision=1 wrksrc="psycopg2-${version}" build_style=python-module @@ -11,10 +11,10 @@ hostmakedepends="python-devel python3-devel postgresql-libs-devel" makedepends="python-devel python3-devel postgresql-libs-devel" short_desc="PostgreSQL adapter for Python2" maintainer="Toyam Cox " -license="LGPL-3" +license="LGPL-3.0-or-later" homepage="http://initd.org/psycopg" distfiles="${PYPI_SITE}/p/psycopg2/psycopg2-${version}.tar.gz" -checksum=8bf51191d60f6987482ef0cfe8511bbf4877a5aa7f313d7b488b53189cf26209 +checksum=eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e python3-psycopg2_package() { pycompile_module="psycopg2" diff --git a/srcpkgs/python-ptyprocess/template b/srcpkgs/python-ptyprocess/template index 58cf3fb4a9c..452fa62c683 100644 --- a/srcpkgs/python-ptyprocess/template +++ b/srcpkgs/python-ptyprocess/template @@ -1,19 +1,23 @@ # Template file for 'python-ptyprocess' pkgname=python-ptyprocess -version=0.5.2 -revision=2 +version=0.6.0 +revision=1 noarch=yes wrksrc="ptyprocess-${version}" build_style=python-module +pycompile_module="ptyprocess" hostmakedepends="python-setuptools python3-setuptools" depends="python" -pycompile_module="ptyprocess" short_desc="Run a subprocess in a pseudo terminal (Python2)" maintainer="Alessio Sergi " homepage="https://github.com/pexpect/ptyprocess" license="ISC" distfiles="${PYPI_SITE}/p/ptyprocess/ptyprocess-${version}.tar.gz" -checksum=e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365 +checksum=923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0 + +post_install() { + vlicense LICENSE +} python3-ptyprocess_package() { noarch=yes @@ -22,5 +26,6 @@ python3-ptyprocess_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template index 5642b08a1c5..f468c8724a7 100644 --- a/srcpkgs/python-py/template +++ b/srcpkgs/python-py/template @@ -1,7 +1,7 @@ # Template file for 'python-py' pkgname=python-py -version=1.5.3 -revision=2 +version=1.5.4 +revision=1 noarch=yes wrksrc="py-${version}" build_style=python-module @@ -10,11 +10,11 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python" checkdepends="python3-pytest" short_desc="Python2 development support library" -maintainer="maxice8 " +maintainer="Orpahend " license="MIT" homepage="https://github.com/pytest-dev/py" -distfiles="https://github.com/pytest-dev/py/archive/${version}.tar.gz" -checksum=c0698a6f71e9ea2a44e5bdf81f1ec8d5b5e9646e990c75fadeb133149aeb8440 +distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz" +checksum=3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7 do_check() { python3 -m pytest diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template index cebc0676bd5..dfcaff2a87f 100644 --- a/srcpkgs/python-pyasn1-modules/template +++ b/srcpkgs/python-pyasn1-modules/template @@ -1,6 +1,6 @@ # Template file for 'python-pyasn1-modules' pkgname=python-pyasn1-modules -version=0.2.1 +version=0.2.2 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -9,11 +9,11 @@ pycompile_module="pyasn1_modules" hostmakedepends="python-setuptools python3-setuptools" depends="python-pyasn1" short_desc="Collection of ASN.1-based protocols modules (Python2)" -maintainer="Peter Bui " -license="2-clause-BSD" +maintainer="Peter Bui " +license="BSD-2-Clause" homepage="https://github.com/etingof/pyasn1-modules" distfiles="${PYPI_SITE}/p/pyasn1-modules/pyasn1-modules-${version}.tar.gz" -checksum=af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc +checksum=a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547 post_install() { vlicense LICENSE.txt LICENSE diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template index 5fc190f767e..88e70c3b089 100644 --- a/srcpkgs/python-pycryptodome/template +++ b/srcpkgs/python-pycryptodome/template @@ -1,7 +1,7 @@ # Template file for 'python-pycryptodome' pkgname=python-pycryptodome -version=3.6.1 -revision=3 +version=3.6.3 +revision=1 wrksrc="pycryptodome-${version}" build_style=python-module pycompile_module="Crypto" @@ -12,7 +12,7 @@ maintainer="Wietse Kuipers " homepage="https://www.pycryptodome.org/" license="Public Domain, BSD-2-Clause" distfiles="${PYPI_SITE}/p/pycryptodome/pycryptodome-${version}.tar.gz" -checksum=15013007e393d0cc0e69f4329a47c4c8597b7f3d02c12c03f805405542f70c71 +checksum=9b2e142322273ee88c96ade5cfc0ff99b759be32a06d49ce55cd39adeb1e4541 provides="python-crypto-${version}_1" replaces="python-crypto>=0" diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template index 6aba00ac20b..8723a493e2a 100644 --- a/srcpkgs/python-pytest/template +++ b/srcpkgs/python-pytest/template @@ -1,7 +1,7 @@ # Template file for 'python-pytest' pkgname=python-pytest -version=3.6.0 -revision=2 +version=3.6.2 +revision=1 noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module @@ -12,25 +12,19 @@ depends="python-atomicwrites python-attrs python-funcsigs python-more-itertools checkdepends="python3-atomicwrites python3-hypothesis python3-more-itertools python3-pluggy python3-py python3-atomicwrites" short_desc="Simple powerful testing with Python2" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://docs.pytest.org/en/latest/" distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz" -checksum=39555d023af3200d004d09e51b4dd9fdd828baa863cded3fd6ba2f29f757ae2d +checksum=8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c alternatives=" pytest:pytest:/usr/bin/pytest2 pytest:py.test:/usr/bin/py.test2" -pre_build() { - sed -i setup.py \ - -e '/setup_requires=/d' \ - -e '/use_scm_version/,+2d' \ - -e "/name=/ a\ - version='${version}'," -} do_check() { python3 setup.py test } + post_install() { vlicense LICENSE } diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template index 5b229def066..e12ce2fea6e 100644 --- a/srcpkgs/python-pytz/template +++ b/srcpkgs/python-pytz/template @@ -1,19 +1,19 @@ # Template file for 'python-pytz' pkgname=python-pytz -version=2018.4 +version=2018.5 revision=1 noarch=yes wrksrc="pytz-${version}" build_style=python-module +pycompile_module="pytz" hostmakedepends="python-setuptools python3-setuptools" depends="python tzdata" -pycompile_module="pytz" short_desc="Python2 timezone library" maintainer="Alessio Sergi " homepage="https://pythonhosted.org/pytz/" license="MIT" distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz" -checksum=c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749 +checksum=ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277 post_install() { # use system tz database diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template index 586bb717f37..b2d407553bd 100644 --- a/srcpkgs/python-regex/template +++ b/srcpkgs/python-regex/template @@ -1,6 +1,6 @@ # Template file for 'python-regex' pkgname=python-regex -version=2018.06.09 +version=2018.06.21 revision=1 wrksrc="regex-${version}" build_style=python2-module @@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni " license="PSF" homepage="https://pypi.org/project/regex/" distfiles="${PYPI_SITE}/r/regex/regex-$version.tar.gz" -checksum=0201b4cb42f03842a75044a3d08b62a79114f753b33ee421182c631d9f5c81f5 +checksum=b172583f0c5f104e059a30dd6a1f9d20693031b156558590a745d6cc3192e283 diff --git a/srcpkgs/python-requests-oauthlib/template b/srcpkgs/python-requests-oauthlib/template index 14395261476..7b8dc1db2bb 100644 --- a/srcpkgs/python-requests-oauthlib/template +++ b/srcpkgs/python-requests-oauthlib/template @@ -1,7 +1,7 @@ # Template file for 'python-requests-oauthlib' pkgname=python-requests-oauthlib -version=0.8.0 -revision=2 +version=1.0.0 +revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Eivind Uggedal " license="ISC" homepage="https://github.com/requests/requests-oauthlib" distfiles="${PYPI_SITE}/r/requests-oauthlib/requests-oauthlib-${version}.tar.gz" -checksum=883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468 +checksum=8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f post_install() { vlicense LICENSE diff --git a/srcpkgs/python-ruamel.yaml/template b/srcpkgs/python-ruamel.yaml/template index 11b53bf6852..547ea4cc3e1 100644 --- a/srcpkgs/python-ruamel.yaml/template +++ b/srcpkgs/python-ruamel.yaml/template @@ -1,6 +1,6 @@ # Template file for 'python-ruamel.yaml' pkgname=python-ruamel.yaml -version=0.15.37 +version=0.15.41 revision=1 wrksrc="ruamel.yaml-${version}" build_style=python-module @@ -8,11 +8,12 @@ pycompile_module="ruamel/yaml" hostmakedepends="python-setuptools python3-setuptools" makedepends="python-devel python3-devel" short_desc="YAML parser/emitter in Python2" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://bitbucket.org/ruamel/yaml" +changelog="https://pypi.org/project/ruamel.yaml/" distfiles="${PYPI_SITE}/r/ruamel.yaml/ruamel.yaml-${version}.tar.gz" -checksum=509842d96fb194f79b57483b76429f8956d8f7ade3cb49d1e5aeb5c5e9ef4918 +checksum=4576b346e86deeebb80eb1b89753f805d9781cfe6111ba4d268f45d2693c8270 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python-simplejson/template index f1eb4072dd6..6db615cdc84 100644 --- a/srcpkgs/python-simplejson/template +++ b/srcpkgs/python-simplejson/template @@ -1,6 +1,6 @@ # Template file for 'python-simplejson' pkgname=python-simplejson -version=3.15.0 +version=3.16.0 revision=1 wrksrc="simplejson-${version}" build_style=python-module @@ -13,7 +13,7 @@ license="MIT, AFL-2.1" homepage="https://github.com/simplejson/simplejson" #changelog="https://raw.githubusercontent.com/simplejson/simplejson/master/CHANGES.txt" distfiles="${PYPI_SITE}/s/simplejson/simplejson-${version}.tar.gz" -checksum=ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb +checksum=b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5 do_check() { python3 setup.py test diff --git a/srcpkgs/python-tables/template b/srcpkgs/python-tables/template index 68d2a090c19..3a81cccbf23 100644 --- a/srcpkgs/python-tables/template +++ b/srcpkgs/python-tables/template @@ -1,6 +1,6 @@ # Template file for 'python-tables' pkgname=python-tables -version=3.4.3 +version=3.4.4 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -16,7 +16,7 @@ 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=b6aafe47154e2140c0a91bb38ebdb6ba67a24dd86263f1c294af8c11cb7deed4 +checksum=bdc5c073712af2a43babd139c4855fc99496bb2c3f3f5d1b4770a985e6f9ce29 alternatives=" tables:pt2to3:/usr/bin/python2-pt2to3 diff --git a/srcpkgs/python-tempora/template b/srcpkgs/python-tempora/template index 5266fd47901..307accd4f88 100644 --- a/srcpkgs/python-tempora/template +++ b/srcpkgs/python-tempora/template @@ -1,6 +1,6 @@ # Template file for 'python-tempora' pkgname=python-tempora -version=1.11 +version=1.12 revision=1 noarch=yes wrksrc="tempora-${version}" @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/jaraco/tempora" distfiles="${PYPI_SITE}/t/tempora/tempora-${version}.tar.gz" -checksum=4be862dbdc6fcbcc57f4b355258daa41fc0932af99680142bfa20836379f57a5 +checksum=2b6dbb8402804840022e6f375bd86845e38eca5515e1c5c267ea137ee4f43978 alternatives="tempora:calc-prorate:/usr/bin/calc-prorate2" pre_build() { diff --git a/srcpkgs/python-texttable/template b/srcpkgs/python-texttable/template index d398dbce139..34c284e0105 100644 --- a/srcpkgs/python-texttable/template +++ b/srcpkgs/python-texttable/template @@ -1,6 +1,6 @@ # Template file for 'python-texttable' pkgname=python-texttable -version=1.3.1 +version=1.4.0 revision=1 noarch=yes wrksrc="texttable-${version}" @@ -11,9 +11,9 @@ depends="python" short_desc="Python2 module for creating simple ASCII tables" maintainer="Sergi Alvarez " homepage="https://github.com/foutaise/texttable/" -license="LGPL-3" +license="LGPL-3.0-or-later" distfiles="${PYPI_SITE}/t/texttable/texttable-${version}.tar.gz" -checksum=0f75f5838b775bddc19f72c5bf50eb74be3815eb505ed3084e4666ce2e6c3259 +checksum=95e8cfe85f8395a7eacdfbc8f09d885b9ef3a6ac6ead0364ea721de1127aa36b python3-texttable_package() { noarch=yes diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template index 933aa466072..63ac13d390f 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.2.1 +version=3.3.2 revision=1 wrksrc="aiohttp-${version}" build_style=python3-module @@ -17,7 +17,7 @@ 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=6cf1c7fd052bc92e0be940e5b2e877a202d2d0fdf36cbf2aa3ef3c92f4e2327a +checksum=edcc93ab19880068ce460542810bdb1ee55a834184765380fd3be343a8f107d7 do_check() { python3 setup.py test diff --git a/srcpkgs/python3-httmock b/srcpkgs/python3-httmock new file mode 120000 index 00000000000..cb20ded1289 --- /dev/null +++ b/srcpkgs/python3-httmock @@ -0,0 +1 @@ +python-httmock \ No newline at end of file diff --git a/srcpkgs/python3-pam b/srcpkgs/python3-pam new file mode 120000 index 00000000000..8fd44a7dbee --- /dev/null +++ b/srcpkgs/python3-pam @@ -0,0 +1 @@ +python-pam \ No newline at end of file diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template index 452b22cfde1..6b5ca817268 100644 --- a/srcpkgs/python3-tkinter/template +++ b/srcpkgs/python3-tkinter/template @@ -7,7 +7,7 @@ _desc="Interpreted, interactive, object-oriented programming language" pkgname=python3-tkinter -version=3.6.5 +version=3.6.6 revision=1 wrksrc="Python-${version}" pycompile_dirs=" @@ -20,9 +20,9 @@ makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel short_desc="${_desc} - GUI toolkit for Python3" maintainer="Juan RP " homepage="https://www.python.org" -license="PSF-2" +license="Python-2.0" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6 +checksum=d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f pre_configure() { # Ensure that internal copies of zlib, expat and libffi are not used. diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template index 9c81c815add..3aa90dff6c2 100644 --- a/srcpkgs/python3-yarl/template +++ b/srcpkgs/python3-yarl/template @@ -1,6 +1,6 @@ # Template file for 'python3-yarl' pkgname=python3-yarl -version=1.2.5 +version=1.2.6 revision=1 wrksrc="yarl-${version}" build_style=python3-module @@ -14,7 +14,7 @@ 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=dd5d9c9ec94eb6b2467de42e7fe6725c8508070d774a13aa2f0695f0945cec19 +checksum=1083cb0eb2a68638c239d96ed6b3cfe8427f5fea62aa2e575ae5511a196b5df5 do_check() { python3 setup.py test diff --git a/srcpkgs/python3/patches/libressl-2.7.patch b/srcpkgs/python3/patches/libressl-2.7.patch deleted file mode 100644 index f4732e1f79a..00000000000 --- a/srcpkgs/python3/patches/libressl-2.7.patch +++ /dev/null @@ -1,75 +0,0 @@ -Based on https://github.com/python/cpython/pull/6210. - ---- Lib/test/test_ssl.py.orig -+++ Lib/test/test_ssl.py -@@ -1687,6 +1687,7 @@ def test_get_ca_certs_capath(self): - self.assertEqual(len(ctx.get_ca_certs()), 1) - - @needs_sni -+ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2") - def test_context_setget(self): - # Check that the context of a connected socket can be replaced. - ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) ---- Modules/_ssl.c.orig -+++ Modules/_ssl.c -@@ -106,6 +106,12 @@ struct py_ssl_library_code { - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_VERSION_1_1 1 -+# define PY_OPENSSL_1_1_API 1 -+#endif -+ -+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+# define PY_OPENSSL_1_1_API 1 - #endif - - /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 -@@ -152,16 +158,18 @@ struct py_ssl_library_code { - #define INVALID_SOCKET (-1) - #endif - --#ifdef OPENSSL_VERSION_1_1 --/* OpenSSL 1.1.0+ */ --#ifndef OPENSSL_NO_SSL2 --#define OPENSSL_NO_SSL2 --#endif --#else /* OpenSSL < 1.1.0 */ --#if defined(WITH_THREAD) -+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ -+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) - #define HAVE_OPENSSL_CRYPTO_LOCK - #endif - -+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) -+#define OPENSSL_NO_SSL2 -+#endif -+ -+#ifndef PY_OPENSSL_1_1_API -+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ -+ - #define TLS_method SSLv23_method - #define TLS_client_method SSLv23_client_method - #define TLS_server_method SSLv23_server_method -@@ -227,7 +235,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) - return s->tlsext_tick_lifetime_hint; - } - --#endif /* OpenSSL < 1.1.0 or LibreSSL */ -+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ - - - enum py_ssl_error { ---- Tools/ssl/multissltests.py.orig -+++ Tools/ssl/multissltests.py -@@ -57,8 +57,9 @@ - ] - - LIBRESSL_RECENT_VERSIONS = [ -- "2.5.3", - "2.5.5", -+ "2.6.4", -+ "2.7.1", - ] - - # store files in ../multissl diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index be1b3c6d829..ba9ed8ae288 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -3,15 +3,15 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter". # pkgname=python3 -version=3.6.5 -revision=4 +version=3.6.6 +revision=1 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (${version%.*} series)" maintainer="Juan RP " homepage="https://www.python.org" license="Python-2.0" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6 +checksum=d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f pycompile_dirs="usr/lib/python${version%.*}" hostmakedepends="pkg-config" diff --git a/srcpkgs/pywal/template b/srcpkgs/pywal/template index d5bc79e8747..cc7d8dbea8b 100644 --- a/srcpkgs/pywal/template +++ b/srcpkgs/pywal/template @@ -1,6 +1,6 @@ # Template file for 'pywal' pkgname=pywal -version=3.0.1 +version=3.1.0 revision=1 noarch=yes build_style=python3-module @@ -10,10 +10,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" +changelog="https://raw.githubusercontent.com/dylanaraps/pywal/master/CHANGELOG.md" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=6918487a58ce815670b15d73c87c340f20132146a74e374698219dc87f6ae146 +checksum=e6d89e72e6108c54ac21c215a8d718fc84328a206b614b3efcc0916aa54c91c4 post_install() { vlicense LICENSE.md diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template index e57b1db4c68..12286dea630 100644 --- a/srcpkgs/qalculate-gtk/template +++ b/srcpkgs/qalculate-gtk/template @@ -1,14 +1,14 @@ # Template file for 'qalculate-gtk' pkgname=qalculate-gtk -version=2.3.0 +version=2.6.0 revision=1 build_style=gnu-configure maintainer="Helmut Pozimski " hostmakedepends="intltool pkg-config" -makedepends="libqalculate-devel gdk-pixbuf-devel gtk+3-devel" +makedepends="libqalculate-devel gtk+3-devel" depends="gnuplot" -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://qalculate.github.io/" short_desc="A multi-purpose desktop calculator - GTK+ version" distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz" -checksum=9118c88b5517f122394abce4a85c076fde9292665b5150d4f01ef7f81a7549e6 +checksum=4918e9c88f5e49c1766fee56cec4468ecad5758d6d2b6637ae5345d159fff55a diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template index 7cc4f857d53..4fea914c963 100644 --- a/srcpkgs/qalculate/template +++ b/srcpkgs/qalculate/template @@ -1,19 +1,18 @@ # Template file for 'qalculate' pkgname=qalculate -version=2.3.0 +version=2.6.0 revision=1 wrksrc="lib${pkgname}-${version}" build_style=gnu-configure maintainer="Helmut Pozimski " hostmakedepends="intltool pkg-config" makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel - gmp-devel mpfr-devel" -depends="gnuplot" -license="GPL-2" + mpfr-devel" +license="GPL-2.0-or-later" homepage="https://qalculate.github.io/" short_desc="A multi-purpose desktop calculator" -distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz" -checksum=29335b91b5215dcc384396343b03b2bb99cf4e827b7084f84ac32e6a09661796 +distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}a/libqalculate-${version}.tar.gz" +checksum=0f575baac08669177c0003d1445f7b71eb37f46eccbbb35cc4595373c1f3391d libqalculate-data_package() { noarch=yes diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index 44f7726ee59..253e20e9c19 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,6 +1,6 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=4.1.0 +version=4.1.1 revision=1 build_style=qmake hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-tools" @@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.qbittorrent.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=fc9684b6246f1597fecf19a2d9bb64ec7618a87a7427b37410a487c13439b939 +checksum=8edc7a7fff8aa45e7bf763c91f30e064e1d7acd3f6efecb12fee420b75457ee7 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-declarative-devel qt5-svg-devel" diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 7e839603d8a..3012de3e487 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,14 +1,14 @@ # Template file for 'qemu' pkgname=qemu version=2.12.0 -revision=1 +revision=2 short_desc="Open Source Processor Emulator" maintainer="Juan RP " homepage="http://qemu.org" license="GPL-2, LGPL-2.1" distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2" checksum=c9f4a147bc915d24df9784affc611a115f42d24720a89210b479f1ba7a3f679c -nocross="https://api.travis-ci.org/jobs/210268003/log.txt" +nocross=https://api.travis-ci.org/jobs/210268003/log.txt nostrip=yes hostmakedepends="pkg-config perl python automake libtool flex" diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template index 2594aa2293f..a18a67034bb 100644 --- a/srcpkgs/qmmp/template +++ b/srcpkgs/qmmp/template @@ -1,6 +1,6 @@ # Template file for 'qmmp' pkgname=qmmp -version=1.2.1 +version=1.2.2 revision=1 build_style=cmake configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple" @@ -17,7 +17,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-or-newer" homepage="http://qmmp.ylsoftware.com" distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2" -checksum=b9314126adf72534d3ba907246b075a45a997578e5fb86e52769e01602e4e8a9 +checksum=e9dc5723f7f2a04d36167585ce1b4223c09f36c6dad1215de877dc51d1f3d606 qmmp-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template index 51c980e904c..924d52e9e2c 100644 --- a/srcpkgs/qpdf/template +++ b/srcpkgs/qpdf/template @@ -1,6 +1,6 @@ # Template file for 'qpdf' pkgname=qpdf -version=8.0.2 +version=8.1.0 revision=1 build_style=gnu-configure hostmakedepends="perl" @@ -9,22 +9,24 @@ short_desc="A Content-Preserving PDF Transformation System" maintainer="Juan RP " license="Apache-2.0" homepage="http://qpdf.sourceforge.net" +changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=b09e1730b515956903866619b466da359cc051ae8c9d8690d8e7a2aca493c8c1 +checksum=7d1f4827a3801a4b7d63f66fa50bbe237e74911801f3d31ee9f22f73e36370d4 libqpdf_package() { short_desc+=" - shared library" pkg_install() { - vmove usr/lib/*.so.* + vmove "usr/lib/*.so.*" } } + libqpdf-devel_package() { depends="libqpdf>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/qt5-fsarchiver/patches/cross.patch b/srcpkgs/qt5-fsarchiver/patches/cross.patch new file mode 100644 index 00000000000..074c4a6c940 --- /dev/null +++ b/srcpkgs/qt5-fsarchiver/patches/cross.patch @@ -0,0 +1,11 @@ +--- qt5-fsarchiver.pro.orig 2018-06-22 00:01:06.101404975 +0200 ++++ qt5-fsarchiver.pro 2018-06-22 00:01:45.933869386 +0200 +@@ -9,7 +9,7 @@ + QT += widgets gui core + + DEFINES += HAVE_CONFIG_H _REENTRANT _FILE_OFFSET_BITS=64 _LARGEFILE64_SOURCE _GNU_SOURCE HAVE_QT5 +-INCLUDEPATH += . src /usr/include/ext2fs /usr/include/et /usr/include/e2p /usr/include/blkid /usr/include/uuid ++INCLUDEPATH += . src $$(XBPS_CROSS_BASE)/usr/include/ext2fs $$(XBPS_CROSS_BASE)/usr/include/et $$(XBPS_CROSS_BASE)/usr/include/e2p $$(XBPS_CROSS_BASE)/usr/include/blkid $$(XBPS_CROSS_BASE)/usr/include/uuid + LIBS += -L/usr/lib -lQt5Gui -lQt5Core -lpthread -lrt -llzma -lext2fs -lcom_err -le2p -lblkid -luuid -lz -llz4 -lbz2 -llzo2 -lgcrypt -lgpg-error -lzstd + OBJECTS_DIR = build + MOC_DIR = build diff --git a/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch b/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch new file mode 100644 index 00000000000..64115795cbb --- /dev/null +++ b/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch @@ -0,0 +1,20 @@ +--- qt5-fsarchiver.pro.orig 2018-06-21 23:15:21.665117797 +0200 ++++ qt5-fsarchiver.pro 2018-06-21 23:15:36.159276907 +0200 +@@ -147,7 +147,7 @@ + src/writebuf.c + RESOURCES += src/icon.qrc + # install +- target.path = /usr/sbin ++ target.path = /usr/bin + icon.files = src/images/harddrive1.png + icon.path = /usr/share/app-install/icons + autostart.files = starter/gnome-qt5-fsarchiver.desktop +@@ -158,7 +158,7 @@ + autostart2.path = /usr/share/applications + doc.files = doc + doc.path = /usr/share/doc/qt5-fsarchiver/doc +- smbfind.files = src/sbin ++ smbfind.files = src/bin + smbfind.path = /usr + TRANSLATIONS += translations/qt5-fsarchiver_ar.ts \ + translations/qt5-fsarchiver_ca.ts \ diff --git a/srcpkgs/qt5-fsarchiver/patches/musl.patch b/srcpkgs/qt5-fsarchiver/patches/musl.patch new file mode 100644 index 00000000000..19728cff1c7 --- /dev/null +++ b/srcpkgs/qt5-fsarchiver/patches/musl.patch @@ -0,0 +1,20 @@ +--- src/common.c.orig 2018-06-21 23:29:12.238999543 +0200 ++++ src/common.c 2018-06-21 23:30:28.347795214 +0200 +@@ -34,7 +34,7 @@ + #include + #include + +-#ifdef HAVE_EXECINFO_H ++#if defined(HAVE_EXECINFO_H) && defined(__GLIBC__) + #include + #endif + +@@ -567,7 +567,7 @@ + + int format_stacktrace(char *buffer, int bufsize) + { +-#ifdef HAVE_EXECINFO_H ++#if defined(HAVE_EXECINFO_H) && defined(__GLIBC__) + const int stack_depth=20; + void *temp[stack_depth]; + char **strings; diff --git a/srcpkgs/qt5-fsarchiver/template b/srcpkgs/qt5-fsarchiver/template new file mode 100644 index 00000000000..d7e85f04200 --- /dev/null +++ b/srcpkgs/qt5-fsarchiver/template @@ -0,0 +1,26 @@ +# Template file for 'qt5-fsarchiver' +pkgname=qt5-fsarchiver +version=0.8.4 +revision=1 +_realversion=0.8.4-6 +wrksrc=${pkgname} +build_style=qmake +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="qt5-devel liblz4-devel liblzma-devel lzo-devel libzstd-devel + libgcrypt-devel e2fsprogs-devel attr-devel" +depends="fsarchiver" +short_desc="Program to save/restore partitions, folders and MBR/GPT" +maintainer="Helmut Pozimski " +license="GPL-2.0-only" +homepage="https://sourceforge.net/projects/qt4-fsarchiver" +distfiles="${SOURCEFORGE_SITE}/qt4-fsarchiver/${pkgname}-${_realversion}.tar.gz" +checksum=fea22f1847d730c0c28eb2f6c8aee6a17108a4af884546387faba7eea74d30c1 + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5" + for i in ${XBPS_CROSS_BASE}/usr/include/qt5/*; do + CXXFLAGS+=" -I$i" + done + fi +} diff --git a/srcpkgs/qt5integration/patches/libqtxdg.patch b/srcpkgs/qt5integration/patches/libqtxdg.patch new file mode 100644 index 00000000000..1b50fa0c790 --- /dev/null +++ b/srcpkgs/qt5integration/patches/libqtxdg.patch @@ -0,0 +1,11 @@ +--- platformthemeplugin/main.cpp 2018-03-14 10:03:49.000000000 +0100 ++++ - 2018-05-10 16:31:27.176858073 +0200 +@@ -18,7 +18,7 @@ + #include + #include "qdeepintheme.h" + +-#include ++#include + + QT_BEGIN_NAMESPACE + diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template new file mode 100644 index 00000000000..640d81c52a6 --- /dev/null +++ b/srcpkgs/qt5integration/template @@ -0,0 +1,19 @@ +# Template file for 'qt5integration' +pkgname=qt5integration +version=0.3.0 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="libqtxdg-devel dtkwm-devel dtkwidget-devel mtdev-devel + qt5-svg-devel qt5-x11extras-devel qt5-multimedia-devel gtk+-devel" +short_desc="Qt platform theme integration plugins for Deepin Desktop Environment" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/qt5integration" +changelog="https://github.com/linuxdeepin/qt5integration/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/qt5integration/archive/${version}.tar.gz" +checksum=abe242eb1315b0bcedd36aac14c888b17de564190e37032b51166fba9e6b71f8 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-devel qt5-x11extras-devel" +fi diff --git a/srcpkgs/qterminal/template b/srcpkgs/qterminal/template index f9fd021bd57..f0f371ca2a7 100644 --- a/srcpkgs/qterminal/template +++ b/srcpkgs/qterminal/template @@ -1,16 +1,15 @@ # Template file for 'qterminal' pkgname=qterminal -version=0.8.0 +version=0.9.0 revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="qt5-host-tools qt5-tools-devel" -makedepends="qtermwidget-devel qt5-tools-devel qt5-x11extras-devel - liblxqt-devel lxqt-build-tools" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="qtermwidget-devel qt5-tools-devel qt5-x11extras-devel" depends="desktop-file-utils" short_desc="Lightweight terminal emulator written in Qt" maintainer="Juan RP " -license="GPL-2" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/qterminal/releases/download/${version}/qterminal-${version}.tar.xz" -checksum=a741a8688e696537c3bb2dfaa632b9dcc11f3672b9c6a031354b465de5fd987a +license="GPL-2.0-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/qterminal/releases/download/${version}/qterminal-${version}.tar.xz" +checksum=4157980356af4e05cfe5fa3badecba6e25715a35e2b7f9a830da87bcca519fee diff --git a/srcpkgs/qtermwidget/template b/srcpkgs/qtermwidget/template index 01a02b117e8..1701388f87d 100644 --- a/srcpkgs/qtermwidget/template +++ b/srcpkgs/qtermwidget/template @@ -1,25 +1,25 @@ # Template file for 'qtermwidget' pkgname=qtermwidget -version=0.8.0 +version=0.9.0 revision=1 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" -hostmakedepends="qt5-qmake qt5-host-tools qt5-devel qt5-tools-devel" -makedepends="qt5-devel lxqt-build-tools qt5-tools-devel" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="qt5-tools-devel" short_desc="The terminal widget for QTerminal" maintainer="Juan RP " -license="GPL-2" -homepage="http://lxqt.org/" -distfiles="https://github.com/lxde/qtermwidget/releases/download/${version}/qtermwidget-${version}.tar.xz" -checksum=ef01c2a2bedff008578b65efd47b3fff8e542dfcdf9779b547533c9c75825169 +license="GPL-2.0-or-later" +homepage="https://lxqt.org/" +distfiles="https://github.com/lxqt/qtermwidget/releases/download/${version}/qtermwidget-${version}.tar.xz" +checksum=e39ce62fec18112634630654f41f08f4be4638bcf0bebbc89d71c9aefdfa38b0 qtermwidget-devel_package() { short_desc+=" - development files" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/*.so - vmove usr/share/cmake + vmove usr/lib/cmake } } diff --git a/srcpkgs/quassel/template b/srcpkgs/quassel/template index 99724ad73ed..2b24617e00b 100644 --- a/srcpkgs/quassel/template +++ b/srcpkgs/quassel/template @@ -1,47 +1,44 @@ # Template file for 'quassel' pkgname=quassel -version=0.12.4 -revision=2 +version=0.12.5 +revision=1 build_style=cmake +configure_args="-DEMBED_DATA=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DWANT_CORE=ON + -DUSE_QT5=ON" +hostmakedepends="pkg-config qt5-host-tools qt5-qmake" +makedepends="qt5-tools-devel phonon-qt5-devel qca-qt5-devel zlib-devel + libdbusmenu-qt5-devel qt5-script-devel qt5-plugin-tds + qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-mysql qt5-plugin-odbc" +depends="qt5-plugin-sqlite quassel-client-shared>=${version}_${revision}" _desc="Modern, cross-platform, distributed graphical IRC client" short_desc="${_desc} - standalone client" maintainer="Toyam Cox " -hostmakedepends="pkg-config" -makedepends="zlib-devel qt-devel qt-webkit-devel libdbusmenu-qt-devel phonon-devel qca-devel" -_common_deps="desktop-file-utils" -depends="${_common_deps} qt-plugin-sqlite quassel-client-shared>=${version}_${revision}" -license="GPL-3" -configure_args="-DEMBED_DATA=1 -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DWANT_CORE=ON -DWITH_OPENSSL=ON -DWITH_DBUS=ON -DWITH_PHONON=ON -DWITH_WEBKIT=ON" +license="GPL-2.0, GPL-3.0" +homepage="https://www.quassel-irc.org" +distfiles="https://quassel-irc.org/pub/quassel-${version}.tar.bz2" +checksum=1894574dfd79654152a5b7427e7df592b055ae908230504f98a4cb48961e74e2 system_accounts="quassel" -homepage="http://www.quassel-irc.org" -distfiles="http://quassel-irc.org/pub/quassel-${version}.tar.bz2" -checksum=93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d post_install() { vsv quasselcore } -quassel-shared_package() { - short_desc="${_desc} - common files" - unset depends - pkg_install() { - vmove /usr/share/icons - vmove /usr/share/pixmaps - } -} - quassel-client-shared_package() { + replaces="quassel-shared>=0" + conflicts="quassel-shared>=0" short_desc="${_desc} - common client files" - depends="quassel-shared>=${version}_${revision}" + depends="desktop-file-utils" pkg_install() { vmove /usr/share/quassel + vmove /usr/share/icons + vmove /usr/share/pixmaps } } quassel-core_package() { replaces="quasselcore>=0" conflicts="quasselcore>=0" - depends="${_common_deps} qt-plugin-sqlite quassel-shared>=${version}_${revision}" + depends="qt5-plugin-sqlite" short_desc="${_desc} - server" pkg_install() { vmove /usr/bin/quasselcore @@ -52,7 +49,7 @@ quassel-core_package() { quassel-client_package() { replaces="quasselclient>=0" conflicts="quasselclient>=0" - depends="${_common_deps} quassel-client-shared>=${version}_${revision}" + depends="quassel-client-shared>=${version}_${revision}" short_desc="${_desc} - distributed client" pkg_install() { vmove /usr/share/applications/quasselclient.desktop diff --git a/srcpkgs/quodlibet/template b/srcpkgs/quodlibet/template index 76c5381b5e0..53f270d127d 100644 --- a/srcpkgs/quodlibet/template +++ b/srcpkgs/quodlibet/template @@ -1,17 +1,17 @@ # Template file for 'quodlibet' pkgname=quodlibet -version=4.0.2 +version=4.1.0 revision=1 noarch=yes build_style=python3-module -hostmakedepends="python3-devel intltool" -short_desc="An audio library tagger, manager and player" -homepage="https://quodlibet.readthedocs.org/en/latest/" -license="GPL-2+" -maintainer="raphaelnepomuceno " -depends="gtk+3 gst-plugins-base1 gst-plugins-good1 gst-plugins-bad1 -gst-plugins-ugly1 python3-dbus python3-gobject python3-cairo python3-feedparser -desktop-file-utils python3-mutagen python3-inotify" +hostmakedepends="intltool python3-devel" +depends="desktop-file-utils gst-plugins-bad1 gst-plugins-base1 gst-plugins-good1 + gst-plugins-ugly1 gtk+3 hicolor-icon-theme python3-dbus python3-feedparser + python3-gobject python3-inotify python3-mutagen" pycompile_module="quodlibet" +short_desc="Music Library/Editor/Player" +maintainer="raphaelnepomuceno " +license="GPL-2.0-or-later" +homepage="https://quodlibet.readthedocs.io/en/latest/" distfiles="https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz" -checksum=df156eaee6779a98f543c450f7bf44fae55dbcee6ddd0310f504d971074a5a1c +checksum=5f54a61fe18cb1d2b8642f22bba144cb753ee5e1ae5d79c9798ac4f235e99ded diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index 265fbb7d618..e18290e307c 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,6 +1,6 @@ # Template file for 'qutebrowser' pkgname=qutebrowser -version=1.3.2 +version=1.3.3 revision=1 noarch=yes build_style=python3-module @@ -13,9 +13,9 @@ short_desc="Keyboard-focused browser with a minimal GUI" maintainer="Eivind Uggedal " license="GPL-3.0-or-later" homepage="https://qutebrowser.org/" -#changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc" +changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc" distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=ff4bf5f74e6ba4f76e5bee8ab5c370c0fb8bbd99123592262c09605c5065c27f +checksum=68cab76dbd23ef77c29865a80e3eb508a3b5392e9f190c497f8a93dada5c9906 pre_build() { a2x -f manpage doc/${pkgname}.1.asciidoc diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template index 62fcd745205..06ba38a4f5c 100644 --- a/srcpkgs/rakudo/template +++ b/srcpkgs/rakudo/template @@ -1,6 +1,6 @@ -# Template build file for 'rakudo'. +# Template file for 'rakudo' pkgname=rakudo -version=2018.04.1 +version=2018.06 revision=1 build_style=configure configure_script="perl Configure.pl" @@ -12,7 +12,8 @@ short_desc="Rakudo is an implementation of Perl 6 language" maintainer="Ruslan " license="Artistic-2.0" homepage="https://rakudo.org" +changelog="https://raw.githubusercontent.com/rakudo/rakudo/master/docs/ChangeLog" distfiles="https://github.com/rakudo/rakudo/archive/${version}.tar.gz" -checksum=b9696069298f6070d9f961dcb6a58876245fcaf54161f2d55b2db51acb7b32de +checksum=b93588f38836edabf3ded0842f81e9ab950e4792c7e0b230e800f1bb6ccde8eb nocross=yes -make_check_target="test" +make_check_target=test diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template index bae660d84d2..e7a66554edd 100644 --- a/srcpkgs/rclone/template +++ b/srcpkgs/rclone/template @@ -1,7 +1,7 @@ # Template file for 'rclone' pkgname=rclone -version=1.41 -revision=2 +version=1.42 +revision=1 build_style=go go_import_path="github.com/ncw/rclone" short_desc="A rsync for cloud storage" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="MIT" homepage="https://rclone.org/downloads/" distfiles="https://github.com/ncw/rclone/archive/v${version}.tar.gz" -checksum=4f4cadb4db3a7daff7fa6539eb45273fad5203a0cc9c3a2bd8c2bdb8b349d872 +checksum=fa84044fd387b7366de1234fba073dacd0fd7015b36751f3ec18514b704a2fd6 post_install() { vlicense COPYING diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index 773383cfaac..3b83c2fe94a 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -1,17 +1,17 @@ -# Template build file for 'readline'. +# Template file for 'readline' pkgname=readline _dist_ver=7.0 -_patch_ver=003 -version=${_dist_ver}.${_patch_ver} +_patch_ver=005 +version="${_dist_ver}.${_patch_ver}" revision=1 -wrksrc=${pkgname}-${_dist_ver} +wrksrc="${pkgname}-${_dist_ver}" build_style=gnu-configure configure_args="--with-curses --enable-multibyte" makedepends="ncurses-devel" short_desc="The GNU Readline Library" maintainer="Juan RP " -homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html" license="GPL-3.0-or-later" +homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_dist_ver}.tar.gz" checksum=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template index 31b830e8c11..657cf4fa2da 100644 --- a/srcpkgs/redis/template +++ b/srcpkgs/redis/template @@ -1,18 +1,19 @@ # Template file for 'redis' pkgname=redis -version=4.0.9 +version=4.0.10 revision=1 makedepends="jemalloc-devel libatomic-devel" checkdepends="tcl-devel" -homepage="https://redis.io" -distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz" short_desc="Advanced key-value store" maintainer="Enno Boland " license="BSD-3-Clause" -checksum=df4f73bc318e2f9ffb2d169a922dec57ec7c73dd07bccf875695dbeecd5ec510 +homepage="https://redis.io" +#changelog="https://raw.githubusercontent.com/antirez/redis/4.0/00-RELEASENOTES" +distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz" +checksum=1db67435a704f8d18aec9b9637b373c34aa233d65b6e174bdac4c1b161f38ca4 system_accounts="redis" -redis_homedir="/var/lib/redis" +redis_homedir=/var/lib/redis conf_files="/etc/redis/redis.conf" do_configure() { @@ -22,6 +23,7 @@ do_configure() { -e "s|^pidfile .*|pidfile /run/redis/redis.pid|" redis.conf sed -i -e "s|^FINAL_LIBS=.*|& -latomic|" src/Makefile } + do_build() { case "$XBPS_TARGET_MACHINE" in *-musl) _malloc="none";; @@ -29,9 +31,11 @@ do_build() { esac make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" V=1 MALLOC=${_malloc} ${makejobs} } + do_check() { make test } + do_install() { make INSTALL_BIN=${DESTDIR}/usr/bin PREFIX=/usr install vlicense COPYING diff --git a/srcpkgs/rednotebook/template b/srcpkgs/rednotebook/template index e67319e0e82..d683f64d941 100644 --- a/srcpkgs/rednotebook/template +++ b/srcpkgs/rednotebook/template @@ -1,6 +1,6 @@ # Template file for 'rednotebook' pkgname=rednotebook -version=2.4 +version=2.5 revision=1 noarch=yes build_style=python3-module @@ -8,9 +8,9 @@ pycompile_module="rednotebook" hostmakedepends="python3" depends="desktop-file-utils hicolor-icon-theme python3-enchant python3-gobject python3-yaml webkit2gtk" -maintainer="cr6git " short_desc="Cross-platform, modern desktop journal" +maintainer="cr6git " +license="GPL-2.0-or-later" homepage="https://rednotebook.sourceforge.io" -license="GPL-2" distfiles="https://github.com/jendrikseipp/rednotebook/archive/v${version}.tar.gz" -checksum=3211623d63832152bf51533034db4b482f418e05c3726788afdbfc1e1269bf06 +checksum=8d23951d3865cda53c2f65b03fa1e94a213c0ffeabad01ea48f357991713aede diff --git a/srcpkgs/rex/template b/srcpkgs/rex/template index 933ee3c4ab1..f269e77bf2d 100644 --- a/srcpkgs/rex/template +++ b/srcpkgs/rex/template @@ -1,20 +1,23 @@ # Template file for 'rex' pkgname=rex -version=1.4.1 +version=1.6.0 revision=1 wrksrc="Rex-${version}" noarch=yes build_style=perl-module -hostmakedepends="perl" -makedepends="${hostmakedepends} - perl-Devel-Caller perl-Hash-Merge perl-IO-String perl-IO-Tty perl-JSON-XS - perl-LWP perl-List-MoreUtils perl-Net-OpenSSH perl-Net-SFTP-Foreign - perl-PadWalker perl-Sort-Naturally perl-Term-ReadKey perl-Text-Glob perl-URI - perl-XML-Simple perl-YAML" +hostmakedepends="perl perl-Clone-Choose perl-Data-Validate-IP + perl-Devel-Caller perl-Digest-HMAC perl-Hash-Merge perl-IO-String + perl-IO-Tty perl-JSON-MaybeXS perl-LWP perl-List-MoreUtils + perl-Net-OpenSSH perl-Net-SFTP-Foreign perl-PadWalker + perl-Parallel-ForkManager perl-Sort-Naturally perl-String-Escape + perl-Term-ReadKey perl-Text-Glob perl-URI perl-XML-Simple perl-YAML" +makedepends="perl" +checkdepends="${hostmakedepends} + perl-Test-Deep perl-Test-Pod perl-Test-UseAllModules" depends="${makedepends}" short_desc="Perl-based Deployment and Configuration Management" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="http://www.rexify.org/" license="Apache-2.0" distfiles="${CPAN_SITE}/Mojolicious/JFRIED/Rex-${version}.tar.gz" -checksum=6898add0c9ad8b30b1ea5f70730a53cf899e4fe7228e1f8d5006d6694cfe8eb2 +checksum=1c35c5a48018205bc540d0cc1d11fc2a47579b1319262940412ba2b8372459d6 diff --git a/srcpkgs/rhythmbox/patches/fix-build.patch b/srcpkgs/rhythmbox/patches/fix-build.patch new file mode 100644 index 00000000000..37f83743f38 --- /dev/null +++ b/srcpkgs/rhythmbox/patches/fix-build.patch @@ -0,0 +1,31 @@ +From: Bastien Nocera +Date: Mon, 9 Oct 2017 13:11:47 +0200 +Subject: fmradio: Fix build with GStreamer master + +The plugin description is not supposed to be a string constant, but an +unescaped string, to be concatenated with function names. + +This used to be acceptable (though would have warned), but breaks with +the GStreamer 1.13 development branch. + +rb-fm-radio-gst-src.c:181:6: error: pasting ""rbsilencesrc"" and "_get_desc" does not give a valid preprocessing token + "rbsilencesrc", + ^ + +https://bugzilla.gnome.org/show_bug.cgi?id=788706 +--- + plugins/fmradio/rb-fm-radio-gst-src.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- plugins/fmradio/rb-fm-radio-gst-src.c ++++ plugins/fmradio/rb-fm-radio-gst-src.c +@@ -178,7 +178,7 @@ plugin_init (GstPlugin *plugin) + + GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, +- "rbsilencesrc", ++ rbsilencesrc, + "element to output silence", + plugin_init, + VERSION, + diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index a8ee4b5bb9a..4e06c3e3518 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -1,7 +1,7 @@ # Template file for 'rhythmbox' pkgname=rhythmbox version=3.4.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-webkit --with-gudev --without-hal $(vopt_if gir --enable-vala)" @@ -39,7 +39,7 @@ rhythmbox-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - if [ -n "$build_option_gir" ]; then + if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi vmove usr/share/gtk-doc diff --git a/srcpkgs/rinse/update b/srcpkgs/rinse/update new file mode 100644 index 00000000000..f7dfcf27d57 --- /dev/null +++ b/srcpkgs/rinse/update @@ -0,0 +1 @@ +site=https://salsa.debian.org/debian/rinse/tags diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template index fe23f4df458..feb96b78b6c 100644 --- a/srcpkgs/ristretto/template +++ b/srcpkgs/ristretto/template @@ -1,14 +1,14 @@ # Template file for 'ristretto' pkgname=ristretto -version=0.8.2 -revision=2 +version=0.8.3 +revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool" -makedepends="libexif-devel dbus-glib-devel libxfce4ui-devel exo-devel file-devel" -depends="hicolor-icon-theme desktop-file-utils" +hostmakedepends="intltool pkg-config" +makedepends="exo-devel file-devel libexif-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Picture-viewer for the Xfce desktop environment" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://docs.xfce.org/apps/ristretto/start" -distfiles="https://archive.xfce.org/src/apps/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=f8f3b77ca6fc77ddf8cff1bb52e5c5802c462663f72f324393b3a0360f6901b8 +distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" +checksum=8c9c11760816dfd9ed57fb8b9df86c6a98a2604ab551be3133996a1c32ca2665 diff --git a/srcpkgs/rofi-devel b/srcpkgs/rofi-devel new file mode 120000 index 00000000000..cada3fa3c27 --- /dev/null +++ b/srcpkgs/rofi-devel @@ -0,0 +1 @@ +rofi \ No newline at end of file diff --git a/srcpkgs/rofi/template b/srcpkgs/rofi/template index ff3d6394e4e..3815f4433c7 100644 --- a/srcpkgs/rofi/template +++ b/srcpkgs/rofi/template @@ -1,7 +1,7 @@ # Template file for 'rofi' pkgname=rofi version=1.5.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="flex glib-devel pkg-config" makedepends="check-devel i3-devel libXinerama-devel librsvg-devel @@ -17,3 +17,12 @@ checksum=f1bc0911201e528d443141d53de43be97538ee7484f8c278c38e2fab160aa173 post_install() { vlicense COPYING } + +rofi-devel_package() { + short_desc+=" - development files" + depends="libglib-devel cairo-devel" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/roswell/template b/srcpkgs/roswell/template index e4b443bbccb..de5b438017c 100644 --- a/srcpkgs/roswell/template +++ b/srcpkgs/roswell/template @@ -1,6 +1,6 @@ # Template file for 'roswell' pkgname=roswell -version=18.3.10.89 +version=18.6.10.92 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -9,8 +9,8 @@ short_desc="Lisp installer and launcher for major environment that just works" maintainer="Liam Howley " license="MIT" homepage="https://github.com/roswell/roswell" -distfiles="https://github.com/roswell/roswell/releases/download/v${version}/roswell_$version.orig.tar.gz" -checksum=3606469a787bd83f5f9bf887c49ebb264339ef18977097f63270356ce50c20b7 +distfiles="https://github.com/roswell/roswell/archive/v${version}.tar.gz" +checksum=d1d2fc0da0981f6696f3b08a0b8b2547d2230e10ba32e7290c5472a2a7793c30 pre_configure() { sh bootstrap diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index 285612ffb58..1113fd9d95a 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -8,11 +8,11 @@ hostmakedepends="automake gettext-devel libtool nss-devel pkg-config python-setuptools" makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel libcap-devel lua52-devel nss-devel popt-devel python-devel" -checkdepends="${makedepends}" short_desc="Red Hat Package Management Utils" maintainer="maxice8 " license="GPL-2.0-or-later" homepage="http://rpm.org" +changelog="http://rpm.org/wiki/Releases/${version}.html" distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2" checksum=43f40e2ccc3ca65bd3238f8c9f8399d4957be0878c2e83cba2746d2d0d96793b conflicts="rpmextract>=0" # Both provide rpm2cpio @@ -24,7 +24,7 @@ CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr" case "$XBPS_TARGET_MACHINE" in # Musl requires gettext to be included and it's cflag added otherwise # it fails with _nl_msg_cat_cntr undefined reference error - *-musl*) + *-musl) makedepends+=" gettext-devel" LDFLAGS+=" -lintl" ;; @@ -34,8 +34,10 @@ pre_configure() { autoreconf -fi } -rpm-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" +librpm-devel_package() { + depends="librpm-${version}_${revision} librpmbuild-${version}_${revision} + librpmsign-${version}_${revision} librpmio-${version}_${revision} db-devel + popt-devel liblzma-devel zlib-devel bzip2-devel nss-devel lua52-devel" short_desc+=" - development files" depends="${makedepends}" pkg_install() { @@ -46,11 +48,37 @@ rpm-devel_package() { } rpm-python_package() { - short_desc+=" - python bindings" - depends="${sourcepkg}>=${version}_${revision}" - noarch=yes pycompile_module="rpm" + short_desc+=" - python bindings" pkg_install() { vmove usr/lib/python2* } } + +librpm_package() { + short_desc+=" - rpm library" + pkg_install() { + vmove "usr/lib/librpm.so.*" + } +} + +librpmbuild_package() { + short_desc+=" - rpmbuild library" + pkg_install() { + vmove "usr/lib/librpmbuild.so.*" + } +} + +librpmsign_package() { + short_desc+=" - rpmsign library" + pkg_install() { + vmove "usr/lib/librpmsign.so.*" + } +} + +librpmio_package() { + short_desc+=" - rpmio library" + pkg_install() { + vmove "usr/lib/librpmio.so.*" + } +} diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index d2aa8431bc8..eef6d7a6dee 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,6 +1,6 @@ # Template file for 'rspamd' pkgname=rspamd -version=1.7.5 +version=1.7.6 revision=1 build_style=cmake configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd @@ -11,11 +11,11 @@ makedepends="LuaJIT-devel fann-devel file-devel gd-devel gmime-devel short_desc="Fast, free and open-source spam filtering system" maintainer="Enno Boland " license="Apache-2.0" -homepage="http://rspamd.com/" +homepage="https://rspamd.com/" distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz" -checksum=5aa2ff72cc74ea1fd220cd3a941745268666465be712c4d014a9fc937b7b1f5f +checksum=297fb8564de212b27e1da683a839cd833c26fc802de66bc676ddf1b92df6d88e system_accounts="rspamd" -rspamd_homedir="/var/lib/rspamd" +rspamd_homedir=/var/lib/rspamd conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf" case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 0517acb5dcd..7e8383f2894 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,6 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=8.35.0 +version=8.36.0 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql @@ -16,9 +16,9 @@ short_desc="An Enhanced multi-threaded syslog daemon" maintainer="Juan RP " license="GPL-3.0-or-later, Apache-2.0" homepage="https://www.rsyslog.com" -#changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog" -distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=d216a7f7c88341d5964657e61a33193c13d884c988822fced9fce3ab0b1f1082 +changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog" +distfiles="${homepage}/files/download/rsyslog/${pkgname}-${version}.tar.gz" +checksum=8a4b5beb92c6b308c3d14de2364c2788f62ef5d37ca0448144619edfe508ee70 conf_files="/etc/rsyslog.conf" make_dirs="/etc/rsyslog.d 0755 root root" lib32disabled=yes diff --git a/srcpkgs/rtv/template b/srcpkgs/rtv/template index e3e265012a8..faa5f48f50e 100644 --- a/srcpkgs/rtv/template +++ b/srcpkgs/rtv/template @@ -1,6 +1,6 @@ # Template file for 'rtv' pkgname=rtv -version=1.22.1 +version=1.23.0 revision=1 noarch=yes build_style=python3-module @@ -12,7 +12,7 @@ maintainer="dleeram " license="MIT" homepage="https://github.com/michael-lazar/${pkgname}" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=77c9bbd0e8cd85b6c2daad7b6674d1865f06bfde0a5c2557e12ef1dc1acb2789 +checksum=66d458c37bdf377b191c899311b6b08da73312635e472cc0f55b510ad8293619 post_install() { vlicense LICENSE diff --git a/srcpkgs/rubberband/patches/ignore-JNI-target-on-install.patch b/srcpkgs/rubberband/patches/ignore-JNI-target-on-install.patch new file mode 100644 index 00000000000..fbea1bd1800 --- /dev/null +++ b/srcpkgs/rubberband/patches/ignore-JNI-target-on-install.patch @@ -0,0 +1,12 @@ +diff --git Makefile.in Makefile.in +index 3a70a71..76f8552 100644 +--- Makefile.in ++++ Makefile.in +@@ -183,7 +183,6 @@ install: all + cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) + ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION) + ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION) +- cp -f $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) + cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) + cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR) + cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) diff --git a/srcpkgs/rubberband/template b/srcpkgs/rubberband/template index aeb73e1552d..9335732524b 100644 --- a/srcpkgs/rubberband/template +++ b/srcpkgs/rubberband/template @@ -1,7 +1,7 @@ # Template file for 'rubberband' pkgname=rubberband -version=1.8.1 -revision=2 +version=1.8.2 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="ladspa-sdk libsamplerate-devel vamp-plugin-sdk-devel fftw-devel" @@ -9,9 +9,10 @@ depends="libvamp-plugin-sdk" short_desc="Time-stretching and pitch-shifting audio library" maintainer="Juan RP " license="GPL-2" -homepage="http://www.breakfastquay.com/rubberband/" -distfiles="http://code.breakfastquay.com/attachments/download/16/${pkgname}-${version}.tar.bz2" -checksum=ff0c63b0b5ce41f937a8a3bc560f27918c5fe0b90c6bc1cb70829b86ada82b75 +homepage="https://breakfastquay.com/rubberband/" +changelog="https://breakfastquay.com/news.html" +distfiles="https://breakfastquay.com/files/releases/rubberband-${version}.tar.bz2" +checksum=86bed06b7115b64441d32ae53634fcc0539a50b9b648ef87443f936782f6c3ca librubberband_package() { short_desc+=" - Runtime libraries" diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template index b9515d35230..1af98b892a5 100644 --- a/srcpkgs/runit-void/template +++ b/srcpkgs/runit-void/template @@ -1,15 +1,15 @@ # Template file for 'runit-void' pkgname=runit-void -version=20171102 -revision=3 +version=20180623 +revision=1 wrksrc="void-runit-${version}" build_style=gnu-makefile -homepage="http://www.voidlinux.eu" +homepage="https://github.com/void-linux/void-runit" short_desc="Void Linux runit scripts" maintainer="Juan RP " license="Public Domain" -distfiles="https://github.com/voidlinux/void-runit/archive/${version}.tar.gz" -checksum=689790985d36bdda75bca6f1382c99092247b9534c22b15a1ca4a94c674a7843 +distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz" +checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c depends="virtual?awk procps-ng runit" conf_files=" diff --git a/srcpkgs/sacc/template b/srcpkgs/sacc/template new file mode 100644 index 00000000000..99ac0a85728 --- /dev/null +++ b/srcpkgs/sacc/template @@ -0,0 +1,23 @@ +pkgname=sacc +version=1.00 +revision=1 +wrksrc="$pkgname-v$version" +build_style="gnu-makefile" +makedepends="ncurses-devel" +short_desc="Terminal gopher client" +maintainer="Quentin Rameau " +license="ISC" +homepage="gopher://gopher.fifth.space/1/scm/sacc" +distfiles="ftp://ftp.bitreich.org/releases/$pkgname/$pkgname-v$version.tgz" +checksum=e4cc0fe68e4fa5b75eb2fcf750d4d9d10cf22db41ae8f256748d8458a268bf66 + +post_extract() { + if [ -r "$FILESDIR/config.h" ] + then + cp "$FILESDIR/config.h" . + fi +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template index 017948ea0ac..e58fe69d7ac 100644 --- a/srcpkgs/sakura/template +++ b/srcpkgs/sakura/template @@ -1,14 +1,14 @@ # Template file for 'sakura' pkgname=sakura -version=3.5.0 +version=3.6.0 revision=1 build_style=cmake +hostmakedepends="perl pkg-config" +makedepends="vte3-devel" +depends="desktop-file-utils" short_desc="Simple but powerful libvte based terminal emulator" maintainer="Juan RP " -license="GPL-2" -hostmakedepends="perl pkg-config" -makedepends="gtk+3-devel vte3-devel" -depends="desktop-file-utils" +license="GPL-2.0-only" homepage="https://launchpad.net/sakura" distfiles="https://launchpad.net/sakura/trunk/${version}/+download/sakura-${version}.tar.bz2" -checksum=eb30ede41083fda2b07c6a3b7393150f48867e81d28ef70b15824740cab00c3a +checksum=a1161f3cedde20a7e1bc5981b3e6ab3b91d2cd3a5ffe35c792a7fa402a1e86e0 diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template index 0f537e265db..11889ad884a 100644 --- a/srcpkgs/salt/template +++ b/srcpkgs/salt/template @@ -1,22 +1,22 @@ # Template file for 'salt' pkgname=salt -version=2018.3.0 -revision=2 +version=2018.3.2 +revision=1 noarch=yes build_style=python2-module pycompile_module="salt" -conf_files="/etc/salt/*" hostmakedepends="python-devel" # XXX remove python-futures once tornado will be updated to 5 depends="python-yaml python-Jinja2 python-requests python-pyzmq python-futures python-M2Crypto python-tornado python-msgpack dmidecode pciutils" -#changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html" short_desc="Remote execution system, and configuration manager" maintainer="Toyam Cox " license="Apache-2.0" homepage="http://saltstack.org/" +changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html" distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz" -checksum=a0a45d22fdf6961542a419b7e09568a3118e2b019ffe7bab9dee5aeb55b56b31 +checksum=d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd +conf_files="/etc/salt/*" post_install() { vmkdir etc/salt 0750 diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 7b7e5657c3f..1de57b537db 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=1.4.8 +version=1.4.9 revision=1 only_for_archs="i686 x86_64 x86_64-musl armv7l aarch64" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="custom" homepage="http://www.sbcl.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=ce24b62b88482621c228a4fd6c802350330b6263e1b1b98460eeb4a81d7fb335 +checksum=8f679eba0a5a8d86feced6776e389cc791a26998e4b43185a5e02bebb76620c5 nocross=yes nopie=yes @@ -20,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+=" f0612bbf37de07c4d1213de1cdd108315da1f2251789d0278592b434fa82b044" + checksum+=" e71935d6fcb563d93f1ac8df1adfe7bcd2cbe9fe1a2d1bc46ac30fda17d11f72" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2" diff --git a/srcpkgs/sblg/template b/srcpkgs/sblg/template new file mode 100644 index 00000000000..caa964bff4a --- /dev/null +++ b/srcpkgs/sblg/template @@ -0,0 +1,36 @@ +# Template file for 'sblg' +pkgname=sblg +version=0.4.13 +revision=1 +build_style=configure +configure_args="PREFIX=/usr MANDIR=/usr/share/man" +makedepends="expat-devel" +short_desc="Simple off-line blog utility" +maintainer="John " +license="ISC" +changelog="https://kristaps.bsd.lv/sblg/archive.html" +homepage="https://kristaps.bsd.lv/sblg/" +distfiles="https://kristaps.bsd.lv/sblg/snapshots/${pkgname}-${version}.tar.gz" +checksum=e2f00ad3e14501e16b1ac4891c12fdd48ad29c1fc7242b177c57ca7205ecdc89 + +pre_configure() { +if [ "$CROSS_BUILD" ]; then + case $XBPS_TARGET_MACHINE in + *-musl) echo HAVE___PROGNAME=true HAVE_ERR=1 HAVE_MEMMEM=1\ + HAVE_MEMCHR=1 HAVE_PROGRAM_INVOCATION_SHORT_NAME=1\ + HAVE_SECCOMP_FILTER=1 HAVE_SOCK_NONBLOCK=1\ + HAVE_STRLCAT=1 HAVE_STRCPY=1\ + > configure.local;; + *) echo HAVE___PROGNAME=true HAVE_ERR=1 HAVE_MEMMEM=1\ + HAVE_MEMCHR=1 HAVE_PROGRAM_INVOCATION_SHORT_NAME=1\ + HAVE_SECCOMP_FILTER=1 HAVE_SOCK_NONBLOCK=1\ + HAVE_EXPLICIT_BZERO=1\ + > configure.local;; + esac +fi +} + +post_install() { + head -n16 article.c > COPYING + vlicense COPYING +} diff --git a/srcpkgs/sblg/update b/srcpkgs/sblg/update new file mode 100644 index 00000000000..1f12d08fc02 --- /dev/null +++ b/srcpkgs/sblg/update @@ -0,0 +1 @@ +ignore=".tar.gz.sha512\">sblg" diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template index b6ff5e4cab8..b209dbe89d2 100644 --- a/srcpkgs/sc-im/template +++ b/srcpkgs/sc-im/template @@ -1,17 +1,17 @@ # Template file for 'sc-im' pkgname=sc-im version=0.7.0 -revision=1 +revision=2 build_wrksrc="src" build_style=gnu-makefile make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader" make_install_args="prefix=/usr" hostmakedepends="bison pkg-config gnuplot" -makedepends="libxls-devel libxml2-devel libzip-devel lua51-devel ncurses-devel" +makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel" depends="less" short_desc="SpreadSheet Calculator (sc) Improvised" maintainer="Leah Neukirchen " -license="4-clause-BSD" +license="BSD-4-Clause" homepage="https://github.com/andmarti1424/sc-im/" distfiles="https://github.com/andmarti1424/${pkgname}/archive/v${version}.tar.gz" checksum=87225918cb6f52bbc068ee6b12eaf176c7c55ba9739b29ca08cb9b6699141cad diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template new file mode 100644 index 00000000000..5c70f60bccc --- /dev/null +++ b/srcpkgs/scdoc/template @@ -0,0 +1,26 @@ +# Template file for 'scdoc' +pkgname=scdoc +version=1.3.4 +revision=1 +build_style=gnu-makefile +short_desc="Tool for generating roff manual pages" +maintainer="Julio Galvan " +license="MIT" +homepage="https://git.sr.ht/~sircmpwn/scdoc" +distfiles="https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz" +checksum=cb27f40852f00812cfbcbce46e1d5c0aa54e5862997e3e114aec7e459a362e8c + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" scdoc" +fi + +pre_build() { + if [ "$CROSS_BUILD" ]; then + sed -i "s|^HOST_SCDOC=.*|HOST_SCDOC=/usr/bin/scdoc|g" Makefile + fi + sed -i "s/\" VERSION \"/ ${version}/g" src/main.c +} + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index b4ac40bc2fa..56d25017cd5 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,16 +1,16 @@ # Template file for 'scite' pkgname=scite -version=3.7.5 +version=4.1.0 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" -makedepends="gtk+-devel lua51-devel" +makedepends="gtk+-devel lua-devel" short_desc="SCIntilla based Text Editor" maintainer="Leah Neukirchen " license="MIT" homepage="http://www.scintilla.org/SciTEDownload.html" distfiles="http://www.scintilla.org/scite${version//./}.tgz" -checksum=51e6861284077268d4929bb2ff9c516e2ca8914b2bd0ac315d177befe24aef86 +checksum=d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7 post_extract() { sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile diff --git a/srcpkgs/scrcpy/patches/crossbuild-fix.patch b/srcpkgs/scrcpy/patches/crossbuild-fix.patch new file mode 100644 index 00000000000..f659b219621 --- /dev/null +++ b/srcpkgs/scrcpy/patches/crossbuild-fix.patch @@ -0,0 +1,11 @@ +--- app/meson.build ++++ app/meson.build +@@ -19,7 +20,7 @@ src = [ + 'src/tinyxpm.c', + ] + +-if not meson.is_cross_build() ++if true + + # native build + dependencies = [ diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template new file mode 100644 index 00000000000..58bea48eb30 --- /dev/null +++ b/srcpkgs/scrcpy/template @@ -0,0 +1,23 @@ +# Template file for 'scrcpy' +pkgname=scrcpy +version=1.2 +revision=1 +build_style=meson +configure_args="-Db_lto=true + -Dprebuilt_server=scrcpy-server-v${version}.jar" +hostmakedepends="pkg-config" +makedepends="SDL2-devel ffmpeg-devel" +depends="android-tools" +short_desc="Display and control your Android device" +maintainer="SolitudeSF " +license="Apache-2.0" +homepage="https://github.com/Genymobile/scrcpy" +distfiles="${homepage}/archive/v${version}.tar.gz + ${homepage}/releases/download/v${version}/scrcpy-server-v${version}.jar" +checksum="d340e3a0aa1625161bc00068ffccbe291b7866729a5fff7ff859904480ec0df3 + cb39654ed2fda3d30ddff292806950ccc5c394375ea12b974f790c7f38f61f60" +skip_extraction="scrcpy-server-v${version}.jar" + +post_extract() { + cp ${XBPS_SRCDISTDIR}/scrcpy-${version}/scrcpy-server-v${version}.jar server +} diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index d608159924b..2259f75d5a2 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,18 +1,18 @@ # Template file for 'scribus' pkgname=scribus -version=1.4.6 +version=1.4.7 revision=1 build_style=cmake -hostmakedepends="pkg-config" +hostmakedepends="pkg-config qt-devel" makedepends="qt-devel zlib-devel cairo-devel lcms2-devel cups-devel libxml2-devel hyphen-devel ghostscript-devel boost-devel python-devel" depends="ghostscript" short_desc="Open Source DTP (Desktop Publishing) application" maintainer="Enno Boland " -license="GPL-2" -homepage="http://scribus.net" -distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname/$version/$pkgname-$version.tar.xz" -checksum=21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a +license="GPL-2.0-or-later" +homepage="https://scribus.net" +distfiles="$SOURCEFORGE_SITE/scribus/scribus/${version}/scribus-${version}.tar.xz" +checksum=42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec pre_configure() { sed -i 's#^Icon=scribus#^Icon=/usr/share/scribus/icons/scribus.png#' scribus.desktop diff --git a/srcpkgs/sdb/template b/srcpkgs/sdb/template index 86056f2b92c..f343343f60d 100644 --- a/srcpkgs/sdb/template +++ b/srcpkgs/sdb/template @@ -1,24 +1,17 @@ # Template file for 'sdb' pkgname=sdb -version=0.9.6 +version=1.2.0 revision=1 build_style=gnu-makefile +make_use_env=yes hostmakedepends="pkg-config" -makedepends="libglib-devel vala-devel" +makedepends="vala-devel" short_desc="Simple key-value database with JSON support" maintainer="Juan RP " -license="LGPL-3" -homepage="http://radare.org" -distfiles="${homepage}/get/sdb-${version}.tar.gz" -checksum=e4cf6e93c2a52484fd2b52aa1addab3ed37b4237bdf0e2fce86bee48533050f5 - -do_build() { - make CC=$CC ${makejobs} -} -post_install() { - # create soname symlink - ln -s libsdb.so.${version} ${DESTDIR}/usr/lib/libsdb.so.0 -} +license="LGPL-3.0-or-later" +homepage="https://radare.org" +distfiles="https://github.com/radare/sdb/archive/${version}.tar.gz" +checksum=7512f0e5a205937a11a5dbe0905eacb3b695c7fb71bb4b6d25b14706fa31a63f sdb-devel_package() { depends="sdb>=${version}_${revision}" diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index bdee5ee804a..baba0e2988e 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,7 +1,7 @@ # Template file for 'seafile-libclient' pkgname=seafile-libclient version=6.1.8 -revision=1 +revision=3 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template index 8676748dfb3..012d107e5d5 100644 --- a/srcpkgs/sfeed/template +++ b/srcpkgs/sfeed/template @@ -1,6 +1,6 @@ # Template file for 'sfeed' pkgname=sfeed -version=0.9.3 +version=0.9.4 revision=1 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" @@ -10,7 +10,7 @@ maintainer="Rubén Santos " license="ISC" homepage="https://git.codemadness.org/sfeed" distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz" -checksum=09372442a76272990ecc2d295da27c25f477f5714db8dffb2eab537a08868d4c +checksum=a733b67d8c36b8782cc25214b64f47348f4f73c05341e95830648f530ac9b61a post_install() { vlicense LICENSE diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template index 9afe3533fd3..c70117cb9ba 100644 --- a/srcpkgs/shared-mime-info/template +++ b/srcpkgs/shared-mime-info/template @@ -1,6 +1,6 @@ -# Template build file for 'shared-mime-info'. +# Template file for 'shared-mime-info' pkgname=shared-mime-info -version=1.9 +version=1.10 revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb" @@ -8,8 +8,8 @@ hostmakedepends="pkg-config intltool" makedepends="libglib-devel libxml2-devel" short_desc="Core database of common types" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://freedesktop.org/Software/shared-mime-info" distfiles="http://freedesktop.org/~hadess/${pkgname}-${version}.tar.xz" -checksum=5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83 +checksum=c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf disable_parallel_build=yes diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template index dbe6cb2a313..4fc854ccce6 100644 --- a/srcpkgs/shellcheck/template +++ b/srcpkgs/shellcheck/template @@ -1,14 +1,14 @@ # Template file for 'shellcheck' pkgname=shellcheck -version=0.4.7 +version=0.5.0 revision=1 hostmakedepends="cabal-install" short_desc="A static analysis tool for shell scripts" maintainer="Diogo Leal " -license="GPL-3" -homepage="http://www.shellcheck.net/" +license="GPL-3.0-or-later" +homepage="https://www.shellcheck.net/" distfiles="https://github.com/koalaman/shellcheck/archive/v${version}.tar.gz" -checksum=3fd7ebec821b96585ba9137b7b8c7bd9410876490f4ec89f2cca9975080a8206 +checksum=348a3f7892c1f28a44f188c00ac82f1b3bf899d9f81d14ddb0e306db26c937bb nocross=yes nopie=yes @@ -20,6 +20,10 @@ do_build() { cabal build ${makejobs} } +do_check() { + cabal test +} + do_install() { vbin dist/build/shellcheck/shellcheck vdoc shellcheck.1.md diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template index 68f5888cf26..f5c68ae1943 100644 --- a/srcpkgs/shorewall/template +++ b/srcpkgs/shorewall/template @@ -1,23 +1,23 @@ # Template file for 'shorewall' pkgname=shorewall -version=5.1.12.3 +version=5.1.12.4 revision=1 -_disturl="http://www.shorewall.net/pub/${pkgname}/${version:0:3}/${pkgname}-${version:0:6}" -distfiles=" - ${_disturl}/${pkgname}-${version}.tar.bz2 - ${_disturl}/${pkgname}6-${version}.tar.bz2 - ${_disturl}/${pkgname}-core-${version}.tar.bz2" -checksum="c1bdb6eef7059247737d74ffd9475b11a036253c2d8667d4fea296a1be0768bc - 082a1c1baa2bb301c258cd3401a8aa6cdcde0f14fe67eb40f3009c4d3e4860f5 - 146c7fdae3f81a950182bc77e17d516a8885454d22351cb9cf90b562e985785a" +noarch=yes depends="shorewall-core perl" maintainer="Juan RP " homepage="http://www.shorewall.net/" license="GPL-2.0-or-later" short_desc="An iptables-based firewall for Linux systems" - -noarch=yes +_disturl="http://www.shorewall.net/pub/${pkgname}/${version:0:3}/${pkgname}-${version:0:6}" +distfiles=" + ${_disturl}/${pkgname}-${version}.tar.bz2 + ${_disturl}/${pkgname}6-${version}.tar.bz2 + ${_disturl}/${pkgname}-core-${version}.tar.bz2" +checksum="60ee5749f964b09084e2d15076b246870f442168f20f6b15bb1feb32641c0019 + a5ab3785c8a21143e28eddc68f3562a2edab7c03ce740c2c8ca98419ac25797b + 40d2aa222fe474908534dd1392cd7dbcc304640dcbe7b983719588cdd908ebfd" create_wrksrc=yes + make_dirs="/var/lib/${pkgname} 0755 0 0" conf_files="/etc/$pkgname/*" @@ -45,6 +45,7 @@ shorewall-core_package() { DESTDIR="${PKGDESTDIR}" ./install.sh } } + shorewall6_package() { noarch=yes depends="shorewall" diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template index 8f28609d072..677e0d58233 100644 --- a/srcpkgs/shotcut/template +++ b/srcpkgs/shotcut/template @@ -1,6 +1,6 @@ # Template file for 'shotcut' pkgname=shotcut -version=18.03 +version=18.05.08 revision=1 build_style=qmake hostmakedepends="qt5-tools pkg-config" @@ -15,10 +15,12 @@ makedepends=" depends="frei0r-plugins qt5-quickcontrols" short_desc="Free, open source, cross-platform video editor" maintainer="Linux CompITech " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://www.shotcut.org" distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz" -checksum=d1bbd9df4a58c084ac059f56b02737ead5e37c197fabaedc965260c377a0f6ab +checksum=a78ba95bc6fbb7de82ba2ac0ea65beb9a0b6e5bbcb48b5026f26399c6033272f + +CXXFLAGS="-DHAVE_LOCALE_H=1" nocross="https://travis-ci.org/voidlinux/void-packages/jobs/292589547#L1332 https://travis-ci.org/voidlinux/void-packages/jobs/292589548#L1337" diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 2ed9f6c9883..ca026fc6144 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -1,6 +1,6 @@ # Template file for 'shotwell' pkgname=shotwell -version=0.28.2 +version=0.28.3 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -15,5 +15,5 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later, CC-BY-SA-3.0" homepage="https://wiki.gnome.org/Apps/Shotwell" distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz" -checksum=16d9e83d02b5e674144d697d7988b49946441a1aa99f0ccfb70d9238c6a2475d +checksum=d08603f3736f9791c1d7fcfe586ffaaf07b05e18cff370c94c07d8f23e06d403 lib32disabled=yes diff --git a/srcpkgs/sile/patches/lua.patch b/srcpkgs/sile/patches/lua.patch new file mode 100644 index 00000000000..fabc9e1c50e --- /dev/null +++ b/srcpkgs/sile/patches/lua.patch @@ -0,0 +1,8 @@ +--- sile.in 2016-06-09 10:57:37.000000000 +0000 ++++ - 2018-06-21 20:22:13.514804438 +0000 +@@ -1,4 +1,4 @@ +-#!@LUA@ ++#!@LUA@@LUA_VERSION@ + package.path = (os.getenv("SILE_PATH") and + os.getenv("SILE_PATH").."/?.lua" or "") .. ';?.lua;@SILE_PATH@/?.lua;@SILE_PATH@/lua-libraries/?.lua;@SILE_PATH@/lua-libraries/?/init.lua;lua-libraries/?.lua;lua-libraries/?/init.lua;' .. package.path + package.cpath = package.cpath .. ";core/?.@SHARED_LIB_EXT@;@SILE_LIB_PATH@/?.@SHARED_LIB_EXT@;" diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template new file mode 100644 index 00000000000..f8d0d53e293 --- /dev/null +++ b/srcpkgs/sile/template @@ -0,0 +1,27 @@ +# Template file for 'sile' +pkgname=sile +version=0.9.4 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="harfbuzz-devel lua51-devel lua51-lpeg luaexpat + lua51-zlib luafilesystem" +depends="lua51-lpeg luaexpat lua51-zlib luafilesystem" +short_desc="Modern typesetting system inspired by TeX" +maintainer="John " +license="MIT" +homepage="http://www.sile-typesetter.org/" +distfiles="https://github.com/simoncozens/sile/releases/download/v${version}/sile-${version}.tar.bz2" +checksum=1c696679e5243d0448705db86227eec57a000846f02a964f882b7978c46954d5 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" lua51 lua51-lpeg luaexpat lua51-zlib luafilesystem" +fi + +post_extract() { + sed 's/rm -f core/rm -f/' -i configure +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template index c8cdf71ad7c..80f4d693015 100644 --- a/srcpkgs/simgear/template +++ b/srcpkgs/simgear/template @@ -1,6 +1,6 @@ # Template file for 'simgear' pkgname=simgear -version=2018.1.1 +version=2018.2.2 revision=1 # XXX: always keep in sync with flightgear version! build_style=cmake @@ -10,10 +10,10 @@ makedepends="boost-devel freetype-devel libjpeg-turbo-devel giflib-devel libcurl-devel libfreeglut-devel libopenal-devel osg-devel plib-devel" short_desc="Simulation engine for FlightGear - static libraries" maintainer="Jürgen Buchmüller " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.flightgear.org/" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=d403cbd8688782780c50461ea233f26ea3bb8242ff681674e69ac1da05226656 +checksum=f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5 # Suppress warnings regarding auto_ptr CXXFLAGS="-Wno-deprecated-declarations" diff --git a/srcpkgs/skanlite/template b/srcpkgs/skanlite/template new file mode 100644 index 00000000000..1b8111e21e2 --- /dev/null +++ b/srcpkgs/skanlite/template @@ -0,0 +1,18 @@ +# Template file for 'skanlite' +pkgname=skanlite +version=2.1.0.1 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF" +hostmakedepends="extra-cmake-modules" +makedepends="kio-devel libksane-devel" +short_desc="Image Scanning Application" +maintainer="travankor " +license="GPL-2.0-or-later" +homepage="https://www.kde.org/applications/graphics/skanlite" +distfiles="${KDE_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=b4733e55b706eaf749522aa81ec47bfd65a95c2fec994c1c47e0c4b628e70442 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" +fi \ No newline at end of file diff --git a/srcpkgs/skim/template b/srcpkgs/skim/template index 1fde9c1a51f..d90d5b4eb54 100644 --- a/srcpkgs/skim/template +++ b/srcpkgs/skim/template @@ -1,14 +1,14 @@ # Template file for 'skim' pkgname=skim -version=0.3.2 +version=0.5.1 revision=1 hostmakedepends="cargo rust" short_desc="Fuzzy Finder in rust" -maintainer="maxice8 " +maintainer="Orphan " license="MIT" homepage="https://github.com/lotabout/skim" distfiles="https://github.com/lotabout/skim/archive/v${version}.tar.gz" -checksum=a16f64e4ce4703b36ca01e2f83b92b8a653ef9b9ce10332c6e215b80d3680e79 +checksum=f616e229971c75b14e46a5843389e61148262ad41965afa051ff85970f3a6773 nocross=yes do_build() { diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index e632e0c128f..a423fbc63d9 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,7 +1,7 @@ # Template file for 'skype' # This just repackages the debian package. pkgname=skype -version=8.20.76.3 +version=8.25.76.3 revision=1 only_for_archs="x86_64" repository="nonfree" @@ -12,7 +12,7 @@ maintainer="Lon Willett " license="skype" homepage="https://www.skype.com" distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" -checksum=d53218468e7188e40b11dcb28bb218eddefffef75f4c98aa208638a35870549f +checksum=fc99e6c51f5b0895242a099819645dfd69a8c3c645bbff8ce48917591795c331 do_extract() { ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template index 63bd2c634c4..d8a2ab206b8 100644 --- a/srcpkgs/slit/template +++ b/srcpkgs/slit/template @@ -1,9 +1,10 @@ # Template file for 'slit' pkgname=slit version=1.2.0 -revision=1 +revision=2 build_style=go -go_import_path="github.com/tigrawap/slit" +go_import_path=github.com/tigrawap/slit +go_package="${go_import_path}/cmd/slit" short_desc="A modern PAGER for viewing logs" maintainer="Michael Gehring " license="MIT" diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index 24d92ffe260..6b69e315b13 100644 --- a/srcpkgs/smplayer/template +++ b/srcpkgs/smplayer/template @@ -1,17 +1,17 @@ # Template file for 'smplayer' pkgname=smplayer -version=18.4.0 +version=18.6.0 revision=1 build_style=gnu-makefile hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel" makedepends="zlib-devel qt5-script-devel qt5-tools-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="A complete front-end for mplayer and mpv" -maintainer="Juan RP " -license="GPL-2" +maintainer="Helmut Pozimski " +license="GPL-2.0-or-later" homepage="https://www.smplayer.info" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=ad51c1759f063afb287743bd90e24a7a77cc6e8b96da288dd7ddcb16c85b4e60 +checksum=1d5bf4b30f501e38825dccc4b12f5f1379bcdef7d982549da9cc9713a830685d pre_build() { export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ diff --git a/srcpkgs/socklog-void/template b/srcpkgs/socklog-void/template index c606adb5c89..f8812893190 100644 --- a/srcpkgs/socklog-void/template +++ b/srcpkgs/socklog-void/template @@ -23,8 +23,8 @@ conf_files=" hostmakedepends="git" depends="socklog runit libcap-progs" short_desc="Void Linux socklog configuration" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Public Domain" -homepage="https://github.com/voidlinux/socklog-void" -distfiles="https://github.com/voidlinux/${pkgname}/archive/${version}.tar.gz" +homepage="https://github.com/void-linux/socklog-void" +distfiles="https://github.com/void-linux/${pkgname}/archive/${version}.tar.gz" checksum=47ea42aa468f5fceea402ee67e3ebb7e54ba7c33ab580212749bcf893ce56c9e diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template index e7fd525caab..c354de074f7 100644 --- a/srcpkgs/spectacle/template +++ b/srcpkgs/spectacle/template @@ -1,14 +1,14 @@ # Template file for 'spectacle' pkgname=spectacle -version=17.12.2 -revision=2 +version=18.04.2 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules kdoctools python qt5-host-tools qt5-qmake" -makedepends="kdeclarative-devel libkipi5-devel xcb-util-image-devel xcb-util-cursor-devel" +makedepends="kdeclarative-devel libkipi5-devel xcb-util-image-devel xcb-util-cursor-devel knewstuff-devel" short_desc="KDE screenshot capture utility" maintainer="Denis Revin " -license="GPL-2" +license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://projects.kde.org/projects/kde/kdegraphics/spectacle" -distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=723f9243813e14ac78f3f0a4c5e0aec48679a81d28c86bc7bb1f6732dbb51062 +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=3660713df10d901e9c1f27ac5de402751b32203e190dc812a38d50ae27bedfb7 diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template index 6bc392390bc..cc90d1ece66 100644 --- a/srcpkgs/spotify/template +++ b/srcpkgs/spotify/template @@ -1,24 +1,18 @@ # Template file for 'spotify' pkgname=spotify -version=1.0.72 +version=1.0.80 revision=1 short_desc="Proprietary music streaming client" maintainer="Stefan Mühlinghaus " homepage="https://www.spotify.com" license="Proprietary" create_wrksrc=yes -only_for_archs="x86_64 i686" +only_for_archs="x86_64" repository=nonfree build_style=fetch depends="binutils gtk+ nss GConf libXScrnSaver libatomic" - -if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then - _sversion=".117.g6bd7cc73-35_amd64" - _schecksum=5749c853479a6559b8642a531ba357e40d3c95116314e74e31197569dee62c7a -else - _sversion=".117.g6bd7cc73-35_i386" - _schecksum=f5ac29e8374901ce7401825d13471c03bcf6ec8106f8c210c710b0a8d7b22ca9 -fi +_sversion=".480.g51b03ac3-13_amd64" +_schecksum=e32f4816ae79dbfa0c14086e76df3bc83d526402aac1dbba534127fc00fe50ea do_install() { vbin ${FILESDIR}/spotify diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template index 6a0716445cd..055eb6d860e 100644 --- a/srcpkgs/sssd/template +++ b/srcpkgs/sssd/template @@ -1,15 +1,16 @@ # Template file for 'sssd' pkgname=sssd version=1.16.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-selinux --without-semanage - --disable-cifs-idmap-plugin --without-samba --disable-config-lib" + --disable-cifs-idmap-plugin --without-samba --disable-config-lib + --with-test-dir=/dev/shm" hostmakedepends="pkg-config nscd bind xmlcatmgr docbook-xsl" makedepends="pam-devel popt-devel talloc-devel tdb-devel tevent-devel ldb-devel ding-libs-devel libldap-devel mit-krb5-devel c-ares-devel glib-devel libxslt-devel python-devel nss-devel libnfsidmap-devel http-parser-devel - jansson-devel python3-devel libcurl-devel" + jansson-devel python3-devel libcurl-devel cmocka-devel check-devel" make_dirs="/var/lib/sss/db 0700 root root /var/lib/sss/secrets 0700 root root /var/lib/sss/pubconf/krb5.include.d 0700 root root @@ -27,6 +28,12 @@ homepage="https://pagure.io/SSSD/sssd/" distfiles="https://releases.pagure.org/SSSD/sssd/sssd-${version}.tar.gz" checksum=2dbf677851afdefcdf57eccaf25d59eb682a2994ad2a2dbf419003930a0b506e +do_check() { + export CK_TIMEOUT_MULTIPLIER=10 + make check VERBOSE=yes + unset CK_TIMEOUT_MULTIPLIER +} + post_install() { rm -rf ${DESTDIR}/etc/rc.d diff --git a/srcpkgs/stella/template b/srcpkgs/stella/template index 78c803a3649..6fab0ff9886 100644 --- a/srcpkgs/stella/template +++ b/srcpkgs/stella/template @@ -1,15 +1,18 @@ # Template file for 'stella' pkgname=stella -version=5.1.2 +version=5.1.3 revision=1 -build_style=gnu-configure +build_style=configure +configure_args="--prefix=/usr" +hostmakedepends="pkg-config" makedepends="SDL2-devel glu-devel libpng-devel zlib-devel" -short_desc="A multi-platform Atari 2600 VCS Emulator" +depends="desktop-file-utils hicolor-icon-theme" +short_desc="Multi-platform Atari 2600 VCS Emulator" maintainer="Diogo Leal " -license="GPL-2" +license="GPL-2.0-or-later, BSD-3-Clause" homepage="https://stella-emu.github.io/" distfiles="https://github.com/stella-emu/stella/releases/download/${version}/stella-${version}-src.tar.xz" -checksum=77b210d51af7e4be88c14014d507e48367bcdff6b8ba513793f035f3e30a21bd +checksum=e074317c25e5d4cabec4558909d301c3a7654ad620863f05d342244fe6bdfe0a post_extract() { case "$XBPS_TARGET_MACHINE" in @@ -21,11 +24,6 @@ post_extract() { esac } -do_configure() { - ./configure --prefix=/usr -} - -do_install() { - make DESTDIR=$DESTDIR install - vbin stella +post_install() { + vlicense Copyright.txt } diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template index 15f25e0c05b..e45cda187bf 100644 --- a/srcpkgs/strace/template +++ b/srcpkgs/strace/template @@ -1,16 +1,16 @@ # Template file for 'strace' pkgname=strace -version=4.22 +version=4.23 revision=1 build_style=gnu-configure configure_args="--with-libunwind" makedepends="libunwind-devel" short_desc="A System Call Tracer" maintainer="Juan RP " -homepage="https://strace.io/" license="BSD-3-Clause" +homepage="https://strace.io/" distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz" -checksum=068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d +checksum=7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad case "$XBPS_TARGET_MACHINE" in aarch64-musl) configure_args=; makedepends= ;; diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template index 16b8a34f929..8453e781747 100644 --- a/srcpkgs/streamlink/template +++ b/srcpkgs/streamlink/template @@ -1,7 +1,7 @@ # Template file for 'streamlink' pkgname=streamlink -version=0.13.0 -revision=2 +version=0.14.2 +revision=1 noarch=yes build_style=python3-module pycompile_module="streamlink streamlink_cli" @@ -13,10 +13,10 @@ checkdepends="python3-pycryptodome python3-pycountry python3-pysocks short_desc="Utility extracting streams from services, forked from livestreamer" maintainer="wkuipers " license="BSD-2-Clause" -#changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md" homepage="https://streamlink.github.io/" +changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md" distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz" -checksum=4d91dbc8233e8737a9dcb629ac471373e903116b3a35c882205c95bdb14eac29 +checksum=a8c7f9a758ade056a35d439f78408e9e43ce1069dde9289d322702d35c214150 export STREAMLINK_USE_PYCOUNTRY=1 diff --git a/srcpkgs/strip-nondeterminism/template b/srcpkgs/strip-nondeterminism/template index cbe299ac874..a91118aa94f 100644 --- a/srcpkgs/strip-nondeterminism/template +++ b/srcpkgs/strip-nondeterminism/template @@ -1,14 +1,14 @@ # Template file for 'strip-nondeterminism' pkgname=strip-nondeterminism -version=0.041 +version=0.042 revision=1 build_style=perl-module hostmakedepends="perl-Archive-Zip" -makedepends="${hostmakedepends}" -depends="${makedepends}" +makedepends="$hostmakedepends" +depends="$makedepends" short_desc="Non-deterministic information stripper" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://reproducible-builds.org/tools/" distfiles="http://http.debian.net/debian/pool/main/s/${pkgname}/${pkgname}_${version}.orig.tar.bz2" -checksum=58854fbd929fca83fb78b0688c3dd3d5fa89b806776f04ce5dd1251b32a16162 +checksum=d0f3a118a4bce8cb761817f451fe96249945e1f52b2af22a4ac9da4438a9147a diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template index 14245dfc4dd..84684af5deb 100644 --- a/srcpkgs/strongswan/template +++ b/srcpkgs/strongswan/template @@ -1,6 +1,6 @@ # Template file for 'strongswan' pkgname=strongswan -version=5.6.2 +version=5.6.3 revision=1 build_style=gnu-configure # tpm support waits on libtss2 @@ -13,12 +13,12 @@ hostmakedepends="pkg-config flex bison python" makedepends="gmp-devel libsoup-devel libldns-devel unbound-devel libcurl-devel" conf_files="/etc/*.conf /etc/strongswan.d/*.conf /etc/strongswan.d/charon/*.conf" short_desc="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE" -maintainer="Toyam Cox " -license="GPL-2" -# changelog="https://wiki.strongswan.org/projects/strongswan/wiki/Changelog" -homepage="http://www.strongswan.org/" -distfiles="http://download.strongswan.org/${pkgname}-${version}.tar.bz2" -checksum=e0a60a30ebf3c534c223559e1686497a21ded709a5d605c5123c2f52bcc22e92 +maintainer="Toyam Cox " +license="GPL-2.0-or-later" +homepage="https://www.strongswan.org/" +changelog="https://wiki.strongswan.org/projects/strongswan/wiki/Changelog" +distfiles="https://download.strongswan.org/${pkgname}-${version}.tar.bz2" +checksum=c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24 post_install() { touch .empty diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template index a6b69299072..95d7442d38d 100644 --- a/srcpkgs/stunnel/template +++ b/srcpkgs/stunnel/template @@ -1,18 +1,19 @@ # Template file for 'stunnel' pkgname=stunnel -version=5.45 +version=5.46 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="perl" makedepends="libressl-devel" -checkdepends="nmap" +checkdepends="nmap procps-ng" short_desc="SSL encryption wrapper" -maintainer="Toyam Cox " +maintainer="Toyam Cox " license="GPL-2.0-or-later" homepage="https://www.stunnel.org/" +changelog="https://www.stunnel.org/sdf_ChangeLog.html" distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz" -checksum=548244839b8a4bf4dffea46c97893b203d1b9eed118c3dd6a9ac4d8d02592ee3 +checksum=76aab48c28743d78e4b2f6b2dfe49994b6ca74126046c179444f699fae7a84c7 post_install() { rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8 diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template index 45fdfc0d68b..0f1407c588c 100644 --- a/srcpkgs/subtle/template +++ b/srcpkgs/subtle/template @@ -1,6 +1,6 @@ # Template file for 'subtle' pkgname=subtle -version=0.11.3281 +version=0.11.3284 revision=1 nocross=yes hostmakedepends="mercurial ruby-devel pkg-config" diff --git a/srcpkgs/subuser/template b/srcpkgs/subuser/template index 9c82023a26b..37e62401aff 100644 --- a/srcpkgs/subuser/template +++ b/srcpkgs/subuser/template @@ -1,15 +1,15 @@ # Template file for 'subuser' pkgname=subuser version=0.6.2 -revision=1 +revision=2 only_for_archs="x86_64 x86_64-musl" build_style=python3-module hostmakedepends="python3-setuptools" -depends="docker python3" +depends="docker python3-setuptools" pycompile_module="subuserlib" maintainer="cr6git " short_desc="Turns Docker containers into normal linux programs" homepage="http://subuser.org" -license="LGPL-3" +license="LGPL-3.0-only" distfiles="https://github.com/subuser-security/subuser/archive/${version}.tar.gz" checksum=1f7fc32fd61f1f8c7d04770cf4ba5c0dd0eb081eb1ef35f35e07c667959555a1 diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 62861479732..94593652da5 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -1,7 +1,7 @@ # Template file for 'subversion' pkgname=subversion version=1.10.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-apxs --disable-javahl --disable-static --with-kwallet --with-gnome-keyring --with-editor=vi --disable-mod-activation @@ -12,7 +12,7 @@ makedepends="apache-devel gdbm-devel kdelibs-devel libgnome-keyring-devel depends="ca-certificates" short_desc="Enterprise-class centralized version control for the masses" maintainer="Juan RP " -license="Apache-2.0, BSD" +license="Apache-2.0, BSD-3-Clause" homepage="http://subversion.apache.org/" distfiles="http://apache.rediris.es/subversion/subversion-${version}.tar.bz2" checksum=2cf23f3abb837dea0585a6b0ebd70e80e01f95bddef7c1aa097c18e3eaa6b584 @@ -45,6 +45,8 @@ do_install() { done vsv svnserve + + vlicense LICENSE } libsvn_package() { @@ -73,7 +75,8 @@ subversion-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" + vmove usr/share/pkgconfig } } diff --git a/srcpkgs/syncplay/template b/srcpkgs/syncplay/template index eaa96192196..817082cc816 100644 --- a/srcpkgs/syncplay/template +++ b/srcpkgs/syncplay/template @@ -1,14 +1,20 @@ # Template file for 'syncplay' pkgname=syncplay -version=1.5.2 -revision=2 +version=1.5.3 +revision=1 noarch=yes build_style=gnu-makefile pycompile_dirs="usr/lib/syncplay/syncplay" -depends="python-pyside python-Twisted" +depends="desktop-file-utils python-pyside python-Twisted" short_desc="Free software that synchronises media players" maintainer="KeepBotting " license="Apache-2.0" homepage="https://syncplay.pl/" distfiles="https://github.com/syncplay/syncplay/archive/v${version}.tar.gz" -checksum=8a6a6e73b28e842230b4deef3b031f8ebeea5e30ffca393f2c4f8de207c6f428 +checksum=db7dff9362645e7ed1f79eb5c70a742a8ffb6f52c9412def6766c2a9a55260fa + +post_install() { + for res in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256; do + rm -rf ${DESTDIR}/usr/share/icons/${res} + done +} diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template index 627ca6c215a..8e425098ca0 100644 --- a/srcpkgs/tbb/template +++ b/srcpkgs/tbb/template @@ -1,6 +1,6 @@ # Template file for 'tbb' pkgname=tbb -version=2018.4 +version=2018.5 revision=1 # version rewrite: 2017_U7 (upstream) => 2017.7 (xbps) _ver=${version/./_U} @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://www.threadingbuildingblocks.org" distfiles="https://github.com/01org/tbb/archive/${_ver}.tar.gz" -checksum=d5604a04787c8a037d4944eeb89792e7c45f6a83c141b20df7ee89c2fb012ed1 +checksum=c4c2896af527392496c5e01ef8579058a71b6eebbd695924cd138841c13f07be only_for_archs="i686-musl x86_64-musl armv7l-musl aarch64-musl i686 x86_64 armv7l aarch64" diff --git a/srcpkgs/tdrop/template b/srcpkgs/tdrop/template new file mode 100644 index 00000000000..0b28165031c --- /dev/null +++ b/srcpkgs/tdrop/template @@ -0,0 +1,18 @@ +# Template file for 'tdrop' +pkgname=tdrop +version=0.2 +revision=2 +noarch=yes +depends="bash xdotool xprop xwininfo" +short_desc="Turn terminal emulator or any program into dropdown window" +maintainer="Daniel Lewan " +license="BSD-2-Clause" +homepage="https://github.com/noctuid/tdrop" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=56d6e75fb17046d04234740b71ea10b422207420c48c3ec2d6131d19fa2a8597 + +do_install() { + vbin tdrop + vlicense LICENSE + vman tdrop.1 +} diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template index c1b70f7a21b..2a76177391d 100644 --- a/srcpkgs/tectonic/template +++ b/srcpkgs/tectonic/template @@ -1,15 +1,15 @@ -#template file for 'tectonic' +# Template file for 'tectonic' pkgname=tectonic -version=0.1.7 -revision=4 -hostmakedepends="rust cargo pkg-config" -makedepends="fontconfig-devel freetype-devel harfbuzz-devel graphite-devel libressl-devel libpng-devel zlib-devel icu-devel icu-libs" -short_desc="A modernized, complete, self-contained TeX/LaTeX engine" +version=0.1.8 +revision=1 +hostmakedepends="cargo pkg-config" +makedepends="harfbuzz-devel libressl-devel" +short_desc="Modernized, complete, self-contained TeX/LaTeX engine" maintainer="Chinmay Pai " license="MIT" homepage="https://tectonic-typesetting.github.io" distfiles="https://github.com/tectonic-typesetting/${pkgname}/archive/v${version}.tar.gz" -checksum=c39acc8a4e2e102245037fd2ea3e77b058d25e29bbab0dcc53a3167c5d3fee2a +checksum=e979988f89714e04e45caa894796ebce66e4ecba05bad8a9af0c323f574ed6af nocross=yes do_build() { diff --git a/srcpkgs/tekaim/template b/srcpkgs/tekaim/template index 19e59095f8b..e4c614bee52 100644 --- a/srcpkgs/tekaim/template +++ b/srcpkgs/tekaim/template @@ -1,18 +1,17 @@ # Template file for 'tekaim' pkgname=tekaim -version=1.5.0 +version=1.6.0 revision=1 noarch=yes build_style=python3-module hostmakedepends="python3" -depends="python3 curl maim xclip" +depends="curl maim python3 xclip" short_desc="Simple tool to take and upload screenshots to teknik.io" maintainer="cr6git " +license="GPL-3.0-or-later" homepage="https://github.com/IvanFon/tekaim" -license="GPL-3" distfiles="https://github.com/IvanFon/tekaim/releases/download/${version}/tekaim-${version}.tar.gz" -checksum=e5a2af6d1838860f301ced56b8d0c6ded94c75ae727ecd4d8fe742ea5bb80367 - +checksum=78f7fd651f96fb0711277ed097dcaf75e9b9d39a003a88600270c1d47b993fda post_install() { vmkdir usr/share/tekaim diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template index f772bfea2c9..3a5dd829fd5 100644 --- a/srcpkgs/telegraf/template +++ b/srcpkgs/telegraf/template @@ -1,6 +1,6 @@ # Template file for 'telegraf' pkgname=telegraf -version=1.6.4 +version=1.7.0 revision=1 build_style="go" go_import_path="github.com/influxdata/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=0813d5e87a4eb21098306a4839cdb24d263ea07b9e9954eeb4ae956269c085c9 +checksum=27e1e2ffd74d80baa16ea99601c3895fa3643375de6049bad5c08d1f35b1f63d pre_build() { cd $GOSRCPATH diff --git a/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch b/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch index 72ec0cf09e5..05bc47b9106 100644 --- a/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch +++ b/srcpkgs/telegram-desktop/patches/06-remove-GLIBC-2.15-compat.patch @@ -1,5 +1,5 @@ diff --git Telegram/gyp/qt.gypi Telegram/gyp/qt.gypi -index c9eca6ad..1404f91b 100644 +index c9eca6ad1..1404f91b1 100644 --- Telegram/gyp/qt.gypi +++ Telegram/gyp/qt.gypi @@ -176,14 +176,10 @@ @@ -18,11 +18,11 @@ index c9eca6ad..1404f91b 100644 '-lcrypto', '-lX11', diff --git Telegram/gyp/telegram_linux.gypi Telegram/gyp/telegram_linux.gypi -index a755fc58..8bf49216 100644 +index 1e1185387..328424225 100644 --- Telegram/gyp/telegram_linux.gypi +++ Telegram/gyp/telegram_linux.gypi -@@ -57,9 +57,6 @@ - '-Wno-strict-overflow', +@@ -58,9 +58,6 @@ + '-Wno-maybe-uninitialized', ], 'ldflags': [ - '-Wl,-wrap,aligned_alloc', @@ -31,3 +31,14 @@ index a755fc58..8bf49216 100644 '-Wl,--no-as-needed,-lrt', ], 'configurations': { +@@ -92,10 +89,6 @@ + 'ldflags': [ '-flto' ], + }, + }, +- }, { +- 'ldflags': [ +- '-Wl,-wrap,__divmoddi4', +- ], + }], ['not_need_gtk!="True"', { + 'cflags_cc': [ + ' /dev/null --cflags appindicator3-0.1)', diff --git a/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch b/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch deleted file mode 100644 index 2c43a8844ac..00000000000 --- a/srcpkgs/telegram-desktop/patches/07-libressl-2.7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git Telegram/SourceFiles/mtproto/rsa_public_key.cpp Telegram/SourceFiles/mtproto/rsa_public_key.cpp -index fcb11979..add50d03 100644 ---- Telegram/SourceFiles/mtproto/rsa_public_key.cpp -+++ Telegram/SourceFiles/mtproto/rsa_public_key.cpp -@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - namespace MTP { - namespace internal { - namespace { --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - // This is a key setter for compatibility with OpenSSL 1.0 - int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 0c8b7b830ed..ba5a501591d 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,23 +1,24 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=1.2.17 -revision=2 -_libtgvoip_commit=6e0e1026147364cfb1234489980a2625ab50b598 +version=1.3.7 +revision=1 +_libtgvoip_commit=6ba1241cfef6c3ddf4e50e82f67afde0abc02285 _GSL_commit=9d65e74400976b3509833f49b16d401600c7317d _variant_commit=550ac2f159ca883d360c196149b466955c77a573 -_crl_commit=344cbde9ae8d89a6530408d3176d2754ae0ff0e2 +_crl_commit=f893c36427993e22181c8b3ec382dedb5563dc08 _Catch_commit=5ca44b68721833ae3731802ed99af67c6f38a53a -wrksrc="tdesktop-${version}" build_style=cmake +wrksrc="tdesktop-${version}" build_wrksrc="out/Release" hostmakedepends="gyp pkg-config" -makedepends="qt5-devel gtk+3-devel libappindicator-devel libdbusmenu-glib-devel - opus-devel alsa-lib-devel pulseaudio-devel range-v3 minizip-devel ffmpeg-devel - libopenal-devel" +makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel + libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel + pulseaudio-devel qt5-devel range-v3" depends="qt5-imageformats" short_desc="Telegram Desktop messaging app" maintainer="John " -license="GPL-3" +license="GPL-3.0-or-later" +#changelog"https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" homepage="https://desktop.telegram.org/" distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.gz https://github.com/telegramdesktop/libtgvoip/archive/${_libtgvoip_commit}.tar.gz @@ -25,18 +26,18 @@ distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.g https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz" -checksum="775614e70372b2e18ef1b2940fa043599240975597e4c5e4431c6deb041a613d - 55569944e609bc817a454a43407bbbe1cd6dcfdbbb43579678e0d9e4340ddb14 +checksum="cbb30bad15496848beda2db3481700a7292de6c453ee616cc62a2189a32dd7d8 + ba233ea1550b3abdbbe4a25055070553b04e0f4633453fa8d15f0313a15bd3b2 1aab15abd08fd377524df9dc6a71c977f8617d4a2a8f8a2aa1ce07f3c3ff4371 aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d - c8ad2e354b13aa162a1f6104cfbf353bd6c2d19af7a439b55ffaa2b38e040ce5 + 1357cab18cf4e6798b7586c0ff0948676c44ccd2424d7fbcf1f260aa3087393a d24e6d9df2b8aa5739d3b9077c6b0ff0ef4d5ef8acc52c3a57e32893854d8d18" nocross="gyp build script doesn't support cross compiling" case $XBPS_TARGET_MACHINE in i686*) nodebug=yes;; # ENOMEM *-musl) makedepends+=" libexecinfo-devel";; - mips*) broken="unsuported";; + mips*) broken="unsupported";; esac post_extract() { @@ -47,7 +48,6 @@ post_extract() { mv ${wrksrc}/../Catch2-${_Catch_commit}/* ${wrksrc}/Telegram/ThirdParty/Catch mkdir out/Release -p } - pre_configure() { export GYP_DEFINES="TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,TDESKTOP_DISABLE_UNITY_INTEGRATION" cd ${wrksrc} && \ diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template index 91b7aea6563..a121dd91e8a 100644 --- a/srcpkgs/terragrunt/template +++ b/srcpkgs/terragrunt/template @@ -1,6 +1,6 @@ # Template file for 'terragrunt' pkgname=terragrunt -version=0.14.10 +version=0.14.11 revision=1 build_style=go short_desc="A thin wrapper for Terraform that provides extra tools" @@ -11,7 +11,7 @@ license="MIT" go_import_path="github.com/gruntwork-io/$pkgname" homepage="https://$go_import_path" distfiles="$homepage/archive/v$version.tar.gz" -checksum=088eaeacd965ade353fa98bdb4e7be0348df00f8850b0299756e269b663a739a +checksum=90e219bce4a45ca374fa24b7b050e56dad57fabc58147fa909ba8749a5a82c5d pre_build() { cd $GOSRCPATH diff --git a/srcpkgs/tesseract-ocr/files/COPYING b/srcpkgs/tesseract-ocr/files/COPYING new file mode 100644 index 00000000000..11e05af425f --- /dev/null +++ b/srcpkgs/tesseract-ocr/files/COPYING @@ -0,0 +1,14 @@ +This repository contains language data for Tesseract Open Source +OCR Engine. All data in the repository are licensed under the Apache +License: + +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** http://www.apache.org/licenses/LICENSE-2.0 +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. + diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template index 3c01466dafd..c99289c6c38 100644 --- a/srcpkgs/tesseract-ocr/template +++ b/srcpkgs/tesseract-ocr/template @@ -1,9 +1,9 @@ # Template file for 'tesseract-ocr' pkgname=tesseract-ocr -version=3.05.01 -revision=5 +version=3.05.02 +revision=1 wrksrc=tesseract-${version} -_tessdata_ver=3cf1e2df1fe1d1da29295c9ef0983796c7958b7d +_tessdata_ver=074c37215b01ab8cc47a0e06ff7356383883d775 build_style=gnu-configure configure_args="LIBLEPT_HEADERSDIR=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="automake libtool pkg-config leptonica" @@ -16,8 +16,8 @@ distfiles=" https://github.com/tesseract-ocr/tesseract/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz https://github.com/tesseract-ocr/tessdata/archive/${_tessdata_ver}.tar.gz>tessdata-${_tessdata_ver}.tar.gz" checksum=" - 05898f93c5d057fada49b9a116fc86ad9310ff1726a0f499c3e5211b3af47ec1 - 94c5957a6837e0bca86ab1f33a3c7c7ff2451f927f3daf458cca926a11f2c3f0" + 494d64ffa7069498a97b909a0e65a35a213989e0184f1ea15332933a90d43445 + e33dea2118f447848a76e0fa5d50d45a2b8630cccc6adeb8d58221a1d09d6007" # Create a package for one specific language $1 pkg_lang() { @@ -48,7 +48,7 @@ post_install() { vdoc README.md vdoc testing/eurotext.tif vdoc testing/phototest.tif - vlicense tessdata/COPYING LICENSE-tessdata + vlicense ${FILESDIR}/COPYING LICENSE-tessdata # Move the pseudo languges "equ" (math / equation detection) and # "osd" (orientation and script detection) to the main package for lang in equ osd; do diff --git a/srcpkgs/textosaurus/template b/srcpkgs/textosaurus/template new file mode 100644 index 00000000000..27f8f2eff7c --- /dev/null +++ b/srcpkgs/textosaurus/template @@ -0,0 +1,26 @@ +# Template file for 'textosaurus' + +pkgname=textosaurus +version=0.9.7 +revision=1 +_scommit=24d3deb8bea74458224a2cdfc384a6971822448e +build_style=qmake +hostmakedepends="pkg-config qt5-tools" +makedepends="qt5-svg-devel" +depends="qt5-svg" +short_desc="Simple cross-platform text editor based on Qt and Scintilla" +maintainer="Leandro Vital " +license="GPL-3.0-only" +homepage="https://github.com/martinrotter/textosaurus" +distfiles="${homepage}/archive/${version}.tar.gz + https://github.com/martinrotter/scintilla/archive/${_scommit}.tar.gz" +checksum="73778d2e9de4cc4cf233f3b2832d9323e6586563746c7a2352813da62253ce18 + f9d3e1716417eacbe8128df2140a303a75734e9bf53731763d9c7be264249e75" + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel" +fi + +post_extract() { + cp -Trp ${XBPS_BUILDDIR}/scintilla-${_scommit} ${wrksrc}/src/libtextosaurus/3rd-party/scintilla +} diff --git a/srcpkgs/tigervnc/patches/xorg-1.20-ignore-fake-focus-events.patch b/srcpkgs/tigervnc/patches/xorg-1.20-ignore-fake-focus-events.patch new file mode 100644 index 00000000000..1893bf0d0bb --- /dev/null +++ b/srcpkgs/tigervnc/patches/xorg-1.20-ignore-fake-focus-events.patch @@ -0,0 +1,119 @@ +From 46665b6c791597d5f4f7a0351c491e4dd38b0d71 Mon Sep 17 00:00:00 2001 +From: Pierre Ossman +Date: Tue, 12 Jun 2018 15:57:27 +0200 +Subject: [PATCH 1/2] Update comment about keyboard grab on focus changes + +It is no longer a workaround but rather intended behaviour. + +From 1d94124f6854e73eef58c595b2b1a4d2a7333962 Mon Sep 17 00:00:00 2001 +From: Pierre Ossman +Date: Tue, 12 Jun 2018 15:58:34 +0200 +Subject: [PATCH 2/2] Ignore fake focus events from XGrabKeyboard() + +Grabbing (and ungrabbing) the keyboard generates fake focus events +with modern versions of Xorg. This causes an infinite loop since we +update the grab status on focus events. + +Work around this by ignoring these fake events. + +--- vncviewer/DesktopWindow.cxx ++++ vncviewer/DesktopWindow.cxx +@@ -662,20 +662,16 @@ int DesktopWindow::fltkHandle(int event, + + if (dw && fullscreenSystemKeys) { + switch (event) { ++ // Focus might not stay with us just because we have grabbed the ++ // keyboard. E.g. we might have sub windows, or we're not using ++ // all monitors and the user clicked on another application. ++ // Make sure we update our grabs with the focus changes. + case FL_FOCUS: +- // FIXME: We reassert the keyboard grabbing on focus as FLTK there are +- // some issues we need to work around: +- // a) Fl::grab(0) on X11 will release the keyboard grab for us. +- // b) Gaining focus on the system level causes FLTK to switch +- // window level on OS X. + if (dw->fullscreen_active()) + dw->grabKeyboard(); + break; + + case FL_UNFOCUS: +- // FIXME: We need to relinquish control when the entire window loses +- // focus as it is very tied to this specific window on some +- // platforms and we want to be able to open subwindows. + dw->ungrabKeyboard(); + break; + } +@@ -729,6 +725,23 @@ void DesktopWindow::fullscreen_on() + fullscreen(); + } + ++#if !defined(WIN32) && !defined(__APPLE__) ++Bool eventIsFocusWithSerial(Display *display, XEvent *event, XPointer arg) ++{ ++ unsigned long serial; ++ ++ serial = *(unsigned long*)arg; ++ ++ if (event->xany.serial != serial) ++ return False; ++ ++ if ((event->type != FocusIn) && (event->type != FocusOut)) ++ return False; ++ ++ return True; ++} ++#endif ++ + void DesktopWindow::grabKeyboard() + { + // Grabbing the keyboard is fairly safe as FLTK reroutes events to the +@@ -752,6 +765,11 @@ void DesktopWindow::grabKeyboard() + #else + int ret; + ++ XEvent xev; ++ unsigned long serial; ++ ++ serial = XNextRequest(fl_display); ++ + ret = XGrabKeyboard(fl_display, fl_xid(this), True, + GrabModeAsync, GrabModeAsync, CurrentTime); + if (ret) { +@@ -774,6 +792,16 @@ void DesktopWindow::grabKeyboard() + None, None, CurrentTime); + if (ret) + vlog.error(_("Failure grabbing mouse")); ++ ++ // Xorg 1.20+ generates FocusIn/FocusOut even when there is no actual ++ // change of focus. This causes us to get stuck in an endless loop ++ // grabbing and ungrabbing the keyboard. Avoid this by filtering out ++ // any focus events generated by XGrabKeyboard(). ++ XSync(fl_display, False); ++ while (XCheckIfEvent(fl_display, &xev, &eventIsFocusWithSerial, ++ (XPointer)&serial) == True) { ++ vlog.debug("Ignored synthetic focus event cause by grab change"); ++ } + #endif + } + +@@ -791,8 +819,20 @@ void DesktopWindow::ungrabKeyboard() + if (Fl::grab()) + return; + ++ XEvent xev; ++ unsigned long serial; ++ ++ serial = XNextRequest(fl_display); ++ + XUngrabPointer(fl_display, fl_event_time); + XUngrabKeyboard(fl_display, fl_event_time); ++ ++ // See grabKeyboard() ++ XSync(fl_display, False); ++ while (XCheckIfEvent(fl_display, &xev, &eventIsFocusWithSerial, ++ (XPointer)&serial) == True) { ++ vlog.debug("Ignored synthetic focus event cause by grab change"); ++ } + #endif + } + diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template index 61dbdf16039..a4da0c6d45b 100644 --- a/srcpkgs/tigervnc/template +++ b/srcpkgs/tigervnc/template @@ -1,8 +1,8 @@ # Template file for 'tigervnc' pkgname=tigervnc version=1.8.0 -revision=3 -_xorg_version=1.19.3 +revision=4 +_xorg_version=1.19.6 build_style=cmake short_desc="VNC client forked from TightVNC" maintainer="Evan Deaubl " @@ -16,7 +16,7 @@ homepage="http://www.tigervnc.org" distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz ${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2" checksum="9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 - 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98" + a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197" post_configure() { cd ${wrksrc}/unix/xserver diff --git a/srcpkgs/tilp2/patches/no-kde.patch b/srcpkgs/tilp2/patches/no-kde.patch new file mode 100644 index 00000000000..ea1cb05eafe --- /dev/null +++ b/srcpkgs/tilp2/patches/no-kde.patch @@ -0,0 +1,65 @@ +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -9,16 +9,16 @@ + tilp_CPPFLAGS = -I$(top_srcdir)/intl \ + @TICABLES_CFLAGS@ @TIFILES_CFLAGS@ @TICALCS_CFLAGS@ @TICONV_CFLAGS@ \ + @GLIB_CFLAGS@ @GTK_CFLAGS@ \ +- @KDE_INCLUDES@ @QT_INCLUDES@ \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DGTK_DISABLE_DEPRECATED ++# @KDE_INCLUDES@ @QT_INCLUDES@ + tilp_LDFLAGS = -export-dynamic + tilp_LDADD = @TICABLES_LIBS@ @TIFILES_LIBS@ @TICALCS_LIBS@ @TICONV_LIBS@ \ +- @GLIB_LIBS@ @GTK_LIBS@ \ +- @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \ +- @QT_LDFLAGS@ @X_LDFLAGS@ @LIBZ@ ++ @GLIB_LIBS@ @GTK_LIBS@ @LIBZ@ ++# @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \ ++# @QT_LDFLAGS@ @X_LDFLAGS@ + tilp_SOURCES = *.h \ + tilp_calcs.c tilp_cmdline.c tilp_config.c tilp_error.c \ + tilp_files.c tilp_gif.c tilp_main.c \ +--- configure.ac.orig ++++ configure.ac +@@ -118,22 +118,23 @@ + CFLAGS="$CFLAGS $ARCH" + + # KDE dialogs support +-AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no]) +-if test "x$kde" = "xdefault"; then +- case $host_os in +- *mingw*) +- kde=no +- ;; +- *) +- kde=yes +- ;; +- esac +-fi +-if test "x$kde" = "xyes"; then +- AC_PROG_CXX +- AC_PATH_KDE +- AC_DEFINE(WITH_KDE, 1, [Use KDE support]) +-fi ++#AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no]) ++#if test "x$kde" = "xdefault"; then ++# case $host_os in ++# *mingw*) ++# kde=no ++# ;; ++# *) ++# kde=yes ++# ;; ++# esac ++#fi ++#if test "x$kde" = "xyes"; then ++# AC_PROG_CXX ++# AC_PATH_KDE ++# AC_DEFINE(WITH_KDE, 1, [Use KDE support]) ++#fi ++kde=no + AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes") + AC_SUBST(kde) + diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template new file mode 100644 index 00000000000..e6f6335e53d --- /dev/null +++ b/srcpkgs/tilp2/template @@ -0,0 +1,25 @@ +# Template file for 'tilp2' +pkgname=tilp2 +version=1.18 +revision=1 +build_style=gnu-configure +hostmakedepends="automake bison groff intltool libtool pkg-config texinfo" +makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel + gettext-devel libticonv-devel libtifiles2-devel libticables2-devel + libticalcs2-devel" +depends="xdg-utils gfm" +short_desc="Connect to TI calculators" +maintainer="Andrew Benson " +license="GPL-2.0-or-later" +homepage="https://www.ticalc.org" +distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${version}.tar.bz2" +checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" gettext-devel glib-devel" +fi + +pre_configure() { + mkdir -p m4 + autoreconf -i -v -f +} diff --git a/srcpkgs/time/template b/srcpkgs/time/template index 9eaea59b95f..5fbbf3648a9 100644 --- a/srcpkgs/time/template +++ b/srcpkgs/time/template @@ -1,18 +1,14 @@ # Template file for 'time' pkgname=time version=1.9 -revision=1 +revision=2 build_style=gnu-configure -short_desc="The GNU time program for measuring cpu resource usage" +short_desc="Displays information about the resources that a program uses" maintainer="Juan RP " -homepage="http://directory.fsf.org/project/time" license="GPL-3.0-or-later" -distfiles="$GNU_SITE/$pkgname/$pkgname-$version.tar.gz" +homepage="https://directory.fsf.org/wiki/Time" +distfiles="${GNU_SITE}/time/time-${version}.tar.gz" checksum=fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e # Required by wait3(2) with musl CFLAGS="-D_GNU_SOURCE" - -do_install() { - make bindir="${DESTDIR}/usr/bin" infodir="${DESTDIR}/usr/share/info" install -} diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template new file mode 100644 index 00000000000..f800d9f9710 --- /dev/null +++ b/srcpkgs/timeshift/template @@ -0,0 +1,19 @@ +# Template file for 'timeshift' +pkgname=timeshift +version=18.6.1 +revision=1 +build_style=gnu-makefile +hostmakedepends="pkg-config vala" +makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel" +depends="rsync" +conf_files="/etc/default/timeshift.json" +short_desc="System restore tool" +maintainer="Andrew Benson " +license="GPL-3.0-or-later" +homepage="http://www.teejeetech.in/p/timeshift.html" +distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz" +checksum=2c851b232e622f75facc289a4a163218d1943b239eeadb2988acb23c80fc30a2 + +post_install() { + rm "${DESTDIR}/usr/bin/timeshift-uninstall" +} diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template index f5f22a4f91d..f7e0eee2434 100644 --- a/srcpkgs/tinc/template +++ b/srcpkgs/tinc/template @@ -1,15 +1,15 @@ # Template file for 'tinc' pkgname=tinc -version=1.0.33 -revision=3 +version=1.0.34 +revision=1 build_style=gnu-configure makedepends="zlib-devel lzo-devel libressl-devel" short_desc="VPN (Virtual Private Network) daemon" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.tinc-vpn.org" distfiles="${homepage}/packages/${pkgname}-${version}.tar.gz" -checksum=7f6f5dc6444bc651ac635c81f4745bcce581bbd1d45ed60cbdc4ee11bebb10f4 +checksum=c03a9b61dedd452116dd9a8db231545ba08a7c96bce011e0cbd3cfd2c56dcfda post_install() { vsv tincd diff --git a/srcpkgs/tmux-xpanes/template b/srcpkgs/tmux-xpanes/template index 8705a0a361e..366f66848a2 100644 --- a/srcpkgs/tmux-xpanes/template +++ b/srcpkgs/tmux-xpanes/template @@ -1,19 +1,22 @@ # Template file for 'tmux-xpanes' pkgname=tmux-xpanes -version=2.2.3 +version=3.0.0 revision=1 short_desc="Awesome way to create multiple tmux panes" maintainer="lemmi " license="MIT" homepage="https://github.com/greymd/tmux-xpanes" distfiles="https://github.com/greymd/tmux-xpanes/archive/v${version}.tar.gz" -checksum=4357b8ac76f3d0b93dbb1626e0881f03143910f428a78db3d8437950bbd15fef +checksum=7874daf62fd9fb85fb510e6ae60ae99146ff65c5648b8421b946cd0d021f6b3f do_install() { vbin bin/xpanes + vbin bin/tmux-xpanes vlicense LICENSE vman man/xpanes.1 + vman man/tmux-xpanes.1 - vinstall contrib/completion/zsh/_xpanes 644 usr/share/zsh/site-functions + vinstall completion/zsh/_xpanes 644 usr/share/zsh/site-functions + vinstall completion/zsh/_tmux-xpanes 644 usr/share/zsh/site-functions } diff --git a/srcpkgs/tomahawk-qt5/patches/liblastfm.patch b/srcpkgs/tomahawk-qt5/patches/liblastfm.patch new file mode 100644 index 00000000000..782c7fb51e8 --- /dev/null +++ b/srcpkgs/tomahawk-qt5/patches/liblastfm.patch @@ -0,0 +1,103 @@ +diff --git CMakeModules/FindLibLastFm.cmake CMakeModules/FindLibLastFm.cmake +index a3488350e..545e39f9b 100644 +--- CMakeModules/FindLibLastFm.cmake ++++ CMakeModules/FindLibLastFm.cmake +@@ -14,7 +14,7 @@ endif() + # Include dir + find_path(LIBLASTFM_INCLUDE_DIR + # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then +- NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h ++ NAMES lastfm/Track.h + PATHS ${KDE4_INCLUDE_DIR} + ) + +diff --git src/libtomahawk/accounts/lastfm/LastFmConfig.cpp src/libtomahawk/accounts/lastfm/LastFmConfig.cpp +index 85b747be8..c1d2e1343 100644 +--- src/libtomahawk/accounts/lastfm/LastFmConfig.cpp ++++ src/libtomahawk/accounts/lastfm/LastFmConfig.cpp +@@ -30,10 +30,10 @@ + #include "utils/NetworkAccessManager.h" + + #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #else + #include + #include +diff --git src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp +index 277a62e17..f5111fc6f 100644 +--- src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp ++++ src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp +@@ -35,8 +35,8 @@ + #include "utils/NetworkAccessManager.h" + + #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +-#include +-#include ++#include ++#include + #else + #include + #include +diff --git src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h +index 0eb3b0749..c7de68e98 100644 +--- src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h ++++ src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h +@@ -25,9 +25,9 @@ + #include "DllMacro.h" + + #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +-#include +-#include +-#include ++#include ++#include ++#include + #else + #include + #include +diff --git src/libtomahawk/utils/TomahawkUtils.cpp src/libtomahawk/utils/TomahawkUtils.cpp +index 0baa27c37..019db4af2 100644 +--- src/libtomahawk/utils/TomahawkUtils.cpp ++++ src/libtomahawk/utils/TomahawkUtils.cpp +@@ -33,7 +33,7 @@ + + #ifdef LIBLASTFM_FOUND + #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +- #include ++ #include + #else + #include + #endif +diff --git src/tomahawk/Scrobbler.h src/tomahawk/Scrobbler.h +index 01c26959c..f117c896c 100644 +--- src/tomahawk/Scrobbler.h ++++ src/tomahawk/Scrobbler.h +@@ -25,7 +25,7 @@ + + + #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +-#include ++#include + #else + #include + #endif +diff --git src/tomahawk/TomahawkApp.h src/tomahawk/TomahawkApp.h +index 953140bd4..eab6b8de4 100644 +--- src/tomahawk/TomahawkApp.h ++++ src/tomahawk/TomahawkApp.h +@@ -65,7 +65,7 @@ namespace Tomahawk + + #ifdef LIBLASTFM_FOUND + #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +- #include ++ #include + #else + #include + #endif diff --git a/srcpkgs/tomahawk-qt5/template b/srcpkgs/tomahawk-qt5/template index d16c4d98f58..023fe43fb77 100644 --- a/srcpkgs/tomahawk-qt5/template +++ b/srcpkgs/tomahawk-qt5/template @@ -1,8 +1,9 @@ # Template file for 'tomahawk' pkgname=tomahawk-qt5 version=0.8.4 -revision=12 -wrksrc=${pkgname%-*}-${version} +revision=13 +wrksrc=${pkgname%-*}-${_commit} +_commit=00f602e10203b76fc28b4615868c567e6bd4ced4 build_style=cmake build_options="upower hatchet kde xmpp" desc_option_hatchet="Enable support for http://hatchet.is" @@ -16,59 +17,27 @@ configure_args="-Wno-dev -DBUILD_RELEASE=ON \ -DTAGLIB_MIN_VERSION=1.10 \ $(vopt_if kde '-DWITH_KDE4=ON' '-DWITH_KDE4=OFF') \ $(vopt_if upower '-DWITH_UPOWER=ON' '-DWITH_UPOWER=OFF')" -hostmakedepends="pkg-config" -makedepends="boost-devel Lucene++-devel qt5-devel taglib-devel sparsehash - gnutls-devel qt5-webkit-devel qca-qt5-devel attica-qt5-devel qtkeychain-qt5-devel - qt5-svg-devel qt5-tools-devel phonon-qt5-devel liblastfm-qt5-devel quazip-qt5-devel - libechonest-qt5-devel libressl-devel $(vopt_if hatchet websocketpp) +hostmakedepends="pkg-config extra-cmake-modules" +makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel + libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel + qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel + quazip-qt5-devel sparsehash taglib-devel vlc-devel $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-qt5-devel) $(vopt_if kde telepathy-qt5-devel)" depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)" short_desc="Multi-source social music player" maintainer="Duncaen " -license="GPL-3" -homepage="http://tomahawk-player.org/" -distfiles="http://download.tomahawk-player.org/${pkgname%-*}-${version}.tar.bz2" -checksum=0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 +license="GPL-3.0-or-later" +homepage="https://tomahawk-player.org/" +distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz" +checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79 provides="tomahawk-${version}_${revision}" replaces="tomahawk>=0" if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel" + hostmakedepends+=" qt5-host-tools qt5-qmake" fi -post_extract() { - # fix echonest-qt5 detection - sed -i 's|echonest/Track.h|echonest5/Track.h|' CMakeModules/FindEchonest.cmake - # fix echonest-qt5 includes - sed -i 's|^#include ' src/libtomahawk/network/acl/AclRegistry.cpp - sed -i '30a#include ' src/libtomahawk/utils/TomahawkCache.h - # fix musl build - sed -i '41a#include ' src/libtomahawk/accounts/ResolverAccount.cpp -} - tomahawk-qt5-devel_package() { depends="tomahawk-qt5>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template index d38b64fc396..780f7786f9e 100644 --- a/srcpkgs/totem-pl-parser/template +++ b/srcpkgs/totem-pl-parser/template @@ -1,19 +1,19 @@ # Template file for 'totem-pl-parser' pkgname=totem-pl-parser -version=3.26.0 +version=3.26.1 revision=1 build_style=meson # XXX needs libquvi>=0.9 configure_args="-Denable-libarchive=yes -Denable-libgcrypt=yes" -hostmakedepends="pkg-config intltool glib-devel - $(vopt_if gir gobject-introspection)" -makedepends="libsoup-gnome-devel gmime-devel libarchive-devel libgcrypt-devel" +hostmakedepends="glib-devel intltool pkg-config + $(vopt_if gir 'gobject-introspection')" +makedepends="gmime-devel libarchive-devel libgcrypt-devel libsoup-gnome-devel" short_desc="Totem playlist parser library" maintainer="Enno Boland " +license="LGPL-2.0-or-later" homepage="http://www.gnome.org" -license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=6ae2c4b8acaf052af21b8db256b6314385de031ba721a2dbdb361e90d4b4b74c # Package build options build_options="gir" @@ -23,7 +23,8 @@ if [ -z "$CROSS_BUILD" ]; then fi totem-pl-parser-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} totem-pl-parser-${version}_${revision} + libtotem-plparser-mini-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -34,3 +35,10 @@ totem-pl-parser-devel_package() { fi } } + +libtotem-plparser-mini_package() { + short_desc+=" - totem-plparser-mini library" + pkg_install() { + vmove "usr/lib/libtotem-plparser-mini.so.*" + } +} diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 73d44fd8ae9..da4c16869ee 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,31 +1,25 @@ # Template file for 'totem' pkgname=totem -version=3.26.0 -revision=2 +version=3.26.1 +revision=1 +build_style=meson +configure_args="-Denable-python=no -Denable-nautilius=yes" +hostmakedepends="gnome-doc-utils intltool itstool pkg-config + $(vopt_if gir 'gobject-introspection')" +# XXX missing lirc plugin. +makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel + evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1 + gst-plugins-ugly1 libSM-devel libXtst-devel libepc-devel libpeas-devel + nautilus-devel vala-devel zeitgeist-devel" +depends="grilo-plugins gst-libav gst-plugins-good1 gst-plugins-ugly1" short_desc="A GNOME integrated movie player based on Gstreamer" maintainer="Enno Boland " homepage="http://www.gnome.org" -license="LGPL-2, GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13 - -build_style=meson -configure_args="-Denable-python=no -Denable-nautilius=yes" - -hostmakedepends="pkg-config intltool gnome-doc-utils - itstool $(vopt_if gir gobject-introspection)" - -# XXX missing lirc plugin. -makedepends=" - gnutls-devel gst-plugins-base1-devel totem-pl-parser-devel - evolution-data-server-devel dbus-glib-devel zeitgeist-devel - clutter-gst3-devel clutter-gtk-devel libSM-devel - libpeas-devel libXtst-devel grilo-devel libepc-devel vala-devel - gst-plugins-bad1-devel gsettings-desktop-schemas-devel - nautilus-devel gst-plugins-ugly1 gst-plugins-good1 - gnome-desktop-devel" -depends="grilo-plugins>=0.2.12 hicolor-icon-theme desktop-file-utils - gst-libav gst-plugins-ugly1 gst-plugins-good1" +license="LGPL-2.0-or-later, GPL-2.0-or-later" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=298160c9ee8d34f1ac6586c69e0440e3586a75fd4b1719d79f908edb9c00c382 +hostmakedepends="gnome-doc-utils intltool itstool pkg-config + $(vopt_if gir 'gobject-introspection')" # XXX xulrunner plugin. # XXX reenable python plugin if pylint pkg exists. @@ -45,6 +39,7 @@ libtotem_package() { vmove usr/lib/girepository-1.0 } } + totem-devel_package() { depends="gtk+3-devel totem-pl-parser-devel libtotem>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/toxcore/template b/srcpkgs/toxcore/template index 3128748e528..2f2bd66c379 100644 --- a/srcpkgs/toxcore/template +++ b/srcpkgs/toxcore/template @@ -1,6 +1,6 @@ # Template file for 'toxcore' pkgname=toxcore -version=0.2.2 +version=0.2.3 revision=1 wrksrc="c-toxcore-${version}" configure_args="-DMUST_BUILD_TOXAV=ON -DBUILD_TOXAV=ON -DDHT_BOOTSTARP=OFF @@ -12,8 +12,9 @@ short_desc="Encrypted peer-to-peer instant messenger protocol library" maintainer="Spencer Hill " license="GPL-3.0-or-later" homepage="https://tox.chat" +changelog="https://raw.githubusercontent.com/TokTok/c-toxcore/master/CHANGELOG.md" distfiles="https://github.com/TokTok/c-toxcore/archive/v${version}.tar.gz" -checksum=a3b25d8bd92b9526b47ba1f60a2893d2154a80bb7ae690f44b5a2dea41c76ea1 +checksum=22c52f286c46d3f802edb6978bcf2a53f8301363e2b745784613427a33ba3a34 post_install() { vsconf other/bootstrap_daemon/tox-bootstrapd.conf @@ -24,7 +25,7 @@ toxcore-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a + vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template index 652015b0e2f..990760f6213 100644 --- a/srcpkgs/toybox/template +++ b/srcpkgs/toybox/template @@ -1,6 +1,6 @@ # Template file for 'toybox' pkgname=toybox -version=0.7.6 +version=0.7.7 revision=1 create_wrksrc=yes short_desc="BSD-licensed alternative to busybox" @@ -8,7 +8,7 @@ maintainer="Steve Prybylski " license="0BSD" homepage="http://www.landley.net/toybox" distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz" -checksum=e2c9643ebc2bcdec4d8f8db25d0b428dbe0928f7b730052dbbd25db47fb9db95 +checksum=ee218ab21c80044c04112ada7f59320062c35909a6e5f850b1318b17988ffba0 post_extract() { mv toybox-${version} toybox diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template index 1cdaf6aa842..76cd25c184d 100644 --- a/srcpkgs/tracker-miners/template +++ b/srcpkgs/tracker-miners/template @@ -1,19 +1,18 @@ # Template file for 'tracker-miners' pkgname=tracker-miners -version=2.0.4 +version=2.0.5 revision=1 build_style=gnu-configure configure_args="--enable-libvorbis --enable-libflac" -hostmakedepends="pkg-config glib vala intltool glib-devel" -makedepends="zlib-devel libglib-devel tracker-devel glib-devel libxml2-devel - libseccomp-devel giflib-devel libpng-devel taglib-devel libgsf-devel - libvorbis-devel libflac-devel" +hostmakedepends="glib-devel intltool pkg-config vala" +makedepends="giflib-devel glib-devel libflac-devel libgsf-devel libpng-devel + libseccomp-devel libvorbis-devel taglib-devel tracker-devel" short_desc="Data miners for tracker" maintainer="Sir_Boops " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://developer.gnome.org/libtracker-miner/stable" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" -checksum=4626646167e405be5f8b3f831c82cfcdf86ba20d3598fca41ea8c4a8b8a8e956 +checksum=6499c083761631b14ad58d463c4af1d69bca842d9a3d11a6c456ced5d0b26802 post_install() { rm -rf ${DESTDIR}/usr/lib/systemd # we don't need this diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index 15c6c92be10..6b0b75c2d71 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,6 +1,6 @@ # Template file for 'tracker' pkgname=tracker -version=2.0.3 +version=2.0.4 revision=1 build_style=gnu-configure configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests @@ -8,22 +8,19 @@ configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests $(vopt_enable gir introspection) LDFLAGS= ac_cv_lib_sqlite3_sqlite3_threadsafe=yes ax_cv_sqlite_threadsafe=yes ax_cv_sqlite_auto_extension=yes ax_cv_sqlite_builtin_fts5=yes" -hostmakedepends="automake libtool pkg-config intltool glib-devel - gettext-devel gobject-introspection libxslt python3" -makedepends=" - libpng-devel libgee-devel libsecret-devel upower-devel - exempi-devel poppler-glib-devel gupnp-dlna-devel libgxps-devel - libgsf-devel icu-devel enca-devel libvorbis-devel libflac-devel - taglib-devel giflib-devel totem-pl-parser-devel - libexif-devel tiff-devel network-manager-applet-devel sqlite-devel - libmediaart-devel libuuid-devel libxslt-devel json-glib-devel - libseccomp-devel" +hostmakedepends="automake gettext-devel glib-devel gobject-introspection + intltool libxslt pkg-config" +makedepends="enca-devel exempi-devel giflib-devel gupnp-dlna-devel + json-glib-devel libexif-devel libflac-devel libgee-devel libgsf-devel + libgxps-devel libmediaart-devel libseccomp-devel libsecret-devel + libvorbis-devel libxslt-devel network-manager-applet-devel poppler-glib-devel + taglib-devel totem-pl-parser-devel upower-devel" short_desc="Personal search tool and storage system" maintainer="Juan RP " -license="GPL-2" -homepage="http://live.gnome.org/Tracker" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=5a2fb274c128ec67a920944937b5147ceaf5db16fef6691ea22c4cb841e20580 +license="GPL-2.0-or-later" +homepage="https://live.gnome.org/Tracker" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=ce2f0db52666592d313a04ce14663110eafa8ab08dc213b53e790281362dccd5 # Package build options build_options="gir" diff --git a/srcpkgs/transcode/patches/musl.patch b/srcpkgs/transcode/patches/musl.patch new file mode 100644 index 00000000000..f731fda93d3 --- /dev/null +++ b/srcpkgs/transcode/patches/musl.patch @@ -0,0 +1,20 @@ +--- avilib/avidump.c.orig ++++ avilib/avidump.c +@@ -320,7 +320,7 @@ + { + uint32_t i,j,val32; + uint16_t val16; +- loff_t val64; ++ uint64_t val64; + char val8; + + for (i = 0; names[i].type != EoLST; i++) { +@@ -605,7 +605,7 @@ + + case indxtag: { + uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(char*); +- loff_t offset; ++ uint64_t offset; + uint32_t size, duration; + uint32_t u=0; + off_t indxend = datapos + chunks; diff --git a/srcpkgs/transcode/patches/transcode-configure_in.patch b/srcpkgs/transcode/patches/transcode-configure_in.patch new file mode 100644 index 00000000000..ee76928fb73 --- /dev/null +++ b/srcpkgs/transcode/patches/transcode-configure_in.patch @@ -0,0 +1,45 @@ +--- configure.in.orig 2018-06-22 20:57:08.925033685 +0200 ++++ configure.in 2018-06-22 20:58:19.544037328 +0200 +@@ -776,42 +776,6 @@ + LAME_CFLAGS="$lame_ii" + fi + CPPFLAGS="$save_CPPFLAGS" +- +- AC_MSG_CHECKING([lame version]) +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $LAME_CFLAGS" +- LIBS="$LIBS $LAME_LIBS" +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#include +- +-#ifdef HAVE_LAME_INC +-#include +-#else +-#include +-#endif +- +-int main () { +- lame_version_t lv; +- get_lame_version_numerical(&lv); +- if(lv.alpha || lv.beta) lv.minor--; +- printf("%d%d\n", lv.major, lv.minor); +- return 0; +-} +-]])], +- [lame_version="`./conftest$ac_exeext`"], +- [AC_MSG_RESULT([failed]) +- TC_PKG_ERROR(lame, lame.h, yes, lame, [http://www.mp3dev.org/], +- [cannot compile and run a test program])],, +- [AC_MSG_RESULT([cross compiling; assumed OK...])]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- +- if test 393 -ge "$lame_version" ; then +- have_lame="no" +- TC_PKG_ERROR(lame, lame.h, yes, lame, [http://www.mp3dev.org/], +- [lame version < 3.93]) +- fi + fi + TC_PKG_HAVE(lame, LAME) + diff --git a/srcpkgs/transcode/patches/transcode-ffmpeg3.patch b/srcpkgs/transcode/patches/transcode-ffmpeg3.patch new file mode 100644 index 00000000000..570038d5d76 --- /dev/null +++ b/srcpkgs/transcode/patches/transcode-ffmpeg3.patch @@ -0,0 +1,1241 @@ +Submitted By: Armion K. +Date: 2016-05-06 +Initial Package Version: 1.1.7 +Upstream Status: Unknown +Origin: Gentoo and Debian +Description: Fixes building against FFmpeg version >= 3.0.0 + +--- encode/encode_lavc.c 2011-11-19 17:50:27.000000000 +0100 ++++ encode/encode_lavc.c 2016-02-15 16:08:37.914488116 +0100 +@@ -74,6 +74,9 @@ + int lmin; + int lmax; + int me_method; ++ int luma_elim_threshold; ++ int chroma_elim_threshold; ++ int quantizer_noise_shaping; + + /* same as above for flags */ + struct { +@@ -114,6 +117,7 @@ + + AVFrame ff_venc_frame; + AVCodecContext ff_vcontext; ++ AVDictionary * ff_opts; + + AVCodec *ff_vcodec; + +@@ -164,6 +168,7 @@ + TC_CODEC_ERROR + }; + ++#if LIBAVCODEC_VERSION_MAJOR < 55 + static const enum CodecID tc_lavc_internal_codecs[] = { + CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4, + CODEC_ID_H263I, CODEC_ID_H263P, +@@ -176,6 +181,20 @@ + CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3, + CODEC_ID_NONE + }; ++#else ++static const enum AVCodecID tc_lavc_internal_codecs[] = { ++ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4, ++ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P, ++ AV_CODEC_ID_H264, ++ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, ++ AV_CODEC_ID_RV10, ++ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1, ++ AV_CODEC_ID_DVVIDEO, ++ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG, ++ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3, ++ AV_CODEC_ID_NONE ++}; ++#endif + + static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR }; + +@@ -214,7 +233,7 @@ + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + } + +@@ -228,7 +247,7 @@ + IMG_YUV_DEFAULT, + pd->ff_vcontext.width, pd->ff_vcontext.height); + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV422P, ++ AV_PIX_FMT_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(src, IMG_YUV_DEFAULT, + pd->ff_venc_frame.data, IMG_YUV422P, +@@ -244,7 +263,7 @@ + IMG_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(src, IMG_YUV422P, + pd->ff_venc_frame.data, IMG_YUV420P, +@@ -256,7 +275,7 @@ + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, +- PIX_FMT_YUV422P, ++ AV_PIX_FMT_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + + } +@@ -266,7 +285,7 @@ + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT, + pd->ff_venc_frame.data, IMG_YUV420P, +@@ -591,21 +610,21 @@ + case CODEC_YUV: + if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { + pd->tc_pix_fmt = TC_CODEC_YUV422P; +- pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P; ++ pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P; + pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv; + } else { + pd->tc_pix_fmt = TC_CODEC_YUV420P; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ420P +- : PIX_FMT_YUV420P; ++ ? AV_PIX_FMT_YUVJ420P ++ : AV_PIX_FMT_YUV420P; + pd->pre_encode_video = pre_encode_video_yuv420p; + } + break; + case CODEC_YUV422: + pd->tc_pix_fmt = TC_CODEC_YUV422P; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ422P +- : PIX_FMT_YUV422P; ++ ? AV_PIX_FMT_YUVJ422P ++ : AV_PIX_FMT_YUV422P; + if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { + pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv; + } else { +@@ -615,10 +634,10 @@ + case CODEC_RGB: + pd->tc_pix_fmt = TC_CODEC_RGB; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) +- ? PIX_FMT_YUV422P ++ ? AV_PIX_FMT_YUV422P + : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ420P +- : PIX_FMT_YUV420P; ++ ? AV_PIX_FMT_YUVJ420P ++ : AV_PIX_FMT_YUV420P; + pd->pre_encode_video = pre_encode_video_rgb24; + break; + default: +@@ -937,7 +956,11 @@ + static void tc_lavc_config_defaults(TCLavcPrivateData *pd) + { + /* first of all reinitialize lavc data */ ++#if LIBAVCODEC_VERSION_MAJOR < 55 + avcodec_get_context_defaults(&pd->ff_vcontext); ++#else ++ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL); ++#endif + + pd->confdata.thread_count = 1; + +@@ -955,8 +978,6 @@ + /* + * context *transcode* (not libavcodec) defaults + */ +- pd->ff_vcontext.mb_qmin = 2; +- pd->ff_vcontext.mb_qmax = 31; + pd->ff_vcontext.max_qdiff = 3; + pd->ff_vcontext.max_b_frames = 0; + pd->ff_vcontext.me_range = 0; +@@ -977,8 +998,8 @@ + pd->ff_vcontext.mpeg_quant = 0; + pd->ff_vcontext.rc_initial_cplx = 0.0; + pd->ff_vcontext.rc_qsquish = 1.0; +- pd->ff_vcontext.luma_elim_threshold = 0; +- pd->ff_vcontext.chroma_elim_threshold = 0; ++ pd->confdata.luma_elim_threshold = 0; ++ pd->confdata.chroma_elim_threshold = 0; + pd->ff_vcontext.strict_std_compliance = 0; + pd->ff_vcontext.dct_algo = FF_DCT_AUTO; + pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; +@@ -1002,7 +1023,7 @@ + pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; + pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; + pd->ff_vcontext.noise_reduction = 0; +- pd->ff_vcontext.quantizer_noise_shaping = 0; ++ pd->confdata.quantizer_noise_shaping = 0; + pd->ff_vcontext.flags = 0; + } + +@@ -1033,17 +1054,10 @@ + pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; + + pd->ff_vcontext.flags = 0; +- SET_FLAG(pd, mv0); +- SET_FLAG(pd, cbp); + SET_FLAG(pd, qpel); +- SET_FLAG(pd, alt); +- SET_FLAG(pd, vdpart); +- SET_FLAG(pd, naq); + SET_FLAG(pd, ilme); + SET_FLAG(pd, ildct); + SET_FLAG(pd, aic); +- SET_FLAG(pd, aiv); +- SET_FLAG(pd, umv); + SET_FLAG(pd, psnr); + SET_FLAG(pd, trell); + SET_FLAG(pd, gray); +@@ -1064,6 +1078,36 @@ + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; + } ++ if (pd->confdata.flags.alt) { ++ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); ++ } ++ if (pd->confdata.flags.vdpart) { ++ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0); ++ } ++ if (pd->confdata.flags.umv) { ++ av_dict_set(&(pd->ff_opts), "umv", "1", 0); ++ } ++ if (pd->confdata.flags.aiv) { ++ av_dict_set(&(pd->ff_opts), "aiv", "1", 0); ++ } ++ if (pd->confdata.flags.cbp) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); ++ } ++ if (pd->confdata.flags.mv0) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0); ++ } ++ if (pd->confdata.flags.naq) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); ++ } ++ ++ char buf[1024]; ++#define set_dict_opt(val, opt) \ ++ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ ++ av_dict_set(&(pd->ff_opts), opt, buf, 0) ++ ++ set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); ++ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); ++ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); + } + + #undef SET_FLAG +@@ -1116,12 +1160,10 @@ + // handled by transcode core + // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + // handled by transcode core +- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, +- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, +- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES }, ++ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX }, + { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, }, + { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, + { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, +@@ -1150,8 +1192,8 @@ + { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, + // { "vrc_init_occupancy", }, // not yet supported + { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, +- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, +- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, ++ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, ++ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, + { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, +@@ -1177,25 +1219,25 @@ + { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, + { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, + { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, +- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, ++ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, + { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + +- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, +- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, ++ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, ++ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, +- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, ++ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, + { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, +- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, +- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART }, ++ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, ++ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, + #else + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, + #endif +- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV }, +- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV }, ++ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, ++ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, +@@ -1345,12 +1387,14 @@ + + pd = self->userdata; + ++ pd->ff_opts = NULL; ++ + pd->flush_flag = vob->encoder_flush; + + /* FIXME: move into core? */ + TC_INIT_LIBAVCODEC; + +- avcodec_get_frame_defaults(&pd->ff_venc_frame); ++ av_frame_unref(&pd->ff_venc_frame); + /* + * auxiliary config data needs to be blanked too + * before any other operation +@@ -1387,7 +1431,7 @@ + pd->confdata.thread_count, + (pd->confdata.thread_count > 1) ?"s" :""); + } +- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count); ++ pd->ff_vcontext.thread_count = pd->confdata.thread_count; + + pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); + if (pd->ff_vcodec == NULL) { +@@ -1397,11 +1441,11 @@ + } + + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec); ++ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts)); + TC_UNLOCK_LIBAVCODEC; + + if (ret < 0) { +- tc_log_error(MOD_NAME, "avcodec_open() failed"); ++ tc_log_error(MOD_NAME, "avcodec_open2() failed"); + goto failed; + } + /* finally, pass up the extradata, if any */ +@@ -1483,6 +1527,8 @@ + vframe_list_t *outframe) + { + TCLavcPrivateData *pd = NULL; ++ AVPacket pkt; ++ int ret, got_packet = 0; + + TC_MODULE_SELF_CHECK(self, "encode_video"); + +@@ -1497,12 +1543,15 @@ + + pd->pre_encode_video(pd, inframe); + ++ av_init_packet(&pkt); ++ pkt.data = outframe->video_buf; ++ pkt.size = inframe->video_size; ++ + TC_LOCK_LIBAVCODEC; +- outframe->video_len = avcodec_encode_video(&pd->ff_vcontext, +- outframe->video_buf, +- inframe->video_size, +- &pd->ff_venc_frame); ++ ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt, ++ &pd->ff_venc_frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; ++ outframe->video_len = ret ? ret : pkt.size; + + if (outframe->video_len < 0) { + tc_log_warn(MOD_NAME, "encoder error: size (%i)", +--- export/aud_aux.c 2011-11-19 17:50:27.000000000 +0100 ++++ export/aud_aux.c 2016-02-15 16:08:37.914488116 +0100 +@@ -326,10 +326,10 @@ + + switch (o_codec) { + case 0x50: +- codeid = CODEC_ID_MP2; ++ codeid = AV_CODEC_ID_MP2; + break; + case 0x2000: +- codeid = CODEC_ID_AC3; ++ codeid = AV_CODEC_ID_AC3; + break; + default: + tc_warn("cannot init ffmpeg with %x", o_codec); +@@ -346,7 +346,7 @@ + + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- +- avcodec_get_context_defaults(&mpa_ctx); ++ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); + #if LIBAVCODEC_VERSION_MAJOR < 53 + mpa_ctx.codec_type = CODEC_TYPE_AUDIO; + #else +@@ -359,11 +359,11 @@ + //-- open codec -- + //---------------- + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(&mpa_ctx, mpa_codec); ++ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", +- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3"); ++ (codeid == AV_CODEC_ID_MP2) ?"mpa" :"ac3"); + return(TC_EXPORT_ERROR); + } + +@@ -846,6 +846,9 @@ + #ifdef HAVE_FFMPEG + int in_size, out_size; + char *in_buf; ++ int got_packet; ++ AVPacket avpkt = { 0 }; ++ AVFrame *frame = av_frame_alloc(); + + //-- input buffer and amount of bytes -- + in_size = aud_size; +@@ -866,10 +869,14 @@ + + ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed); + ++ frame->nb_samples = mpa_ctx.frame_size; ++ avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)mpa_buf, mpa_bytes_pf, 1); ++ avpkt.data = output; ++ avpkt.size = OUTPUT_SIZE; + TC_LOCK_LIBAVCODEC; +- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output, +- OUTPUT_SIZE, (short *)mpa_buf); ++ out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; ++ out_size = avpkt.size; + tc_audio_write(output, out_size, avifile); + + in_size -= bytes_needed; +@@ -884,6 +891,7 @@ + + ac_memcpy(&mpa_buf[mpa_buf_ptr], aud_buffer, bytes_avail); + mpa_buf_ptr += bytes_avail; ++ av_frame_free(&frame); + return (0); + } + } //bytes availabe from last call? +@@ -893,10 +901,15 @@ + //---------------------------------------------------- + + while (in_size >= mpa_bytes_pf) { ++ av_frame_unref(frame); ++ frame->nb_samples = mpa_ctx.frame_size; ++ avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)in_buf, mpa_bytes_pf, 1); ++ avpkt.data = output; ++ avpkt.size = OUTPUT_SIZE; + TC_LOCK_LIBAVCODEC; +- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output, +- OUTPUT_SIZE, (short *)in_buf); ++ out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; ++ out_size = avpkt.size; + + tc_audio_write(output, out_size, avifile); + +@@ -904,6 +917,8 @@ + in_buf += mpa_bytes_pf; + } + ++ av_frame_free(&frame); ++ + //-- hold rest of bytes in mpa-buffer -- + //-------------------------------------- + if (in_size > 0) { +--- export/export_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ export/export_ffmpeg.c 2016-02-15 16:08:37.915488139 +0100 +@@ -122,6 +122,7 @@ + static AVFrame *lavc_convert_frame = NULL; + + static AVCodec *lavc_venc_codec = NULL; ++static AVDictionary *lavc_venc_opts = NULL; + static AVFrame *lavc_venc_frame = NULL; + static AVCodecContext *lavc_venc_context; + static avi_t *avifile = NULL; +@@ -180,7 +181,7 @@ + + + /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ +-#include ++#include + #include + #include + +@@ -249,9 +250,9 @@ + for(type=0; type= 0; type++){ + /* GLUE: +if */ + if (type == AVMEDIA_TYPE_VIDEO) { +- const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); +- if(o2) +- ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o); ++ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); ++ if(o) ++ ret = av_opt_set(avcodec_opts[type], opt, arg, 0); + /* GLUE: +if */ + } + } +@@ -266,7 +267,10 @@ + if(opt[0] == 'a') + ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o); + else */ if(opt[0] == 'v') +- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o); ++ { ++ o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0); ++ ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0); ++ } + /* GLUE: disabling + else if(opt[0] == 's') + ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); +@@ -470,7 +474,6 @@ + } + + TC_LOCK_LIBAVCODEC; +- avcodec_init(); + avcodec_register_all(); + TC_UNLOCK_LIBAVCODEC; + +@@ -486,11 +489,11 @@ + codec->name, codec->fourCC, codec->comments); + } + +- lavc_venc_context = avcodec_alloc_context(); +- lavc_venc_frame = avcodec_alloc_frame(); ++ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); ++ lavc_venc_frame = av_frame_alloc(); + +- lavc_convert_frame= avcodec_alloc_frame(); +- size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); ++ lavc_convert_frame= av_frame_alloc(); ++ size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); + enc_buffer = tc_malloc(size); + + if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { +@@ -634,7 +637,7 @@ + lavc_param_rc_max_rate = 2516; + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; ++ lavc_param_scan_offset = 1; + + break; + +@@ -674,7 +677,7 @@ + + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; ++ lavc_param_scan_offset = 1; + + break; + +@@ -838,8 +841,13 @@ + lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; +- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; +- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; ++ ++ char buf[1024]; ++#define set_dict_opt(val, opt) \ ++ snprintf(buf, sizeof(buf), "%i", val); \ ++ av_dict_set(&lavc_venc_opts, opt, buf, 0) ++ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); ++ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); + lavc_venc_context->rtp_payload_size = lavc_param_packet_size; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + if (lavc_param_packet_size) +@@ -870,7 +878,7 @@ + lavc_venc_context->context_model = lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; + lavc_venc_context->noise_reduction = lavc_param_noise_reduction; +- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; ++ set_dict_opt(lavc_param_inter_threshold, "inter_threshold"); + lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; + lavc_venc_context->skip_top = lavc_param_skip_top; + lavc_venc_context->skip_bottom = lavc_param_skip_bottom; +@@ -887,7 +895,7 @@ + lavc_venc_context->thread_count); + } + +- avcodec_thread_init(lavc_venc_context, lavc_param_threads); ++ lavc_venc_context->thread_count = lavc_param_threads; + + if (lavc_param_intra_matrix) { + char *tmp; +@@ -1061,19 +1069,18 @@ + lavc_venc_context->ildct_cmp = lavc_param_ildct_cmp; + lavc_venc_context->dia_size = lavc_param_dia_size; + lavc_venc_context->flags |= lavc_param_qpel; +- lavc_venc_context->flags |= lavc_param_gmc; ++ if(lavc_param_gmc) ++ av_dict_set(&lavc_venc_opts, "gmc", "1", 0); + lavc_venc_context->flags |= lavc_param_closedgop; + lavc_venc_context->flags |= lavc_param_trunc; + lavc_venc_context->flags |= lavc_param_aic; +- lavc_venc_context->flags |= lavc_param_umv; + lavc_venc_context->flags |= lavc_param_v4mv; +- lavc_venc_context->flags |= lavc_param_data_partitioning; +- lavc_venc_context->flags |= lavc_param_cbp; +- lavc_venc_context->flags |= lavc_param_mv0; +- lavc_venc_context->flags |= lavc_param_qp_rd; +- lavc_venc_context->flags |= lavc_param_scan_offset; +- lavc_venc_context->flags |= lavc_param_ss; +- lavc_venc_context->flags |= lavc_param_alt; ++ if(lavc_param_cbp) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0); ++ if(lavc_param_mv0) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0); ++ if(lavc_param_qp_rd) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); + lavc_venc_context->flags |= lavc_param_ilme; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_venc_context->flags |= lavc_param_trell; +@@ -1084,7 +1091,7 @@ + if (lavc_param_gray) + lavc_venc_context->flags |= CODEC_FLAG_GRAY; + if (lavc_param_normalize_aqp) +- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP; ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); + + switch(vob->encode_fields) { + case TC_ENCODE_FIELDS_TOP_FIRST: +@@ -1112,7 +1119,7 @@ + lavc_venc_context->prediction_method = lavc_param_prediction_method; + + if(is_huffyuv) +- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; + else + { + switch(pix_fmt) +@@ -1121,18 +1128,18 @@ + case CODEC_RGB: + { + if(is_mjpeg) +- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P; + else +- lavc_venc_context->pix_fmt = PIX_FMT_YUV420P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P; + break; + } + + case CODEC_YUV422: + { + if(is_mjpeg) +- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P; + else +- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; + break; + } + +@@ -1203,9 +1210,8 @@ + + lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; + +- + /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ +- if (lavc_param_video_preset) { ++ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { + avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; + video_codec_name = ffmpeg_codec_name(codec->name); + +@@ -1241,20 +1247,39 @@ + } + } + ++ if (lavc_param_scan_offset) { ++ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0); ++ } ++ ++ if (lavc_param_ss) { ++ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0); ++ } ++ ++ if (lavc_param_alt) { ++ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0); ++ } ++ ++ if (lavc_param_umv) { ++ av_dict_set(&lavc_venc_opts, "umv", "1", 0); ++ } ++ ++ if (lavc_param_data_partitioning) { ++ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0); ++ } + + //-- open codec -- + //---------------- + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(lavc_venc_context, lavc_venc_codec); ++ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); + return TC_EXPORT_ERROR; + } + +- if (lavc_venc_context->codec->encode == NULL) { ++ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec " +- "(lavc_venc_context->codec->encode == NULL)"); ++ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); + return TC_EXPORT_ERROR; + } + +@@ -1574,6 +1599,8 @@ + + int out_size; + const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; ++ AVPacket pkt; ++ int ret, got_packet = 0; + + if (param->flag == TC_VIDEO) { + +@@ -1598,7 +1625,7 @@ + YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, + lavc_venc_context->width, lavc_venc_context->height); + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV422P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV422P, lavc_venc_context->width, + lavc_venc_context->height); + /* FIXME: can't use tcv_convert (see decode_lavc.c) */ + ac_imgconvert(src, IMG_YUV_DEFAULT, +@@ -1628,7 +1655,7 @@ + lavc_venc_context->width, + lavc_venc_context->height); + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV420P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV420P, lavc_venc_context->width, + lavc_venc_context->height); + ac_imgconvert(src, IMG_YUV422P, + lavc_venc_frame->data, IMG_YUV420P, +@@ -1639,7 +1666,7 @@ + + case CODEC_RGB: + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV420P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV420P, lavc_venc_context->width, + lavc_venc_context->height); + ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT, + lavc_venc_frame->data, IMG_YUV420P, +@@ -1652,13 +1679,17 @@ + return TC_EXPORT_ERROR; + } + ++ av_init_packet(&pkt); ++ pkt.data = enc_buffer; ++ pkt.size = size; + + TC_LOCK_LIBAVCODEC; +- out_size = avcodec_encode_video(lavc_venc_context, +- enc_buffer, size, +- lavc_venc_frame); ++ ret = avcodec_encode_video2(lavc_venc_context, &pkt, ++ lavc_venc_frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; + ++ out_size = ret ? ret : pkt.size; ++ + if (out_size < 0) { + tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); + return TC_EXPORT_ERROR; +--- export/ffmpeg_cfg.c 2011-11-19 17:50:27.000000000 +0100 ++++ export/ffmpeg_cfg.c 2016-02-15 16:08:37.916488161 +0100 +@@ -34,8 +34,6 @@ + //int lavc_param_vqscale = 0; + //int lavc_param_vqmin = 2; + //int lavc_param_vqmax = 31; +-int lavc_param_mb_qmin = 2; +-int lavc_param_mb_qmax = 31; + int lavc_param_lmin = 2; + int lavc_param_lmax = 31; + int lavc_param_vqdiff = 3; +@@ -126,7 +124,7 @@ + //int lavc_param_atag = 0; + //int lavc_param_abitrate = 224; + +-char *lavc_param_video_preset = "medium"; ++char *lavc_param_video_preset = "none"; + char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; + + TCConfigEntry lavcopts_conf[]={ +@@ -143,15 +141,13 @@ + // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, + {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, + {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, +- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES}, ++ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX}, + // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, +@@ -160,9 +156,9 @@ + {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, + {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, +- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, ++ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, ++ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, + {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, + {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +@@ -211,26 +207,26 @@ + #else + {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, + #endif +- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, ++ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, + {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, +- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, +- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, ++ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, +- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, ++ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, +- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, +- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, +- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, ++ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, + {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, +- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, ++ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, + {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, + {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, +--- export/ffmpeg_cfg.h 2011-11-19 17:50:27.000000000 +0100 ++++ export/ffmpeg_cfg.h 2016-02-15 16:08:37.916488161 +0100 +@@ -13,8 +13,6 @@ + //extern int lavc_param_vqscale; + //extern int lavc_param_vqmin; + //extern int lavc_param_vqmax; +-extern int lavc_param_mb_qmin; +-extern int lavc_param_mb_qmax; + extern int lavc_param_lmin; + extern int lavc_param_lmax; + extern int lavc_param_vqdiff; +--- filter/filter_pp.c 2011-11-19 17:50:27.000000000 +0100 ++++ filter/filter_pp.c 2016-02-15 16:08:37.916488161 +0100 +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + +--- import/decode_lavc.c 2011-11-19 17:50:27.000000000 +0100 ++++ import/decode_lavc.c 2016-02-15 16:09:00.252988897 +0100 +@@ -58,37 +58,37 @@ + + // fourCC to ID mapping taken from MPlayer's codecs.conf + static struct ffmpeg_codec ffmpeg_codecs[] = { +- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", ++ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", + {"MP41", "DIV1", ""}}, +- {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", ++ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", + {"MP42", "DIV2", ""}}, +- {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", ++ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", + {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, +- {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", ++ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", + {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, +- {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", ++ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", + {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, +- {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", ++ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", + {"MPG1", ""}}, +- {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", ++ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", + {"DVSD", ""}}, +- {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", ++ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", + {"WMV1", ""}}, +- {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", ++ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", + {"WMV2", ""}}, +- {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", ++ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", + {"HFYU", ""}}, +- {CODEC_ID_H263I, TC_CODEC_H263I, "h263i", ++ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", + {"I263", ""}}, +- {CODEC_ID_H263P, TC_CODEC_H263P, "h263p", ++ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", + {"H263", "U263", "VIV1", ""}}, +- {CODEC_ID_RV10, TC_CODEC_RV10, "rv10", ++ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", + {"RV10", "RV13", ""}}, +- {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", ++ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", + {"SVQ1", ""}}, +- {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", ++ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", + {"SVQ3", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", + {"MPG2", ""}}, + {0, TC_CODEC_UNKNOWN, NULL, {""}}}; + +@@ -170,7 +170,7 @@ + + // Set these to the expected values so that ffmpeg's decoder can + // properly detect interlaced input. +- lavc_dec_context = avcodec_alloc_context(); ++ lavc_dec_context = avcodec_alloc_context3(NULL); + if (lavc_dec_context == NULL) { + tc_log_error(__FILE__, "Could not allocate enough memory."); + goto decoder_error; +@@ -181,12 +181,12 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; + +- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { ++ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { + tc_log_error(__FILE__, "Could not initialize the '%s' codec.", + codec->name); + goto decoder_error; +@@ -290,8 +290,8 @@ + + // Convert avcodec image to the requested YUV or RGB format + switch (lavc_dec_context->pix_fmt) { +- case PIX_FMT_YUVJ420P: +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUVJ420P: ++ case AV_PIX_FMT_YUV420P: + // Remove "dead space" at right edge of planes, if any + if (picture.linesize[0] != lavc_dec_context->width) { + int y; +@@ -315,7 +315,7 @@ + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUV411P: ++ case AV_PIX_FMT_YUV411P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +@@ -334,8 +334,8 @@ + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUVJ422P: +- case PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUVJ422P: ++ case AV_PIX_FMT_YUV422P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +@@ -354,8 +354,8 @@ + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUVJ444P: +- case PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUVJ444P: ++ case AV_PIX_FMT_YUV444P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +--- import/import_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ import/import_ffmpeg.c 2016-02-15 16:08:48.269720627 +0100 +@@ -59,51 +59,51 @@ + + // fourCC to ID mapping taken from MPlayer's codecs.conf + static struct ffmpeg_codec ffmpeg_codecs[] = { +- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", ++ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", + {"MP41", "DIV1", ""}}, +- {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", ++ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", + {"MP42", "DIV2", ""}}, +- {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", ++ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", + {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, +- {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", ++ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", + {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, +- {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", ++ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", + {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, +- {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", ++ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", + {"MPG1", ""}}, +- {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", ++ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", + {"DVSD", ""}}, +- {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", ++ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", + {"WMV1", ""}}, +- {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", ++ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", + {"WMV2", ""}}, +- {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", ++ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", + {"HFYU", ""}}, +- {CODEC_ID_H263I, TC_CODEC_H263I, "h263i", ++ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", + {"I263", ""}}, +- {CODEC_ID_H263P, TC_CODEC_H263P, "h263p", ++ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", + {"H263", "U263", "VIV1", ""}}, +- {CODEC_ID_H264, TC_CODEC_H264, "h264", ++ {AV_CODEC_ID_H264, TC_CODEC_H264, "h264", + {"H264", "h264", "X264", "x264", "avc1", ""}}, +- {CODEC_ID_RV10, TC_CODEC_RV10, "rv10", ++ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", + {"RV10", "RV13", ""}}, +- {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", ++ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", + {"SVQ1", ""}}, +- {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", ++ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", + {"SVQ3", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", + {"MPG2", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", + {"MPG2", ""}}, +- {CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", ++ {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", + {"ASV1", ""}}, +- {CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", ++ {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", + {"ASV2", ""}}, +- {CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", ++ {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", + {"FFV1", ""}}, +- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", ++ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", + {"I420", "IYUV", ""}}, +- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", ++ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", + {"Y42B", ""}}, + {0, TC_CODEC_UNKNOWN, NULL, {""}}}; + +@@ -302,7 +302,7 @@ + + // Set these to the expected values so that ffmpeg's decoder can + // properly detect interlaced input. +- lavc_dec_context = avcodec_alloc_context(); ++ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); + if (lavc_dec_context == NULL) { + tc_log_error(MOD_NAME, "Could not allocate enough memory."); + return TC_IMPORT_ERROR; +@@ -314,7 +314,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +@@ -324,13 +324,13 @@ + // XXX: some codecs need extra data + switch (codec->id) + { +- case CODEC_ID_MJPEG: extra_data_size = 28; break; +- case CODEC_ID_LJPEG: extra_data_size = 28; break; +- case CODEC_ID_HUFFYUV: extra_data_size = 1000; break; +- case CODEC_ID_ASV1: extra_data_size = 8; break; +- case CODEC_ID_ASV2: extra_data_size = 8; break; +- case CODEC_ID_WMV1: extra_data_size = 4; break; +- case CODEC_ID_WMV2: extra_data_size = 4; break; ++ case AV_CODEC_ID_MJPEG: extra_data_size = 28; break; ++ case AV_CODEC_ID_LJPEG: extra_data_size = 28; break; ++ case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break; ++ case AV_CODEC_ID_ASV1: extra_data_size = 8; break; ++ case AV_CODEC_ID_ASV2: extra_data_size = 8; break; ++ case AV_CODEC_ID_WMV1: extra_data_size = 4; break; ++ case AV_CODEC_ID_WMV2: extra_data_size = 4; break; + default: extra_data_size = 0; break; + } + +@@ -344,7 +344,7 @@ + } + + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(lavc_dec_context, lavc_dec_codec); ++ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", +@@ -360,7 +360,7 @@ + frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim); + + // we adapt the color space +- if(codec->id == CODEC_ID_MJPEG) { ++ if(codec->id == AV_CODEC_ID_MJPEG) { + enable_levels_filter(); + } + break; +@@ -434,7 +434,7 @@ + } + + // we adapt the color space +- if(codec->id == CODEC_ID_MJPEG) { ++ if(codec->id == AV_CODEC_ID_MJPEG) { + enable_levels_filter(); + } + +@@ -504,13 +504,13 @@ + int bkey = 0; + + // check for keyframes +- if (codec->id == CODEC_ID_MSMPEG4V3) { ++ if (codec->id == AV_CODEC_ID_MSMPEG4V3) { + if (divx3_is_key(buffer)) bkey = 1; + } +- else if (codec->id == CODEC_ID_MPEG4) { ++ else if (codec->id == AV_CODEC_ID_MPEG4) { + if (mpeg4_is_key(buffer, bytes_read)) bkey = 1; + } +- else if (codec->id == CODEC_ID_MJPEG) { ++ else if (codec->id == AV_CODEC_ID_MJPEG) { + bkey = 1; + } + +@@ -580,8 +580,8 @@ + + // Convert avcodec image to our internal YUV or RGB format + switch (lavc_dec_context->pix_fmt) { +- case PIX_FMT_YUVJ420P: +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUVJ420P: ++ case AV_PIX_FMT_YUV420P: + src_fmt = IMG_YUV420P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -612,7 +612,7 @@ + } + break; + +- case PIX_FMT_YUV411P: ++ case AV_PIX_FMT_YUV411P: + src_fmt = IMG_YUV411P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -640,8 +640,8 @@ + } + break; + +- case PIX_FMT_YUVJ422P: +- case PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUVJ422P: ++ case AV_PIX_FMT_YUV422P: + src_fmt = IMG_YUV422P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -669,8 +669,8 @@ + } + break; + +- case PIX_FMT_YUVJ444P: +- case PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUVJ444P: ++ case AV_PIX_FMT_YUV444P: + src_fmt = IMG_YUV444P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +--- import/probe_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ import/probe_ffmpeg.c 2016-02-15 16:08:37.917488184 +0100 +@@ -99,8 +99,8 @@ + + TC_INIT_LIBAVCODEC; + +- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, +- NULL, 0, NULL); ++ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, ++ NULL, NULL); + if (ret != 0) { + tc_log_error(__FILE__, "unable to open '%s'" + " (libavformat failure)", +@@ -109,7 +109,7 @@ + return; + } + +- ret = av_find_stream_info(lavf_dmx_context); ++ ret = avformat_find_stream_info(lavf_dmx_context, NULL); + if (ret < 0) { + tc_log_error(__FILE__, "unable to fetch informations from '%s'" + " (libavformat failure)", +@@ -120,7 +120,11 @@ + + translate_info(lavf_dmx_context, ipipe->probe_info); + ++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0) ++ avformat_close_input(&lavf_dmx_context); ++#else + av_close_input_file(lavf_dmx_context); ++#endif + return; + } + +--- libtc/tcavcodec.h 2011-11-19 17:50:27.000000000 +0100 ++++ libtc/tcavcodec.h 2016-02-15 16:08:37.917488184 +0100 +@@ -53,7 +53,6 @@ + + #define TC_INIT_LIBAVCODEC do { \ + TC_LOCK_LIBAVCODEC; \ +- avcodec_init(); \ + avcodec_register_all(); \ + TC_UNLOCK_LIBAVCODEC; \ + } while (0) diff --git a/srcpkgs/transcode/template b/srcpkgs/transcode/template new file mode 100644 index 00000000000..de336f91113 --- /dev/null +++ b/srcpkgs/transcode/template @@ -0,0 +1,22 @@ +# Template file for 'transcode' +pkgname=transcode +version=1.1.7 +revision=1 +build_style=gnu-configure +hostmakedepends="automake libtool pkg-config" +makedepends="faac-devel ffmpeg-devel freetype-devel lame-devel + libdvdread-devel libjpeg-turbo-devel libmpeg2-devel libtheora-devel + libXaw-devel libxml2-devel libXv-devel lzo-devel SDL2-devel + xvidcore-devel" +short_desc="Modular utility for video stream processing" +maintainer="Andrew Benson " +license="GPL-3.0-or-later" +homepage="https://bitbucket.org/france/transcode-tcforge" +distfiles="https://bitbucket.org/france/transcode-tcforge/downloads/transcode-${version}.tar.bz2" +checksum=1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 + +pre_configure() { + mkdir -p m4 + mv configure.{in,ac} + autoreconf -fi +} diff --git a/srcpkgs/tryton/template b/srcpkgs/tryton/template index d93559915ea..eedaf359704 100644 --- a/srcpkgs/tryton/template +++ b/srcpkgs/tryton/template @@ -1,18 +1,18 @@ # Template file for 'tryton' pkgname=tryton -version=4.6.4 +version=4.8.2 revision=1 noarch=yes build_style=python2-module pycompile_module="tryton" hostmakedepends="python-setuptools" depends="pygtk python-dateutil" -maintainer="cr6git " short_desc="Three-tier high-level general purpose application platform" -homepage="https://www.tryton.org" +maintainer="cr6git " license="GPL-3.0-or-later" -distfiles="${PYPI_SITE}/${pkgname:0:1}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=166f293b9a10be501472c0ddbafef054137afbc0b734545ffc324756a871bca0 +homepage="https://www.tryton.org" +distfiles="${PYPI_SITE}/t/tryton/tryton-${version}.tar.gz" +checksum=dda34b57c96bbc88311d4ae94b2208a891d46c2a4d120645b1f04cac79c7560a post_install() { vinstall tryton.desktop 644 usr/share/applications diff --git a/srcpkgs/tweeny/template b/srcpkgs/tweeny/template new file mode 100644 index 00000000000..66fde5b6a14 --- /dev/null +++ b/srcpkgs/tweeny/template @@ -0,0 +1,17 @@ +# Template file for 'tweeny' +pkgname=tweeny +version=2 +revision=1 +build_style=cmake +makedepends="SDL2-devel" +short_desc="Modern C++ tweening library" +maintainer="maxice8 " +license="MIT" +homepage="https://github.com/mobius3/tweeny" +distfiles="https://github.com/mobius3/tweeny/archive/${version}.tar.gz" +checksum=3a5a4171b96ce85e90eea06b7b3bc80793a357b5638d49f6cf0531771fc2234a +nocross="fails to find headers on cross environment" + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/tzupdate/template b/srcpkgs/tzupdate/template index 4776e98d930..14bb3cf3146 100644 --- a/srcpkgs/tzupdate/template +++ b/srcpkgs/tzupdate/template @@ -1,7 +1,7 @@ # Template file for 'tzupdate' pkgname=tzupdate -version=1.2.0 -revision=2 +version=1.3.0 +revision=1 noarch=yes build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,4 +12,4 @@ maintainer="Diogo Leal " license="Public domain" homepage="https://github.com/cdown/tzupdate" distfiles="https://github.com/cdown/tzupdate/archive/${version}.tar.gz" -checksum=2768c8def78cd7c78d43250a9188ee1a917323bdbb5dc5c76e3419f97d9aac4e +checksum=1b242b7a024fa031828297279b54c79fa758d9a4fc36300a5e85f2687945de9c diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template index c933a7cc437..d24b9cd3d3b 100644 --- a/srcpkgs/unbound/template +++ b/srcpkgs/unbound/template @@ -1,6 +1,6 @@ # Template file for 'unbound' pkgname=unbound -version=1.7.2 +version=1.7.3 revision=1 build_style=gnu-configure configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://unbound.net/" distfiles="https://unbound.net/downloads/${pkgname}-${version}.tar.gz" -checksum=a85fc7bb34711992cf128b2012638ebb8dc1fe15818baa381f6489240845eaa0 +checksum=c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d conf_files="/etc/unbound/unbound.conf" system_accounts="_unbound" diff --git a/srcpkgs/units/template b/srcpkgs/units/template index 86ee2af4401..03d1a1cf8ce 100644 --- a/srcpkgs/units/template +++ b/srcpkgs/units/template @@ -1,6 +1,6 @@ # Template file for 'units' pkgname=units -version=2.16 +version=2.17 revision=1 build_style=gnu-configure hostmakedepends="python" @@ -8,7 +8,13 @@ makedepends="readline-devel" depends="python python-Unidecode" short_desc="Converts between different units" maintainer="Juan RP " -license="GPL-3" -homepage="http://www.gnu.org/software/units/units.html" +license="GPL-3.0-or-later" +homepage="https://www.gnu.org/software/units/units.html" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=dcf3f78482a13b150fc6bf0f8d611510816a3424bc2b26229b85b1cadeb81686 +checksum=1f03c9f9aef1fb0ccddc6fb545f2925f7754de2bfa67d4e62f8758d7edfd5dd8 + +post_install() { + # Tries to install to /usr/com/currency.units + rm -f -- "${DESTDIR}"/usr/share/units/currency.units + mv "${DESTDIR}"/usr/com/units/currency.units "${DESTDIR}"/usr/share/units/currency.units +} diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template index 30145c701d0..97bc7498b77 100644 --- a/srcpkgs/unrar/template +++ b/srcpkgs/unrar/template @@ -1,15 +1,15 @@ # Template file for 'unrar' pkgname=unrar -version=5.6.4 +version=5.6.5 revision=1 wrksrc=unrar short_desc="Unarchiver for .rar files (non-free version)" maintainer="Juan RP " license="freeware" -repository="nonfree" homepage="https://www.rarlab.com/rar_add.htm" distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz" -checksum=9335d2201870f2034007c04be80e00f1dc23932cb88b329d55c76134e6ba49fe +checksum=eba36a421bf41491818dee9507d934064622bc0bd9db6bbb8422a4706f200898 +repository=nonfree do_build() { sed -i -e 's/^\(CXXFLAGS\)=\(.*\)/\1+=\2/' \ diff --git a/srcpkgs/uptimed/template b/srcpkgs/uptimed/template index 3f73c62b45f..f8df260c6b5 100644 --- a/srcpkgs/uptimed/template +++ b/srcpkgs/uptimed/template @@ -1,18 +1,19 @@ # Template file for 'uptimed' pkgname=uptimed -version=0.4.0 +version=0.4.1 revision=1 build_style=gnu-configure configure_args="--disable-static" -conf_files="/etc/uptimed.conf" -make_dirs="/var/spool/uptimed 0755 root root" hostmakedepends="automake libtool" short_desc="Daemon that records system uptimes" maintainer="Steve Prybylski " -license="GPL-2" +license="GPL-2.0-only" homepage="https://github.com/rpodgorny/uptimed" +changelog="https://raw.githubusercontent.com/rpodgorny/uptimed/master/ChangeLog" distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=26891965bb499065e34072cecd3eb8087102b1c05f530c8fe8504a07c722f9bf +checksum=01b16519bbdd3b99c97a09e910b74e4dceb5eea74e3ab20b6c90c76c8cb55905 +conf_files="/etc/uptimed.conf" +make_dirs="/var/spool/uptimed 0755 root root" pre_configure() { ./autogen.sh diff --git a/srcpkgs/urbanterror-data/template b/srcpkgs/urbanterror-data/template index af04e1c04af..7b8fef942dc 100644 --- a/srcpkgs/urbanterror-data/template +++ b/srcpkgs/urbanterror-data/template @@ -1,7 +1,7 @@ # Template file for 'urbanterror-data' pkgname=urbanterror-data -version=4.3.3 -revision=2 +version=4.3.4 +revision=1 noarch=yes wrksrc="UrbanTerror43" hostmakedepends="unzip" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="Freeware" homepage="http://www.urbanterror.info" distfiles="http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror${version//./}_full.zip" -checksum=c35827192724afcaaa07d7bdb74f17e06e4b865346672eda2b00717b3d023067 +checksum=716669cc6c525663b791852e51ff9c94d96f382be39279dab6084dddacb5a4e7 do_install() { vmkdir usr/share/urbanterror diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template index 7857139835a..947a12cf2d8 100644 --- a/srcpkgs/urbanterror/template +++ b/srcpkgs/urbanterror/template @@ -1,6 +1,6 @@ # Template file for 'urbanterror' pkgname=urbanterror -version=4.3.3 +version=4.3.4 revision=1 wrksrc="ioq3-for-UrbanTerror-4-release-${version}" makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/Barbatos/ioq3-for-UrbanTerror-4" distfiles="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.tar.gz" -checksum=b90bca7ea92c0b27d4ce3bc0ae44e53c4bb58da26c8075d23946317923c46b60 +checksum=ce9d09a8ad149f8a1d36a85a586e1dd8ec9b8dcb3e5e9e82ec2a33017655bf43 nocross=yes do_build() { diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template new file mode 100644 index 00000000000..0fff8fb8c3f --- /dev/null +++ b/srcpkgs/utox/template @@ -0,0 +1,22 @@ +# Template file for 'utox' +pkgname=utox +version=0.17.0 +revision=1 +wrksrc=uTox +build_style=cmake +configure_args="-DENABLE_ASAN=OFF" +hostmakedepends="pkg-config" +makedepends="check-devel dbus-devel filter_audio-devel fontconfig-devel + libXrender-devel libopenal-devel libsodium-devel libvpx-devel opus-devel + toxcore-devel v4l-utils-devel" +short_desc="Lightweight TOX instant messenger client written in C" +maintainer="Spencer Hill " +license="MIT" +homepage="http://utox.io/" +distfiles="https://github.com/uTox/uTox/releases/download/v${version}/uTox-${version}-full.tar.gz" +checksum=219ae83e9139d3a421c7bb6d03cc3f8953dd36fb8e8b67100d47d92d413e9d46 +nocross=yes + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template index d04fd755203..1d41e729a4c 100644 --- a/srcpkgs/vagrant/template +++ b/srcpkgs/vagrant/template @@ -1,6 +1,6 @@ # Template file for 'vagrant' pkgname=vagrant -version=2.1.1 +version=2.1.2 revision=1 hostmakedepends="ruby" makedepends="ruby-devel zlib-devel" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://www.vagrantup.com/" distfiles="https://github.com/mitchellh/$pkgname/archive/v$version.tar.gz" -checksum=8b54b39ad2bdfe038f5a6767a745f2139d6f62e6e4745008e906f2e1c658fa4d +checksum=610d704e737cbc0ccb9d27fd1b40be8bb1917cad693d2a3d841c8c36c8066939 nocross=yes patch_args="-p1" diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index e77a90219de..bd6ef73b12a 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,6 +1,6 @@ # Template file for 'vala' pkgname=vala -version=0.40.6 +version=0.40.7 revision=1 build_style=gnu-configure hostmakedepends="flex libxslt pkg-config automake libtool" @@ -10,8 +10,9 @@ short_desc="Compiler for the GObject type system" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://live.gnome.org/Vala" +changelog="https://raw.githubusercontent.com/GNOME/vala/0.40/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=6da450f1a73e0f1e17506e68cce5b9e8996349e576d3f8cb6b0b73ee22e44be2 +checksum=bee662f60ab3a0d5266c1dd66f508cd9ed3254d74622d23c2d6bd94c91990aec pre_configure() { autoreconf -fi diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index 9919569641a..360393ea919 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,6 @@ # Template file for 'vim' pkgname=vim -version=8.1.0026 +version=8.1.0133 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=a2f8b06fceb6ab5117e3bd13e0639e353ca37e38970c2944b99f8d106c4b0993 +checksum=a6dab137949097fbe0b67aafedf4c24a3b0d9c41716db35f5beb4834924d7b00 subpackages="xxd vim-common vim-x11 gvim" # XXX vim-huge cannot be cross compiled for now. diff --git a/srcpkgs/vimb/template b/srcpkgs/vimb/template index 07e3ba1a347..d9452ea8a7a 100644 --- a/srcpkgs/vimb/template +++ b/srcpkgs/vimb/template @@ -1,14 +1,14 @@ # Template file for 'vimb' pkgname=vimb -version=3.1.0 -revision=3 +version=3.2.0 +revision=1 build_style=gnu-makefile +make_use_env=yes hostmakedepends="pkg-config" makedepends="webkit2gtk-devel" -make_build_args="PREFIX=/usr" short_desc="Fast and lightweight web browser based on WebKit/GTK+" maintainer="Eivind Uggedal " -license="GPL-3" -homepage="http://fanglingsu.github.io/vimb" +license="GPL-3.0-or-later" +homepage="https://fanglingsu.github.io/vimb/" distfiles="https://github.com/fanglingsu/vimb/archive/${version}.tar.gz" -checksum=6efc32b81759b1dfc637b5188831a787902ae296150a12b2813f6cc190009abf +checksum=9746408c45bedbca6cd5bd37c7268ace52f2655a4ead4bb50239d557bef9ab41 diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index 0bfd67464e8..781cfc79015 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=1.14.1077.60 +version=1.15.1147.47 revision=1 _release=1 only_for_archs="i686 x86_64" @@ -15,10 +15,10 @@ nostrip=yes if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then _debarch=amd64 - checksum=3352630a043b7ea7f769dfe8355378a72339bc9d98331b108c108b29eabbafbe + checksum=94a3efe2af7dbf7c1f79a2b9503d71615cb797fe38f263189489b53ee2c9da14 else _debarch=i386 - checksum=e8861873cc7634f2611d304e300df63eb80382cf2821d21991e0822c696df596 + checksum=bd4e9f88161890fdb964da643933350a7d496f3eff61d78c001eeae2c76cf084 fi distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb" diff --git a/srcpkgs/vlc/patches/missing_simple_neon.h.patch b/srcpkgs/vlc/patches/missing_simple_neon.h.patch deleted file mode 100644 index 5176b706ec4..00000000000 --- a/srcpkgs/vlc/patches/missing_simple_neon.h.patch +++ /dev/null @@ -1,79 +0,0 @@ -https://git.videolan.org/?p=vlc.git;a=blob;f=modules/audio_filter/channel_mixer/simple_neon.h;h=2fe607566c38d8eba5c3308aff408cabc8422623;hb=147717df85c312ac559181fc0943839a3a3bf19c - -file is missing in 3.0.2 tarball - ---- /dev/null -+++ modules/audio_filter/channel_mixer/simple_neon.h -@@ -0,0 +1,72 @@ -+/***************************************************************************** -+ * simple_neon.h : simple channel mixer plug-in using NEON assembly -+ ***************************************************************************** -+ * Copyright (C) 2002, 2004, 2006-2009, 2012, 2015 VLC authors and VideoLAN -+ * $Id$ -+ * -+ * Authors: Gildas Bazin -+ * David Geldreich -+ * Sébastien Toque -+ * Thomas Guillem -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU Lesser General Public License as published by -+ * the Free Software Foundation; either version 2.1 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with this program; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. -+ *****************************************************************************/ -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+#include -+ -+/* Only conversion to Mono, Stereo and 4.0 right now */ -+/* Only from 7/7.1/5/5.1/3/3.1/2.0 -+ * XXX 5.X rear and middle are handled the same way */ -+ -+#define NEON_WRAPPER(in, out) \ -+ void convert_##in##_to_##out##_neon_asm(float *dst, const float *src, int num, bool lfeChannel); \ -+ static inline void DoWork_##in##_to_##out##_neon( filter_t *p_filter, block_t *p_in_buf, block_t *p_out_buf ) \ -+ { \ -+ const float *p_src = (const float *)p_in_buf->p_buffer; \ -+ float *p_dest = (float *)p_out_buf->p_buffer; \ -+ convert_##in##_to_##out##_neon_asm( p_dest, p_src, p_in_buf->i_nb_samples, \ -+ p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ); \ -+ } \ -+ static inline void (*GET_WORK_##in##_to_##out##_neon())(filter_t*, block_t*, block_t*) \ -+ { \ -+ return vlc_CPU_ARM_NEON() ? DoWork_##in##_to_##out##_neon : DoWork_##in##_to_##out; \ -+ } -+ -+NEON_WRAPPER(7_x,2_0) -+NEON_WRAPPER(5_x,2_0) -+NEON_WRAPPER(4_0,2_0) -+NEON_WRAPPER(3_x,2_0) -+NEON_WRAPPER(7_x,1_0) -+NEON_WRAPPER(5_x,1_0) -+NEON_WRAPPER(7_x,4_0) -+NEON_WRAPPER(5_x,4_0) -+ -+/* TODO: the following conversions are not handled in NEON */ -+ -+#define C_WRAPPER(in, out) \ -+ static inline void (*GET_WORK_##in##_to_##out##_neon())(filter_t*, block_t*, block_t*) \ -+ { \ -+ return DoWork_##in##_to_##out; \ -+ } -+ -+C_WRAPPER(4_0,1_0) -+C_WRAPPER(3_x,1_0) -+C_WRAPPER(2_x,1_0) -+C_WRAPPER(6_1,2_0) -+C_WRAPPER(7_x,5_x) -+C_WRAPPER(6_1,5_x) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 4707311f082..02fb97f7ab0 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc -version=3.0.2 -revision=3 +version=3.0.3 +revision=1 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-live555 --disable-fluidsynth --enable-dvdread @@ -14,24 +14,22 @@ maintainer="Juan RP " homepage="https://www.videolan.org/vlc/" license="GPL-2.0-only, LGPL-2.1-only" distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz" -checksum=efe8c889b69bffba9662140bdcf434d9d36edc5dbb0e300fcce4553c354ea198 +checksum=9ba8b04bdb13f7860a2041768ac83b47b397a36549c71c530b94028a3cfd5b51 lib32disabled=yes # XXX Add missing deps: gme, telepathy, live555, libtar (for skins2). hostmakedepends="automake libtool pkg-config flex bison libgcrypt-devel $(vopt_if lua lua52)" -makedepends="xorgproto eudev-libudev-devel libpng-devel libupnp1.8-devel - ncurses-devel libvorbis-devel x264-devel ffmpeg-devel sndio-devel - xcb-util-devel xcb-util-keysyms-devel libsamplerate-devel - libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel - libmpeg2-devel libflac-devel fribidi-devel freetype-devel libproxy-devel - avahi-libs-devel libmad-devel liba52-devel libdca-devel libass-devel - libdvbpsi-devel libgcrypt-devel dbus-glib-devel libmodplug-devel - gnutls-devel taglib-devel libmatroska-devel libmpcdec-devel - libcdio-devel libdvdnav-devel libsysfs-devel libmtp-devel - sqlite-devel libtheora-devel speex-devel pulseaudio-devel libxml2-devel - opus-devel libbluray-devel faad2-devel jack-devel libSM-devel freefont-ttf - wayland-protocols +makedepends=" + avahi-libs-devel dbus-glib-devel faad2-devel ffmpeg-devel freefont-ttf + gnutls-devel jack-devel liba52-devel libass-devel libbluray-devel + libcdio-devel libdca-devel libdvbpsi-devel libdvdnav-devel libmad-devel + libmatroska-devel libmodplug-devel libmpcdec-devel libmpeg2-devel + libmtp-devel libplacebo-devel libproxy-devel libsamplerate-devel + libSM-devel libsysfs-devel libtheora-devel libupnp1.8-devel + libXinerama-devel libXpm-devel libXvMC-devel opus-devel pulseaudio-devel + sndio-devel speex-devel taglib-devel wayland-protocols x264-devel + xcb-util-devel xcb-util-keysyms-devel $(vopt_if notify libnotify-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if qt qt5-x11extras-devel) $(vopt_if qt qt5-svg-devel) $(vopt_if v4l2 v4l-utils-devel) $(vopt_if smb samba-devel) diff --git a/srcpkgs/void-updates/template b/srcpkgs/void-updates/template index 43e7656e4e3..db66692c211 100644 --- a/srcpkgs/void-updates/template +++ b/srcpkgs/void-updates/template @@ -1,6 +1,6 @@ # Template file for 'void-updates' pkgname=void-updates -version=20150817 +version=20180616 revision=2 noarch=yes build_style=gnu-makefile @@ -12,6 +12,10 @@ make_dirs="${voidupdates_homedir} 0700 ${system_accounts} ${system_accounts}" short_desc="Void Linux package updates" maintainer="Eivind Uggedal " license="ISC" -homepage="https://github.com/voidlinux/void-updates" +homepage="https://github.com/void-linux/void-updates" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=e0cf177c639eb86cbd3efff993ff00fc50a285121062ea501b46f435105355bc +checksum=d885cb1e378aa3315dd5293a58be5729b98a2e1fb5f024105a8d8662e4f591cd + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/vtwm/template b/srcpkgs/vtwm/template new file mode 100644 index 00000000000..47a1ee85aa0 --- /dev/null +++ b/srcpkgs/vtwm/template @@ -0,0 +1,15 @@ +# Template file for 'vtwm' +pkgname=vtwm +version=5.5.0 +revision=1 +build_style=gnu-configure +configure_args="--disable-sound" +hostmakedepends="pkg-config m4 flex" +makedepends="libXmu-devel libXpm-devel" +short_desc="Virtual tab window manager" +maintainer="Andrew Benson " +license="X11" +homepage="http://www.vtwm.org/" +changelog="http://vtwm.sourceforge.net/vtwm-changelog.html" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/files/${pkgname}-${version}.tar.gz" +checksum=448d7afd8d5a5fcfabf1b9c64b811cfa6bdbf8892c067fe01a141806ef61eaf4 diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template new file mode 100644 index 00000000000..5a03aedb7ac --- /dev/null +++ b/srcpkgs/waifu2x-converter-cpp/template @@ -0,0 +1,19 @@ +# Template file for 'waifu2x-converter-cpp' +pkgname=waifu2x-converter-cpp +version=5.2 +revision=1 +build_style=cmake +configure_args="-DINSTALL_MODELS=ON" +hostmakedepends="pkg-config" +makedepends="libopencv-devel opencl2-headers" +short_desc="Image upscaling using deep convolutional neural networks" +maintainer="SolitudeSF " +license="MIT" +homepage="https://github.com/DeadSix27/waifu2x-converter-cpp" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=a872f459e731bb324d13de801e0653385fa76260643f01a4fd1b24d66519063f +nocross="Builds intermediate executable, which should be ran on host, for the target architecture" + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index a59ca6fd955..6d75e6b1aa8 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -14,10 +14,6 @@ homepage="https://webkitgtk.org/" license="LGPL-2.1, 2-clause-BSD" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" checksum=57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c -case "$XBPS_TARGET_MACHINE" in - armv[56]*) broken=https://build.voidlinux.eu/builders/armv6l_builder/builds/8588/steps/shell_3/logs/stdio ;; -esac - # ETOOHUGE nodebug=1 @@ -79,6 +75,15 @@ else configure_args+=" --disable-x11-target" fi +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + armv[56]*) # Add -latomic to the targets + find -name "CMakeLists.txt" -exec sed -i "{}" \ + -e "/target_link_libraries/s/)/ atomic)/" \; + ;; + esac +} + post_install() { vlicense Source/WebCore/LICENSE-APPLE vlicense Source/WebCore/LICENSE-LGPL-2.1 diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 95b98b4aad7..2524b1c50b7 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,18 +1,20 @@ # Template file for 'wesnoth' pkgname=wesnoth -version=1.12.6 -revision=4 +version=1.14.3 +revision=1 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config" -makedepends="dbus-devel libgomp-devel fribidi-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_mixer-devel pango-devel libvorbis-devel zlib-devel bzip2-devel boost-devel" +makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel + SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel + zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel" depends="wesnoth-data desktop-file-utils" short_desc="Turn-based fantasy strategy game" maintainer="Philipp Hirsch " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://wesnoth.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=a50f384cead15f68f31cfa1a311e76a12098428702cb674d3521eb169eb92e4e +checksum=e9f17f0245a2b7f63b28d77a1cc8854355768665f5ca93ffd3e7641b0840c418 post_install() { # runit service diff --git a/srcpkgs/windowchef/template b/srcpkgs/windowchef/template index d8ed80459b7..6a4f9b4b883 100644 --- a/srcpkgs/windowchef/template +++ b/srcpkgs/windowchef/template @@ -1,6 +1,6 @@ # Template file for 'windowchef' pkgname=windowchef -version=0.4.1 +version=0.4.2 revision=1 build_style=gnu-makefile makedepends="xcb-util-wm-devel xcb-util-keysyms-devel" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="ISC" homepage="https://github.com/tudurom/windowchef" distfiles="https://github.com/tudurom/windowchef/archive/v${version}.tar.gz" -checksum=f1d06da84dafc4bbbacf273815af5bbbf318afa524194b3ab1c55ebc71d2a14d +checksum=e38c5cc81ec9374357625431986dfcd1b3abc2d11797b459ef36f262b1705053 pre_build() { sed -i 's|^CFLAGS +=|override CFLAGS +=|g' config.mk diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index 31c41e932a3..1f5dfbee880 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -1,6 +1,6 @@ # Template file for 'wireguard' pkgname=wireguard -version=0.0.20180613 +version=0.0.20180625 revision=1 wrksrc="WireGuard-${version}" build_wrksrc="src/tools" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://www.wireguard.com/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" -checksum=c120cdedc3967dcb4ad5c1c7eadd2a1b04ef5dbf2fe60cc8e7c0db337bcda7dc +checksum=d9bedeb22b1f83d48581608a6521fea1d429fbeb8809419d08703ef2ec570020 triggers="dkms" dkms_modules="wireguard ${version}" diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 1ebf30ce3b8..2b249cdeb2c 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,7 +1,7 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.4.6 -revision=2 +version=2.4.7 +revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua --with-krb5 --with-gtk=3 --with-qt=5 --without-portaudio CC_FOR_BUILD=cc" @@ -13,9 +13,9 @@ depends="libcap-progs" short_desc="A network protocol analyzer" maintainer="Enno Boland " homepage="https://www.wireshark.org" -license="GPL-2" +license="GPL-2.0-or-later" distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz" -checksum=8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe +checksum=5ecb3c68734fb89c83ac283e6cdf264eb15b9c7e7ea63dcfd4f0bad3e77c4f44 system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" diff --git a/srcpkgs/wkhtmltopdf/patches/fix-patched-qt.patch b/srcpkgs/wkhtmltopdf/patches/fix-patched-qt.patch deleted file mode 100644 index a18d0c0f7fe..00000000000 --- a/srcpkgs/wkhtmltopdf/patches/fix-patched-qt.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/wkhtmltopdf/wkhtmltopdf/commit/af95531eabb212ae16a9fb689bb25a767eb580bc - -From af95531eabb212ae16a9fb689bb25a767eb580bc Mon Sep 17 00:00:00 2001 -From: Ashish Kulkarni -Date: Tue, 20 Dec 2016 17:53:46 +0530 -Subject: [PATCH] fix build without patched Qt - -This was broken since 96b03ae078b36122c48ec0ce9b164a24627c5312. - ---- src/lib/multipageloader.cc -+++ src/lib/multipageloader.cc -@@ -213,10 +213,11 @@ ResourceObject::ResourceObject(MultiPageLoaderPrivate & mpl, const QUrl & u, con - } - - webPage.setNetworkAccessManager(&networkAccessManager); -- -+#ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__ - double devicePixelRatio = multiPageLoader.dpi / 96.; // The used version of WebKit always renders at 96 DPI when no zoom is applied. It does not fully support a device pixel ratio != 1 natively. - webPage.mainFrame()->setZoomFactor(devicePixelRatio * settings.zoomFactor); // Zoom in the page to achieve a higher DPI. - webPage.setDevicePixelRatio(devicePixelRatio); // Fix CSS media queries (does not affect anything else). -+#endif - } - - /*! diff --git a/srcpkgs/wkhtmltopdf/template b/srcpkgs/wkhtmltopdf/template index e6c05d10109..5c7f53ac433 100644 --- a/srcpkgs/wkhtmltopdf/template +++ b/srcpkgs/wkhtmltopdf/template @@ -1,29 +1,28 @@ # Template file for 'wkhtmltopdf' pkgname=wkhtmltopdf -version=0.12.4 +version=0.12.5 revision=2 build_style=qmake hostmakedepends="qt5-qmake" +configure_args="INSTALLBASE=/usr" makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-webkit-devel" depends="qt5-svg" short_desc="Convert HTML to PDF using Webkit" maintainer="Piraty " -license="LGPL-3" -homepage="https://wkhtmltopdf.org/" +license="LGPL-3.0-or-later" +homepage="https://wkhtmltopdf.org" distfiles="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/${version}.tar.gz" -checksum=dd466f5c2504670459f3b8265de5697b9054f077e2f3e392e5172b5133080edf +checksum=861d6e61e2f5beb2d8daaade2cd5a85b84065ee9fac0d6d85000d8a7712a4621 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" ${makedepends}" fi -post_install() { - local dir - vmkdir usr - for dir in bin lib share include; do - [ -e $DESTDIR/usr/$dir ] && rmdir $DESTDIR/usr/$dir - mv -v $DESTDIR/$dir $DESTDIR/usr/$dir - done +libwkhtmltopdf_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/*.so.*" + } } wkhtmltopdf-devel_package() { diff --git a/srcpkgs/wordwarvi/template b/srcpkgs/wordwarvi/template new file mode 100644 index 00000000000..440ba61bfe7 --- /dev/null +++ b/srcpkgs/wordwarvi/template @@ -0,0 +1,20 @@ +# Template file for 'wordwarvi' +pkgname=wordwarvi +version=1.0.2 +revision=1 +build_style=gnu-makefile +hostmakedepends="pkg-config" +makedepends="portaudio-devel gtk+-devel libvorbis-devel alsa-lib-devel" +short_desc="Word War vi is a side-scrolling shoot 'em up '80s style arcade game" +maintainer="Olga Ustuzhanina " +license="GPL-2.0-or-later" +homepage="https://smcameron.github.io/wordwarvi/" +distfiles="https://github.com/smcameron/wordwarvi/archive/v${version}.tar.gz" +checksum=361d15af6edbe6db032db24de54e8f489a05b230572a8793b9889e2b8308a7ad + +do_install() { + vbin wordwarvi + vmkdir usr/share/wordwarvi/sounds + vcopy sounds/*.ogg usr/share/wordwarvi/sounds + vman wordwarvi.6 +} diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index 932ced458ec..b27f429613b 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -14,9 +14,9 @@ homepage="http://x265.org/" distfiles="https://bitbucket.org/multicoreware/x265/downloads/x265_${version}.tar.gz" checksum=6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 -if [ "$CROSS_BUILD" ]; then - configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=${CROSS_BUILD%-musl}" -fi +case "$XBPS_TARGET_MACHINE" in + mips*) configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=mips32r2" ;; +esac pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template index 29ac8fe70fc..ac29d3a0d3c 100644 --- a/srcpkgs/xapps/template +++ b/srcpkgs/xapps/template @@ -1,7 +1,7 @@ # Template file for 'xapps' pkgname=xapps version=1.2.1 -revision=1 +revision=2 build_style=meson hostmakedepends="glib-devel gnome-common pkg-config vala" makedepends="gettext-devel gobject-introspection libgnomekbd-devel @@ -17,7 +17,8 @@ checksum=daf41acb021b4dfb1b313710eea812e315a9f49e6a2cc037691ec51799f4cf26 xapps-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel + gdk-pixbuf-devel" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template index d15668b52c8..42ebf846312 100644 --- a/srcpkgs/xbps-static/template +++ b/srcpkgs/xbps-static/template @@ -2,7 +2,7 @@ # NOTE: keep this package synchronized with "srcpkgs/xbps". pkgname=xbps-static version=0.52 -revision=1 +revision=2 wrksrc="xbps-${version}" build_style=configure hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ short_desc="The XBPS package system utilities - static binaries" maintainer="Juan RP " license="BSD-2-Clause" homepage="https://www.voidlinux.eu/xbps" -distfiles="https://github.com/voidlinux/xbps/archive/$version.tar.gz" +distfiles="https://github.com/void-linux/xbps/archive/$version.tar.gz" checksum=f9a584d286c28eaf5a00f2e0ea9a8124b2200d50ecb62d26adcabe51f328b551 case "$XBPS_TARGET_MACHINE" in @@ -31,3 +31,8 @@ do_install() { vmkdir usr/bin mv ${wrksrc}/static-install/usr/bin/*.static ${DESTDIR}/usr/bin } + +post_install() { + vlicense COPYING + vlicense COPYING.3RDPARTY +} diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index a3b46363b36..2fd4cc660f4 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,14 +1,14 @@ # Template file for 'xbps' pkgname=xbps version=0.52 -revision=6 +revision=7 bootstrap=yes build_style=configure short_desc="The XBPS package system utilities" maintainer="Juan RP " -homepage="https://github.com/voidlinux/xbps" -license="2-clause-BSD" -distfiles="https://github.com/voidlinux/xbps/archive/$version.tar.gz" +homepage="https://github.com/void-linux/xbps" +license="BSD-2-Clause" +distfiles="https://github.com/void-linux/xbps/archive/$version.tar.gz" checksum=f9a584d286c28eaf5a00f2e0ea9a8124b2200d50ecb62d26adcabe51f328b551 CFLAGS='-Wno-error' @@ -54,6 +54,8 @@ post_install() { esac vmkdir etc/xbps.d touch ${DESTDIR}/etc/xbps.d/.empty + vlicense COPYING + vlicense COPYING.3RDPARTY } libxbps_package() { diff --git a/srcpkgs/xcb-util-errors-devel b/srcpkgs/xcb-util-errors-devel new file mode 120000 index 00000000000..06173363206 --- /dev/null +++ b/srcpkgs/xcb-util-errors-devel @@ -0,0 +1 @@ +xcb-util-errors \ No newline at end of file diff --git a/srcpkgs/xcb-util-errors/template b/srcpkgs/xcb-util-errors/template new file mode 100644 index 00000000000..cff1bb5d390 --- /dev/null +++ b/srcpkgs/xcb-util-errors/template @@ -0,0 +1,28 @@ +# Template file for 'xcb-util-errors' +pkgname=xcb-util-errors +version=1.0 +revision=1 +build_style=gnu-configure +configure_args="--disable-static" +hostmakedepends="pkg-config m4" +makedepends="libxcb-devel" +short_desc="XCB errors library" +maintainer="Julio Galvan " +license="MIT" +homepage="https://xcb.freedesktop.org" +distfiles="https://xcb.freedesktop.org/dist/${pkgname}-${version}.tar.bz2" +checksum=682681769e818ba085870d1ccd65f1f282ca16ca7d6f0f73ee70bc3642aa1995 + +post_install() { + vlicense COPYING +} + +xcb-util-errors-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/xcur2png/template b/srcpkgs/xcur2png/template new file mode 100644 index 00000000000..8b95a034e2b --- /dev/null +++ b/srcpkgs/xcur2png/template @@ -0,0 +1,13 @@ +# Template file for 'xcur2png' +pkgname=xcur2png +version=0.7.1 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libpng-devel libXcursor-devel libXrender-devel" +short_desc="Convert X cursors to PNG images" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/eworm-de/xcur2png" +distfiles="https://github.com/eworm-de/xcur2png/archive/${version}.tar.gz" +checksum=3874e8bd4f287dbd8b6d4a16ee1f450970965fd773288d85bb53143e2e631add diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template index 8b78ae3858a..81ddd9e9137 100644 --- a/srcpkgs/xdg-desktop-portal/template +++ b/srcpkgs/xdg-desktop-portal/template @@ -1,10 +1,10 @@ # Template file for 'xdg-desktop-portal' pkgname=xdg-desktop-portal version=0.11 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config glib-devel" -makedepends="flatpak-devel fuse-devel pipewire-devel" +makedepends="flatpak-devel fuse-devel pipewire-devel libspa-lib-devel" short_desc="Portal frontend service for Flatpak" maintainer="Duncaen " license="LGPL-2.1-or-later" diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template index 80a62e69736..63be18058ef 100644 --- a/srcpkgs/xf86-input-evdev/template +++ b/srcpkgs/xf86-input-evdev/template @@ -1,7 +1,7 @@ -# Template build file for 'xf86-input-evdev'. +# Template file for 'xf86-input-evdev' pkgname=xf86-input-evdev -version=2.10.5 -revision=2 +version=2.10.6 +revision=1 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,10 +9,10 @@ makedepends="xorg-server-devel mtdev-devel libevdev-devel" depends="virtual?xserver-abi-input-24_1" short_desc="Xorg event device input 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=9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d +checksum=8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0 post_install() { vlicense COPYING diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template index aad3534d018..e00997978d9 100644 --- a/srcpkgs/xf86-input-libinput/template +++ b/srcpkgs/xf86-input-libinput/template @@ -1,18 +1,18 @@ # Template build file for 'xf86-input-libinput'. pkgname=xf86-input-libinput -version=0.27.0 +version=0.27.1 revision=1 -lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="xorg-server-devel libinput-devel" +makedepends="libinput-devel xorg-server-devel" depends="virtual?xserver-abi-input-24_1" short_desc="Generic input driver for the X.Org server based on libinput" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -checksum=77b0516cb0bff616f491faed7f7794fef9dc496edc2dc7d6197324727cc668a3 +checksum=d4ad8dc5ad6f962a3f15f61ba9e9f8e37fa0b57eee9f484e2bd721d60ca72ee6 +lib32disabled=yes post_install() { vlicense COPYING diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template index b70d5b5eabf..752110d96ae 100644 --- a/srcpkgs/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -1,7 +1,7 @@ -# Template build file for 'xf86-input-synaptics'. +# Template file for 'xf86-input-synaptics' pkgname=xf86-input-synaptics -version=1.9.0 -revision=2 +version=1.9.1 +revision=1 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,10 +10,10 @@ makedepends="libX11-devel libXtst-devel libevdev-devel depends="virtual?xserver-abi-input-24_1" short_desc="Xorg synaptics touchpad input driver" maintainer="Juan RP " -homepage="http://www.x.org/" license="MIT" +homepage="http://www.x.org/" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" -checksum=afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a +checksum=7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576 post_install() { vlicense COPYING diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template index c7058073441..aab82f52763 100644 --- a/srcpkgs/xf86-video-fbdev/template +++ b/srcpkgs/xf86-video-fbdev/template @@ -1,18 +1,18 @@ -# Template build file for 'xf86-video-fbdev'. +# Template file for 'xf86-video-fbdev' pkgname=xf86-video-fbdev -version=0.4.4 -revision=10 -lib32disabled=yes +version=0.5.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel" depends="virtual?xserver-abi-video-24_1" short_desc="Xorg framebuffer video driver" -homepage="http://xorg.freedesktop.org" -license="MIT" maintainer="Juan RP " +license="MIT" +homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" -checksum=9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b +checksum=dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699 +lib32disabled=yes CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg" LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template index 8f049025527..60389a74a50 100644 --- a/srcpkgs/xfce4-settings/template +++ b/srcpkgs/xfce4-settings/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-settings' pkgname=xfce4-settings -version=4.12.3 +version=4.12.4 revision=1 build_style=gnu-configure configure_args="--enable-sound-settings --enable-pluggable-dialogs" @@ -11,7 +11,8 @@ depends="desktop-file-utils gnome-icon-theme" conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml" short_desc="Xfce settings manager" maintainer="Juan RP " -homepage="https://xfce.org/" license="GPL-2.0-only" -distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=0869a9fb29ff51e8225320ed3c621d922f1e4a99a325a3a35c3b2d7bee700ba2 +homepage="https://xfce.org/" +changelog="https://raw.githubusercontent.com/xfce-mirror/xfce4-settings/master/NEWS" +distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" +checksum=e2a04cad48bf9e951409d0c841829fa3b4ce632cd799082ef82d0506618b6f9b diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template index 18ff32c9618..d7067f42d3b 100644 --- a/srcpkgs/xfsprogs/template +++ b/srcpkgs/xfsprogs/template @@ -1,6 +1,6 @@ # Template file for 'xfsprogs' pkgname=xfsprogs -version=4.16.1 +version=4.17.0 revision=1 build_style=gnu-configure configure_args="--enable-readline=yes --enable-lib64=no" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="http://xfs.org/index.php/Main_Page" distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz" -checksum=3d5c2da46112b86cbd967fee43cea731d38a1b2aaf601b57674ed34e808652df +checksum=f53f5169cb98cfca471ddea30092738c427ba284c5356e01b45dd1ae3b297e0d do_install() { make install install-dev DIST_ROOT=${DESTDIR} \ diff --git a/srcpkgs/xiate/template b/srcpkgs/xiate/template index c51b94b7214..b5476db6cbe 100644 --- a/srcpkgs/xiate/template +++ b/srcpkgs/xiate/template @@ -1,6 +1,6 @@ # Template file for 'xiate' pkgname=xiate -version=18.04 +version=18.05 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Diogo Leal " license="MIT" homepage="https://www.uninformativ.de/projects/xiate/" distfiles="https://github.com/vain/xiate/archive/v${version}.tar.gz" -checksum=842d08db47719b18c631d4fdd6f5f02d61af1acecc720e286e02c8dda8b4a982 +checksum=2f7317cc71849cdbf31479be224f9ed20fce25d2fa8320885a5294ed2101411b pre_configure() { cp config.def.h config.h diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template index 480295c0acf..cdc714c6448 100644 --- a/srcpkgs/xkcdpass/template +++ b/srcpkgs/xkcdpass/template @@ -1,6 +1,6 @@ # Template file for 'xkcdpass' pkgname=xkcdpass -version=1.16.3 +version=1.16.5 revision=1 wrksrc="XKCD-password-generator-xkcdpass-${version}" noarch=yes @@ -9,12 +9,12 @@ pycompile_module="xkcdpass" hostmakedepends="python3-setuptools" checkdepends="python3-pytest" depends="python3-setuptools" -maintainer="cr6git " short_desc="Generate secure multiword passwords/passphrases, inspired by XKCD" +maintainer="cr6git " +license="BSD-3-Clause" homepage="https://github.com/redacted/XKCD-password-generator" -license="BSD" distfiles="https://github.com/redacted/XKCD-password-generator/archive/xkcdpass-${version}.tar.gz" -checksum=99e62b8519f453b88f533d9cc7d0d47d8fc6e3c5bd286852e321c327d5a2c4df +checksum=7778cc8924273a3f8313888817dc37dc845a838b5f42f0c5ab0267b2adddebff do_check() { pytest3 diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template index 4144902a18f..453a86ab969 100644 --- a/srcpkgs/xkeyboard-config/template +++ b/srcpkgs/xkeyboard-config/template @@ -1,7 +1,7 @@ # Template file for 'xkeyboard-config' pkgname=xkeyboard-config version=2.24 -revision=1 +revision=2 noarch=yes build_style=gnu-configure configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules" diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template index 1a74d9e83cc..827d09ee2ba 100644 --- a/srcpkgs/xmlrpc-c/template +++ b/srcpkgs/xmlrpc-c/template @@ -1,6 +1,6 @@ # Template file for 'xmlrpc-c' pkgname=xmlrpc-c -version=1.39.12 +version=1.39.13 revision=1 build_style=gnu-configure configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server @@ -9,12 +9,11 @@ hostmakedepends="pkg-config python" makedepends="libcurl-devel libxml2-devel" short_desc="XML-RPC for C and C++" maintainer="Juan RP " -license="BSD" +license="BSD-3-Clause" homepage="http://xmlrpc-c.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tgz" -checksum=d830f3264a832dfe09f629cc64036acfd08121692526d0fabe090f7ff881ce08 +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" +checksum=491e44cae3763d285fc2a75fe6574882964f16451adbb7e6f3293916e120fca9 -CFLAGS="-fPIC" disable_parallel_build=yes pre_configure() { @@ -41,7 +40,7 @@ xmlrpc-c-devel_package() { local shlib vmove usr/bin vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template index 3238a759d8c..a5506f7cff4 100644 --- a/srcpkgs/xmlsec1/template +++ b/srcpkgs/xmlsec1/template @@ -1,16 +1,16 @@ -# Template file for 'xmlsec' +# Template file for 'xmlsec1' pkgname=xmlsec1 -version=1.2.25 -revision=2 +version=1.2.26 +revision=1 +build_style=gnu-configure hostmakedepends="automake libtool pkg-config gnutls-devel" makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel" -build_style="gnu-configure" +short_desc="XML Security Library is a C library based on LibXML2" maintainer="Enno Boland " license="MIT" homepage="https://www.aleksey.com/xmlsec/" -short_desc="XML Security Library is a C library based on LibXML2" distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz" -checksum=967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2 +checksum=8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50 pre_configure() { autoreconf -if diff --git a/srcpkgs/xorg-fonts/template b/srcpkgs/xorg-fonts/template index 09f9bb7bdb2..fcd23f971b8 100644 --- a/srcpkgs/xorg-fonts/template +++ b/srcpkgs/xorg-fonts/template @@ -1,7 +1,7 @@ # Template file for 'xorg-fonts' pkgname=xorg-fonts version=7.6 -revision=4 +revision=5 build_style=meta depends="encodings>=1.0.4 font-adobe-100dpi>=1.0.3 font-adobe-75dpi>=1.0.3 font-adobe-utopia-100dpi>=1.0.4 font-adobe-utopia-75dpi>=1.0.4 diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 6bedcdbb08b..21b7c50b2ca 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,6 +1,6 @@ # Template file for 'xpra' pkgname=xpra -version=2.3.1 +version=2.3.2 revision=1 build_style=python2-module pycompile_module="xpra" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://xpra.org/" #changelog="https://xpra.org/svn/Xpra/trunk/debian/changelog" distfiles="https://xpra.org/src/${pkgname}-${version}.tar.xz" -checksum=3e0fea421f8ad30daecd496e8c0cf31e6993ad3f3f17f69481f39ec37395f071 +checksum=26da705a555f58b0e20b07333faaae824bbb66590dd50b95628ab7413ab5970b conf_files=" /etc/xpra/xpra.conf /etc/xpra/xorg.conf diff --git a/srcpkgs/xprintidle/template b/srcpkgs/xprintidle/template index 2a8113e6634..597e28350b0 100644 --- a/srcpkgs/xprintidle/template +++ b/srcpkgs/xprintidle/template @@ -1,7 +1,7 @@ # Template file for 'xprintidle' pkgname=xprintidle version=0.2.2 -revision=1 +revision=2 build_style=gnu-configure makedepends="libXScrnSaver-devel" short_desc="Query X server for user's idle time and print it in milliseconds" diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template index fd8645f7204..7306d8bbee6 100644 --- a/srcpkgs/xreader/template +++ b/srcpkgs/xreader/template @@ -1,6 +1,6 @@ # Template file for 'xreader' pkgname=xreader -version=1.8.2 +version=1.8.4 revision=1 build_style=gnu-configure configure_args="--disable-introspection --disable-thumbnailer" @@ -13,7 +13,7 @@ maintainer="cr6git " license="GPL-2.0-or-later" homepage="https://github.com/linuxmint/xreader" distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz" -checksum=a8a767c4617bbeeecb3ebeb570cbaecb4c5e5ee7e69f359a5a46053aa0d09b63 +checksum=ed0b16bab5a48c7f5c3cdad96cebe67a013a81812224f42caeb0cd6a5258922c pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template index 0d6de46c353..1d8e2a307d2 100644 --- a/srcpkgs/xtools/template +++ b/srcpkgs/xtools/template @@ -1,6 +1,6 @@ # Template file for 'xtools' pkgname=xtools -version=0.51 +version=0.52 revision=1 noarch=yes build_style=gnu-makefile @@ -8,6 +8,6 @@ depends="bash curl findutils git make xbps" short_desc="Opinionated helpers for working with XBPS" maintainer="Leah Neukirchen " license="Public Domain" -homepage="https://github.com/chneukirchen/xtools" -distfiles="https://github.com/chneukirchen/xtools/archive/v${version}.tar.gz" -checksum=4765243e69ae8c1d898f2b15a4b2e1333dc471d51394d0a78b60625d5e3db7e4 +homepage="http://git.vuxu.org/xtools" +distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz" +checksum=8ef8149e55f81922f0101a8a34148156737f0574e3d3ff0425da87539bc96ff4 diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template index 8ce9825a47a..9e7aea53a68 100644 --- a/srcpkgs/yarn-bin/template +++ b/srcpkgs/yarn-bin/template @@ -1,6 +1,6 @@ # Template file for 'yarn-bin' pkgname=yarn-bin -version=1.7.0 +version=1.8.0 revision=1 depends="virtual?nodejs-runtime" short_desc="Fast, reliable, and secure dependency management - precompiled binaries" @@ -9,7 +9,7 @@ license="2-cause-BSD" homepage="https://yarnpkg.com/" distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz" conflicts="yarn>=0" -checksum=e7720ee346b2bd7ec32b7e04517643c38648f5022c7981168321ba1636f2dca3 +checksum=3d8dc87cae99f7547b82026f818b3a14f0393cfa09337bb9adfb446d50a527a7 do_extract() { tar xfz ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yarn-v${version}.tar.gz --strip-components=1 -C ${wrksrc} diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template index 58106118255..50604097a44 100644 --- a/srcpkgs/yarn/template +++ b/srcpkgs/yarn/template @@ -1,6 +1,6 @@ # Template file for 'yarn' pkgname=yarn -version=1.4.1 +version=1.8.0 revision=1 hostmakedepends="yarn-bin nodejs" depends="virtual?nodejs-runtime" @@ -10,7 +10,7 @@ license="2-cause-BSD" homepage="https://yarnpkg.com/" distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz" conflicts="yarn-bin>=0" -checksum=f008e68adcd179e2c56c9024a88484851ea02bbf3ddfc4957f5df95e1564ad28 +checksum=06947d8ae4ad61dc9432904b6c2a908be72ae7e0435e368ed11fa3345305e89d pre_build() { yarn diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 4e167e62800..15650f6bac8 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2018.06.14 +version=2018.06.25 revision=1 noarch=yes wrksrc="$pkgname" @@ -12,9 +12,9 @@ short_desc="CLI program to download videos from YouTube and other sites (Python2 maintainer="Juan RP " license="Public Domain" homepage="http://rg3.github.io/youtube-dl/" -#changelog="https://raw.githubusercontent.com/rg3/youtube-dl/master/ChangeLog" +changelog="https://raw.githubusercontent.com/rg3/youtube-dl/master/ChangeLog" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=6cc4fdd9122e2b5f73245f423054a050ecf3a38ad4cd13abf112c7cbf6130b6c +checksum=8e1e939eb3f679ae5f17db67abecec513e1fe78ecb5ae5aaed7b6368cc9e4ba2 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { diff --git a/srcpkgs/yq-go/patches/Disable-failing-test.patch b/srcpkgs/yq-go/patches/Disable-failing-test.patch deleted file mode 100644 index 477c2eec31d..00000000000 --- a/srcpkgs/yq-go/patches/Disable-failing-test.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- merge_test.go -+++ merge_test.go -@@ -17,6 +17,7 @@ func TestMerge(t *testing.T) { - assertResultComplex(t, expected, result) - } - -+/* - func TestMergeWithOverwrite(t *testing.T) { - overwriteFlag = true - result, _ := mergeYaml([]string{"examples/data1.yaml", "examples/data2.yaml", "examples/data3.yaml"}) -@@ -28,3 +29,4 @@ func TestMergeWithOverwrite(t *testing.T) { - } - assertResultComplex(t, expected, result) - } -+*/ diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template index df4aa613fbf..ecd1f1890d3 100644 --- a/srcpkgs/yq-go/template +++ b/srcpkgs/yq-go/template @@ -1,17 +1,17 @@ # Template file for 'yq-go' pkgname=yq-go -version=1.15.0 +version=2.0.1 revision=1 wrksrc="yq-${version}" build_style=go -go_import_path="github.com/mikefarah/yq" +go_import_path=github.com/mikefarah/yq hostmakedepends="git" short_desc="A lightweight and portable command-line YAML processor written in go" maintainer="maxice8 " license="MIT" homepage="https://github.com/mikefarah/yq" distfiles="https://github.com/mikefarah/yq/archive/${version}.tar.gz" -checksum=f8eb713178720008744a68bcb5c9563cbe4674a579d5d46018797bc917ccca26 +checksum=5ef118f6d75fe84b5c24b2f9250edbbe4a5c14f1a70a978eabd80e4f91047497 do_check() { go test -v diff --git a/srcpkgs/ytnef/template b/srcpkgs/ytnef/template index 622e9331b1a..f5fb3819434 100644 --- a/srcpkgs/ytnef/template +++ b/srcpkgs/ytnef/template @@ -1,12 +1,12 @@ # Template file for 'ytnef' pkgname=ytnef version=1.9.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool" short_desc="Yerase's TNEF Stream Reader" maintainer="Jürgen Buchmüller " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/Yeraze/ytnef" distfiles="https://github.com/Yeraze/ytnef/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=48f7d7272ba74b267d3f98a1b14c81fef54cfb53460346d7c36a9604df1f95ad @@ -16,7 +16,7 @@ pre_configure() { } do_build() { - if [ -n "$CROSS_BUILD" ]; then + if [ "$CROSS_BUILD" ]; then configure_args+=" --host=${XBPS_TARGET_MACHINE}" export ac_cv_func_malloc_0_nonnull=yes fi @@ -42,10 +42,11 @@ do_install() { ytnef-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template index a16d49948b7..7ae879f06e4 100644 --- a/srcpkgs/zabbix/template +++ b/srcpkgs/zabbix/template @@ -1,6 +1,6 @@ # Template file for 'zabbix' pkgname=zabbix -version=3.4.9 +version=3.4.11 revision=1 build_style=gnu-configure configure_args="--with-libxml2 --with-gnutls --with-libcurl --with-net-snmp @@ -15,10 +15,10 @@ maintainer="maxice8 " license="GPL-2.0-or-later" homepage="https://www.zabbix.com" distfiles="${SOURCEFORGE_SITE}/zabbix/zabbix-${version}.tar.gz" -checksum=31582c712527ecd67ffd3ecc840c5ed308f46aa0aeb6e6b9cfa2ca079eda1f64 +checksum=e3048751d23c01423184e5f3305a62c435c4e4fcb16bd17a9570c5d3a171af63 conf_files="/etc/zabbix_server.conf" system_accounts="_zabbix_server" -system_groups=_zabbix_server +system_groups="_zabbix_server" make_dirs="/var/run/zabbix-server 0750 _zabbix_server _zabbix_server /var/log/zabbix-server 0750 _zabbix_server _zabbix_server" diff --git a/srcpkgs/zabbix/update b/srcpkgs/zabbix/update new file mode 100644 index 00000000000..f4adc4eaf7c --- /dev/null +++ b/srcpkgs/zabbix/update @@ -0,0 +1 @@ +ignore="*alpha* *rc[0-9]*" diff --git a/srcpkgs/zerotier-one/template b/srcpkgs/zerotier-one/template index fdaa31bfd0b..fdf63578d60 100644 --- a/srcpkgs/zerotier-one/template +++ b/srcpkgs/zerotier-one/template @@ -1,6 +1,6 @@ # Template file for 'zerotier' pkgname=zerotier-one -version=1.2.4 +version=1.2.10 revision=1 wrksrc=ZeroTierOne-${version} build_style=gnu-makefile @@ -11,11 +11,7 @@ maintainer="Michael Aldridge " license="GPL-3" homepage="https://www.zerotier.com/" distfiles="https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz" -checksum=9f275b3732b721f02cc4b8df75b51e6a8fb56dfe1a542a7bd681538d852b0358 - -do_build() { - make all ZT_ENABLE_NETWORK_CONTROLLER=1 -} +checksum=1c79ec57e67764079a77704b336e642ae3cf221dc8088b0cf9e9c81e0a9c0c57 pre_install() { sed -i 's/sbin/bin/g' make-linux.mk diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template new file mode 100644 index 00000000000..d87216f0a95 --- /dev/null +++ b/srcpkgs/zim-tools/template @@ -0,0 +1,13 @@ +# Template file for 'zim-tools' +pkgname=zim-tools +version=1.0.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config" +makedepends="libzim-devel xapian-core-devel icu-devel" +short_desc="Various ZIM command line tools" +maintainer="John Zimmermann " +license="GPL-3.0-or-later" +homepage="http://www.openzim.org" +distfiles="https://github.com/openzim/zim-tools/archive/${version}.tar.gz" +checksum=714fff4108aa837408f4d61d385dceeb6da89c0c8d08e69bbe36b5b45ffe1d00 diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template index cc73fdc6ef7..3eb61d1b2c9 100644 --- a/srcpkgs/zstd/template +++ b/srcpkgs/zstd/template @@ -1,15 +1,15 @@ # Template file for 'zstd' pkgname=zstd -version=1.3.4 -revision=3 +version=1.3.5 +revision=1 short_desc="Fast real-time compression algorithm - CLI tool" -maintainer="Michael Gehring " makedepends="zlib-devel liblzma-devel" checkdepends="gtest-devel" +maintainer="Michael Gehring " license="BSD-3-Clause, GPL-2.0-or-later" homepage="http://www.zstd.net" distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz" -checksum=92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9 +checksum=d6e1559e4cdb7c4226767d4ddc990bff5f9aab77085ff0d0490c828b025e2eea do_build() { make