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 25af9724316..82b1e4d99b8 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 @@ -383,15 +386,15 @@ libid3tag.so.0 libid3tag-0.15.1b_1 libgif.so.7 giflib-5.1.0_1 libImlib2.so.1 imlib2-1.4.2_1 libmp3lame.so.0 lame-3.98.2_1 -libavdevice.so.57 libavdevice-3.1.3_1 -libavformat.so.57 libavformat-3.1.3_1 -libswscale.so.4 libswscale-3.1.3_1 -libswresample.so.2 libswresample-3.1.3_1 -libavresample.so.3 libavresample-3.1.3_1 -libpostproc.so.54 libpostproc-3.1.3_1 -libavcodec.so.57 libavcodec-3.1.3_1 -libavutil.so.55 libavutil-3.1.3_1 -libavfilter.so.6 libavfilter-3.1.3_1 +libavdevice.so.58 libavdevice-4.0_1 +libavformat.so.58 libavformat-4.0_1 +libswscale.so.5 libswscale-4.0_1 +libswresample.so.3 libswresample-4.0_1 +libavresample.so.4 libavresample-4.0_1 +libpostproc.so.55 libpostproc-4.0_1 +libavcodec.so.58 libavcodec-4.0_1 +libavutil.so.56 libavutil-4.0_1 +libavfilter.so.7 libavfilter-4.0_1 libSDL-1.2.so.0 SDL-1.2.14_1 libSDL_image-1.2.so.0 SDL_image-1.2.10_1 libx264.so.152 x264-20180119.2245_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 @@ -2393,7 +2394,7 @@ libmunge.so.2 munge-libs-0.5.11_1 libmgba.so.0.6 libmgba-0.6.0_1 libglabels-3.0.so.8 libglabels30-3.2.1_1 libglbarcode-3.0.so.0 libglabels30-3.2.1_1 -libjim.so.0.77 jimtcl-0.77_1 +libjim.so.0.78 jimtcl-0.78_1 libftdi1.so.2 libftdi1-1.2_1 libax25.so.0 libax25-0.0.12rc4_1 libax25io.so.0 libax25-0.0.12rc4_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 @@ -2994,9 +2991,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1 libm17n-gui.so.0 m17n-lib-1.7.0_1 libm17n-core.so.0 m17n-lib-1.7.0_1 libm17n.so.0 m17n-lib-1.7.0_1 -libprotobuf-lite.so.15 protobuf-lite-3.5.0.1_1 -libprotoc.so.15 protobuf-3.5.0.1_1 -libprotobuf.so.15 protobuf-3.5.0.1_1 +libprotobuf-lite.so.16 protobuf-lite-3.6.0_1 +libprotoc.so.16 protobuf-3.6.0_1 +libprotobuf.so.16 protobuf-3.6.0_1 libsombok.so.3 sombok-2.4.0_1 libdeviceclient.so.0 pragha-1.3.3_1 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_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..b7bb52f6f75 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_PROTO=https +TRAVIS_MIRROR=repo2.voidlinux.eu 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..5819e362d21 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.94.0.1 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=f48162f6880322251410c79757d2eae751f6bc75dc4a4852ba961f09e93841b1 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/Fritzing/files/Fritzing b/srcpkgs/Fritzing/files/Fritzing new file mode 100644 index 00000000000..384c040bb57 --- /dev/null +++ b/srcpkgs/Fritzing/files/Fritzing @@ -0,0 +1,3 @@ +#! /bin/sh +cd /usr/share/fritzing/parts +exec /usr/bin/Fritzing-bin "$@" diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template index eb97a521742..0919052071d 100644 --- a/srcpkgs/Fritzing/template +++ b/srcpkgs/Fritzing/template @@ -1,20 +1,21 @@ # Template file for 'Fritzing' pkgname=Fritzing version=0.9.3b -revision=1 +revision=2 +_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14 +wrksrc="fritzing-app-${version}" build_style=qmake hostmakedepends="qt5-qmake" makedepends="qt5-devel qt5-serialport-devel qt5-svg-devel boost-devel libgit2-devel" depends="qt5-plugin-sqlite" short_desc="Software for electronics prototyping" maintainer="Steve Prybylski " -license="GPL-2,GPL-3, CC-BY-SA-3.0" +license="GPL-3.0-or-later, CC-BY-SA-3.0" homepage="http://fritzing.org" distfiles="https://github.com/${pkgname}/${pkgname}-app/archive/${version}.tar.gz>fritzing-app-${version}.tar.gz - https://github.com/${pkgname}/${pkgname}-parts/archive/${version}.tar.gz>fritzing-parts-${version}.tar.gz" + https://github.com/${pkgname}/${pkgname}-parts/archive/${_partshash}.tar.gz>fritzing-parts-${_partshash}.tar.gz" checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8 - c40a9a50df0af78905968792b2ce595896af1935633600d6136eca0cf9797fdb" -wrksrc="fritzing-app-${version}" + 2d5882f0180d04c582ef418fd286bf1d04142409d316a4cd5c9ce3e2d91434dd" if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-serialport-devel qt5-svg-devel" @@ -32,6 +33,9 @@ post_extract() { pri/utils.pri } -pre_build() { - mv ${XBPS_BUILDDIR}/fritzing-parts-$version/ $wrksrc/parts +post_install() { + mv ${XBPS_BUILDDIR}/fritzing-parts-$_partshash/ ${DESTDIR}/usr/share/fritzing/parts + mv ${DESTDIR}/usr/bin/Fritzing{,-bin} + vbin ${FILESDIR}/Fritzing + sed -i -e "s;^Icon=.*;Icon=fritzing;" ${DESTDIR}/usr/share/applications/fritzing.desktop } 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..3e67ecbf027 100644 --- a/srcpkgs/MEGAcmd/template +++ b/srcpkgs/MEGAcmd/template @@ -1,23 +1,19 @@ # Template file for 'MEGAcmd' pkgname=MEGAcmd -version=0.9.7 -revision=2 +version=0.9.9 +revision=1 build_style=gnu-configure make_build_args='LIBTOOLFLAGS="--tag=CXX"' hostmakedepends="autoconf-archive autogen gettext automake libtool pkg-config" makedepends="MEGAsdk-devel readline-devel pcre-devel" short_desc="Command Line Interactive and Scriptable Application to access MEGA" maintainer="John " -license="BSD-2" +license="BSD-2-Clause, GPL-3.0-or-later" homepage="https://github.com/meganz/MEGAcmd" distfiles="https://github.com/meganz/MEGAcmd/archive/${version}.tar.gz" -checksum=791fe292b077d0fe11635a8a24bd3d5f3846ed5a0ea675bd05d5ae10d86a675b +checksum=5ace7c85fa817a357bdb968f32e3839439d3ff4e3066d7db470b4648def11105 replaces="megacmd>=0" -case "$XBPS_TARGET_MACHINE" in - aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/7450/steps/shell_3/logs/stdio" ;; -esac - if [ "$CROSS_BUILD" ]; then configure_args="--with-libtool-sysroot=${XBPS_CROSS_BASE}" fi 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..af306b293ea 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.9 +revision=1 wrksrc=sdk-${version} build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" @@ -13,19 +13,23 @@ makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel checkdepends="gtest-devel" short_desc="The official client for cloud service mega.nz" maintainer="John " -license="2-clause-BSD" +license="BSD-2-Clause" homepage="https://mega.nz" distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz" -checksum=da00cbff64eba5b83a98c78347f8def3350fcf2c74ba4d4f03e099e42a1566e6 +checksum=522b63bf2f2d1eeff0644ef106fff94fcd4f6a844e01539cc6cfb30d16463dba 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..33dd86ef6d0 100644 --- a/srcpkgs/MEGAsync/template +++ b/srcpkgs/MEGAsync/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsync' pkgname=MEGAsync -version=3.6.0.0 -revision=1 +version=3.6.6.0 +revision=2 wrksrc="${pkgname}-${version}_Linux" build_wrksrc="src" build_style=qmake @@ -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/PopCorn-Server b/srcpkgs/PopCorn-Server index 254bd5d89fb..11c08964250 120000 --- a/srcpkgs/PopCorn-Server +++ b/srcpkgs/PopCorn-Server @@ -1 +1 @@ -PopCorn/ \ No newline at end of file +PopCorn \ No newline at end of file diff --git a/srcpkgs/SFML-devel b/srcpkgs/SFML-devel index 84314a4aab7..af5235c84f9 120000 --- a/srcpkgs/SFML-devel +++ b/srcpkgs/SFML-devel @@ -1 +1 @@ -SFML/ \ No newline at end of file +SFML \ No newline at end of file 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/acpilight/template b/srcpkgs/acpilight/template index f4236545170..bcc2f5f60af 100644 --- a/srcpkgs/acpilight/template +++ b/srcpkgs/acpilight/template @@ -1,16 +1,18 @@ # Template file for 'acpilight' pkgname=acpilight -version=1.0.1 +version=1.1 revision=1 +wrksrc="${pkgname}-v${version}" noarch=yes depends="python" short_desc="Backward-compatibile xbacklight replacement" maintainer="cr6git " -homepage="https://github.com/wavexx/acpilight" -license="GPL-3" -distfiles="https://github.com/wavexx/acpilight/archive/v${version}.tar.gz" -checksum=4ea6137a3cc4d9431526baa191d973ec18ccc2bb0fd0710ea8ddb5d8048a02e1 -conflicts="xbacklight>=0" +license="GPL-3.0-or-later" +homepage="https://gitlab.com/wavexx/acpilight" +distfiles="https://gitlab.com/wavexx/acpilight/-/archive/v${version}/${pkgname}-v${version}.tar.bz2" +checksum=0a5ef16a39c05c1eb195823d906c08f8f912aa48122b31e6dd364c7f9d6c37aa +replaces="xbacklight>=0" +provides="xbacklight-${version}_${revision}" do_install() { vbin xbacklight 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/alacritty-terminfo b/srcpkgs/alacritty-terminfo new file mode 120000 index 00000000000..f681b820f67 --- /dev/null +++ b/srcpkgs/alacritty-terminfo @@ -0,0 +1 @@ +alacritty \ No newline at end of file diff --git a/srcpkgs/alacritty/INSTALL b/srcpkgs/alacritty/INSTALL new file mode 100644 index 00000000000..9111e31e411 --- /dev/null +++ b/srcpkgs/alacritty/INSTALL @@ -0,0 +1,6 @@ +case "$ACTION" in +post) + # Compile the terminfo description. + tic -sx usr/share/terminfo/a/alacritty.info + ;; +esac diff --git a/srcpkgs/alacritty/REMOVE b/srcpkgs/alacritty/REMOVE new file mode 100644 index 00000000000..e4fd286bdb4 --- /dev/null +++ b/srcpkgs/alacritty/REMOVE @@ -0,0 +1,7 @@ +case "$ACTION" in +pre) + # Remove compiled terminfo files. + rm -f usr/share/terminfo/a/alacritty-256color + rm -f usr/share/terminfo/a/alacritty + ;; +esac diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template index 36e164fc1bc..20fd6e5c6bf 100644 --- a/srcpkgs/alacritty/template +++ b/srcpkgs/alacritty/template @@ -1,18 +1,18 @@ # Template file for 'alacritty' pkgname=alacritty -version=0.1.0.20180508 -revision=1 -_commit=24e8a19e7d981fbc8853891ad4a17a9de2ac36bd +version=0.1.0.20180705 +revision=2 +_commit=7433f45ff9c6efeb48e223e90dd4aa9ee135b5e8 wrksrc="${pkgname}-${_commit}" hostmakedepends="rust cargo cmake pkg-config" makedepends="freetype-devel fontconfig-devel" -depends="libXxf86vm xclip" +depends="libXxf86vm xclip ncurses" short_desc="A cross-platform, GPU-accelerated terminal emulator" maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://github.com/jwilm/alacritty" distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=91d9f6b01770fa3e9ac4da306bbe95eae56819f13cc77668d7dd1ed2874b60b5 +checksum=51a9e0b0264bc0ba69da51993371493868b82a6b0d8a53a2645f126a84a36063 nocross=yes @@ -22,6 +22,19 @@ do_build() { do_install() { vbin target/release/$pkgname - vinstall Alacritty.desktop 644 usr/share/applications + vinstall alacritty.desktop 644 usr/share/applications + vinstall alacritty-completions.zsh 644 usr/share/zsh/site-functions _alacritty + vinstall alacritty-completions.fish 644 usr/share/fish/completions alacritty.fish + vinstall alacritty.info 644 usr/share/terminfo/a vlicense LICENSE-APACHE LICENSE + vman alacritty.man alacritty.1 + vsconf alacritty.yml +} + +alacritty-terminfo_package() { + short_desc+=" - terminfo data" + noarch=yes + pkg_install() { + vmove usr/share/terminfo + } } diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template index b6e3b491d30..64ae8ab6846 100644 --- a/srcpkgs/alertmanager/template +++ b/srcpkgs/alertmanager/template @@ -1,7 +1,7 @@ # Template file for 'alertmanager' pkgname=alertmanager -version=0.14.0 -revision=4 +version=0.15.0 +revision=1 build_style=go go_import_path="github.com/prometheus/alertmanager" go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool" @@ -15,7 +15,7 @@ maintainer="Toyam Cox " license="Apache-2.0" homepage="https://github.com/prometheus/alertmanager" distfiles="https://github.com/prometheus/alertmanager/archive/v${version}.tar.gz" -checksum=f25bd1dad2eb3e050f1208650571195194b0c2362c488a7ad5ca60f40ca866ac +checksum=69694bd32d1159eef8eaace6c65fb2f683cde607e98c663bfdc4bf158a679de8 system_accounts="_alertmanager" make_dirs="/var/lib/alertmanager 700 _alertmanager _alertmanager" diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index 8ec3a54d087..3031dd380d2 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -1,7 +1,7 @@ # Template build file for 'alsa-plugins'. pkgname=alsa-plugins version=1.1.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-maemo-plugin" hostmakedepends="pkg-config" 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..da03419afcf 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.7 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=72254aa58d46c6c931e6941fc216e03cbaceddda63ab1f927695349c97b5d72a 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..5cb31710547 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.1 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=a1fc205286344c5d7bda36b503c273f5b348b06a23f86d52ddddd6afa01cad3c 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..92f3792487c 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd +++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd @@ -29,8 +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/virtual/net/*/uevent r, + /sys/devices/**/net/*/uevent r, /{usr/,}bin/dash ix, /{usr/,}bin/dash mrix, @@ -39,51 +38,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..499d8309957 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=4 _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/arcan/patches/ffmpeg4.patch b/srcpkgs/arcan/patches/ffmpeg4.patch new file mode 100644 index 00000000000..27b94424f92 --- /dev/null +++ b/srcpkgs/arcan/patches/ffmpeg4.patch @@ -0,0 +1,62 @@ +--- src/frameserver/encode/default/encode.c 2018-04-15 11:19:51.000000000 +0200 ++++ src/frameserver/encode/default/encode.c 2018-04-15 11:19:51.000000000 +0200 +@@ -285,8 +285,8 @@ + /* + * for the flush case, we may have a little bit of buffers left, both in the + * encoder and the resampler, +- * CODEC_CAP_DELAY = pframe can be NULL and encode audio is used to flush +- * CODEC_CAP_SMALL_LAST_FRAME or CODEC_CAP_VARIABLE_FRAME_SIZE = ++ * AV_CODEC_CAP_DELAY = pframe can be NULL and encode audio is used to flush ++ * AV_CODEC_CAP_SMALL_LAST_FRAME or AV_CODEC_CAP_VARIABLE_FRAME_SIZE = + * we can the last few buffer bytes can be stored as well otherwise those + * will be discarded + */ +@@ -298,8 +298,8 @@ + * and then re-use the encode / conversion code + */ + if (!forcetog && +- ((ctx->flags & CODEC_CAP_SMALL_LAST_FRAME) > 0 || +- (ctx->flags & CODEC_CAP_VARIABLE_FRAME_SIZE) > 0)){ ++ ((ctx->flags & AV_CODEC_CAP_SMALL_LAST_FRAME) > 0 || ++ (ctx->flags & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) > 0)){ + recctx.aframe_insz = recctx.encabuf_ofs; + recctx.aframe_smplcnt = recctx.aframe_insz >> 2; + frame = av_frame_alloc(); +@@ -309,7 +309,7 @@ + goto forceencode; + } + +- if ( (ctx->flags & CODEC_CAP_DELAY) > 0 ){ ++ if ( (ctx->flags & AV_CODEC_CAP_DELAY) > 0 ){ + int gotpkt; + do { + AVPacket flushpkt = {0}; +@@ -638,7 +638,7 @@ + * for float conversion, we need to double afterwards + */ + +- if ( (recctx.acodec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) > 0){ ++ if ( (recctx.acodec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) > 0){ + recctx.aframe_smplcnt = recctx.acontext->frame_size ? + recctx.acontext->frame_size : round( samplerate / fps ); + } +--- src/frameserver/encode/default/encode_presets.c 2018-04-15 11:19:51.000000000 +0200 ++++ src/frameserver/encode/default/encode_presets.c 2018-04-15 11:19:51.000000000 +0200 +@@ -379,7 +379,7 @@ + + a.storage.video.context = avcodec_alloc_context3( a.storage.video.codec ); + if (flags & AVFMT_GLOBALHEADER) +- a.storage.video.context->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ a.storage.video.context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + return a; + } +@@ -397,7 +397,7 @@ + + res.storage.audio.context = avcodec_alloc_context3( res.storage.audio.codec); + if ( (flags & AVFMT_GLOBALHEADER) > 0){ +- res.storage.audio.context->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ res.storage.audio.context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + return res; diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index d8b7394b62f..323b61d8575 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -1,7 +1,7 @@ # Template file for 'arcan' pkgname=arcan version=0.5.4.6 -revision=2 +revision=3 build_style=cmake build_wrksrc=src short_desc="Combined display server, multimedia framework and game engine" 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/arp-scan/patches/fix-crossbuild.patch b/srcpkgs/arp-scan/patches/fix-crossbuild.patch deleted file mode 100644 index 38cbfc8bc3e..00000000000 --- a/srcpkgs/arp-scan/patches/fix-crossbuild.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- acinclude.m4 -+++ acinclude.m4 -@@ -212,7 +211,8 @@ done])dnl AC_CACHE_VAL - LONG_LONG_INT_FORMAT='' - - case $pgac_cv_snprintf_long_long_int_format in -- cross) AC_MSG_RESULT([cannot test (not on host machine)]);; -+ cross) AC_MSG_RESULT([assuming %lld for cross compilation]) -+ LONG_LONG_INT_FORMAT='%lld';; - ?*) AC_MSG_RESULT([$pgac_cv_snprintf_long_long_int_format]) - LONG_LONG_INT_FORMAT=$pgac_cv_snprintf_long_long_int_format;; - *) AC_MSG_RESULT(none);; diff --git a/srcpkgs/arp-scan/template b/srcpkgs/arp-scan/template index acc79cf51e5..f83c13637c3 100644 --- a/srcpkgs/arp-scan/template +++ b/srcpkgs/arp-scan/template @@ -1,16 +1,16 @@ # Template file for 'arp-scan' pkgname=arp-scan -version=1.9 +version=1.9.5 revision=1 build_style=gnu-configure hostmakedepends="automake" makedepends="libpcap-devel" short_desc="A tool that uses ARP to discover IP hosts on the local network" maintainer="Urs Schulz " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.nta-monitor.com/tools/arp-scan/" distfiles="https://github.com/royhills/$pkgname/archive/$version/$pkgname-$version.tar.gz" -checksum=b2a446a170e4a2feeb825cd08db48a147f8dffae702077f33e456c4200e7afb0 +checksum=aa9498af84158a315b7e0ea6c2cddfa746660ca3987cbe7e32c0c90f5382d9d2 pre_configure() { autoreconf --install 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/attract/patches/ffmpeg4.patch b/srcpkgs/attract/patches/ffmpeg4.patch new file mode 100644 index 00000000000..ebb5eb3ec01 --- /dev/null +++ b/srcpkgs/attract/patches/ffmpeg4.patch @@ -0,0 +1,26 @@ +--- src/media.cpp 2017-11-19 00:08:04.000000000 +0100 ++++ src/media.cpp 2018-05-08 22:32:36.387186528 +0200 +@@ -970,11 +970,11 @@ + + size_t avio_ctx_buffer_size = 4096; + uint8_t *avio_ctx_buffer = (uint8_t *)av_malloc( avio_ctx_buffer_size +- + FF_INPUT_BUFFER_PADDING_SIZE ); ++ + AV_INPUT_BUFFER_PADDING_SIZE ); + + memset( avio_ctx_buffer + avio_ctx_buffer_size, + 0, +- FF_INPUT_BUFFER_PADDING_SIZE ); ++ AV_INPUT_BUFFER_PADDING_SIZE ); + + m_imp->m_io_ctx = avio_alloc_context( avio_ctx_buffer, + avio_ctx_buffer_size, 0, z, &fe_zip_read, +@@ -1030,7 +1030,7 @@ + // + m_audio->buffer = (sf::Int16 *)av_malloc( + MAX_AUDIO_FRAME_SIZE +- + FF_INPUT_BUFFER_PADDING_SIZE ++ + AV_INPUT_BUFFER_PADDING_SIZE + + codec_ctx->sample_rate ); + + sf::SoundStream::initialize( + diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template index 4e303bda652..1279f6b1def 100644 --- a/srcpkgs/attract/template +++ b/srcpkgs/attract/template @@ -1,7 +1,7 @@ # Template file for 'attract' pkgname=attract version=2.3.0 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="pkg-config" make_build_args="VERBOSE=1" diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index 26f6945be98..c09bce68f99 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,7 +1,7 @@ # Template file for 'audacious-plugins' pkgname=audacious-plugins version=3.9 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel 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/awoken-icons-dark b/srcpkgs/awoken-icons-dark index a8bfaf4c021..db4cd4d478c 120000 --- a/srcpkgs/awoken-icons-dark +++ b/srcpkgs/awoken-icons-dark @@ -1 +1 @@ -awoken-icons/ \ No newline at end of file +awoken-icons \ No newline at end of file diff --git a/srcpkgs/awoken-icons-white b/srcpkgs/awoken-icons-white index a8bfaf4c021..db4cd4d478c 120000 --- a/srcpkgs/awoken-icons-white +++ b/srcpkgs/awoken-icons-white @@ -1 +1 @@ -awoken-icons/ \ No newline at end of file +awoken-icons \ No newline at end of file diff --git a/srcpkgs/babeltrace/template b/srcpkgs/babeltrace/template index b797629b46e..8480a12eedf 100644 --- a/srcpkgs/babeltrace/template +++ b/srcpkgs/babeltrace/template @@ -1,22 +1,26 @@ # template file for 'babeltrace' pkgname=babeltrace -version=1.5.4 +version=1.5.6 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libelf glib-devel popt-devel" -short_desc="A trace format converter" +short_desc="Open source trace format converter" maintainer="Alexander Egorenkov " -license="LGPL-2.1" +license="MIT, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://diamon.org/babeltrace" -distfiles="http://www.efficios.com/files/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=9643039923a0abc75a25b3d594cee0017423b57f10d2b625e96ed1e8d4891fc1 +distfiles="https://www.efficios.com/files/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=5308bc217828dd571b3259f482a85533554064d4563906ff3c5774ecf915bbb7 if [ "$CROSS_BUILD" ]; then # configure_args+=" ac_cv_lib_elf_elf_version=0.170" configure_args+=" --disable-debug-info" fi +post_install() { + vlicense mit-license.txt +} + babeltrace-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index 25e1a2fa2c0..00ae38dbf93 100644 --- a/srcpkgs/babl/template +++ b/srcpkgs/babl/template @@ -1,6 +1,6 @@ # Template build file for 'babl'. pkgname=babl -version=0.1.50 +version=0.1.52 revision=1 build_style=gnu-configure hostmakedepends="pkg-config vala-devel" @@ -8,8 +8,8 @@ short_desc="Dynamic pixel format translation library" maintainer="Enno Boland " homepage="http://gegl.org/babl/" license="LGPL-3.0-only" -distfiles="https://ftp.gimp.org/pub/babl/${version%.*}/babl-$version.tar.bz2" -checksum=b52c1dc081ff9ae8bc4cb7cdb959c762ea692b9f4431bacf8d17a14dbcc85b2d +distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-$version.tar.bz2" +checksum=40f714a0fc043e16ac05c670f39e4db0d0d923480d21952fb0569686479ef76c babl-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template index c14eade3247..655046a8eb6 100644 --- a/srcpkgs/backblaze-b2/template +++ b/srcpkgs/backblaze-b2/template @@ -1,7 +1,7 @@ # Template file for 'backblaze-b2' pkgname=backblaze-b2 -version=1.1.0 -revision=7 +version=1.2.0 +revision=1 noarch=yes wrksrc="B2_Command_Line_Tool-${version}" build_style=python2-module @@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/Backblaze/B2_Command_Line_Tool" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=fae0dd48a2b6ab38cb142b91d7907a66144659d599bdfbf3c8995788ed29313b +checksum=7f6269257045d571ace6738a3b30bc395bb83f8721b44e06088485f5d2a1ca6a post_install() { # Remove test directory polluting site-packages 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/bat/template b/srcpkgs/bat/template new file mode 100644 index 00000000000..1c97ffbdae3 --- /dev/null +++ b/srcpkgs/bat/template @@ -0,0 +1,26 @@ +# Template file for 'bat' +pkgname=bat +version=0.4.1 +revision=1 +hostmakedepends="cargo cmake" +makedepends="libcurl-devel libssh2-devel oniguruma-devel" +short_desc="A cat(1) clone with syntax highlighting and Git integration" +maintainer="cr6git " +license="Apache-2.0, MIT" +homepage="https://github.com/sharkdp/bat" +distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz" +checksum=3ae66854da59d691b8740672708a2e7f2f240c76e8a00283f59a6e39127e4583 + +nocross="https://travis-ci.org/voidlinux/void-packages/jobs/374173136#L1025 + https://travis-ci.org/voidlinux/void-packages/jobs/374173137#L1021" + +do_build() { + cargo build --release +} + +do_install() { + vbin target/release/bat + vlicense LICENSE-MIT + vdoc README.md +} + 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/bird/template b/srcpkgs/bird/template index 16f059a6fcb..12214f40a18 100644 --- a/srcpkgs/bird/template +++ b/srcpkgs/bird/template @@ -1,18 +1,19 @@ # Template file for 'bird' pkgname=bird -version=1.6.3 +version=1.6.4 revision=1 +wrksrc="bird-v${version}" build_style=gnu-configure +configure_args="--sbindir=/usr/bin" +hostmakedepends="flex autoconf" +makedepends="ncurses-devel readline-devel" short_desc="The BIRD Internet Routing Daemon" maintainer="Philipp Hirsch " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://bird.network.cz" -distfiles="ftp://bird.network.cz/pub/$pkgname/$pkgname-$version.tar.gz" -hostmakedepends="flex" -makedepends="ncurses-devel readline-devel" -configure_args="--sbindir=/usr/bin" +distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/v${version}/bird-v${version}.tar.gz" conf_files="/etc/bird.conf /etc/bird6.conf" -checksum=39c51cf57c3ba8b5978b2a657ffa2f647ec7f3ae643e91cf42ee5cb070cf7e7c +checksum=cb7f3c8bb10e329dbe75251de50133aacd3b8ec25a18940c4a39ec3ac2490f73 pre_configure() { mkdir -p /tmp/bird6 @@ -22,10 +23,12 @@ pre_configure() { do_configure() { # bird + autoreconf ./configure ${configure_args} # bird6 cd bird6 + autoreconf ./configure ${configure_args} --enable-ipv6 } diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index e695dd4a857..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=5 +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/bitlbee-devel b/srcpkgs/bitlbee-devel index 30657018557..177641574db 120000 --- a/srcpkgs/bitlbee-devel +++ b/srcpkgs/bitlbee-devel @@ -1 +1 @@ -bitlbee/ \ No newline at end of file +bitlbee \ No newline at end of file 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/patches/ffmpeg4.patch b/srcpkgs/blender/patches/ffmpeg4.patch new file mode 100644 index 00000000000..6b29e58f273 --- /dev/null +++ b/srcpkgs/blender/patches/ffmpeg4.patch @@ -0,0 +1,116 @@ +source: https://git.archlinux.org/svntogit/community.git/plain/trunk/ffmpeg4.0.patch?h=packages/blender + +diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +index e9eea195208..84aea330313 100644 +--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp ++++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +@@ -264,9 +264,9 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr buffer) : + m_membuffer(buffer), + m_membufferpos(0) + { +- m_membuf = reinterpret_cast(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)); ++ m_membuf = reinterpret_cast(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)); + +- m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0, this, ++ m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this, + read_packet, NULL, seek_packet); + + if(!m_aviocontext) +diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp +index 3f95ac7a4da..2c2f0916406 100644 +--- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp ++++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp +@@ -163,7 +163,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs, + try + { + if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER) +- m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ m_codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + AVCodec* codec = avcodec_find_encoder(m_codecCtx->codec_id); + if(!codec) +@@ -185,11 +185,11 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs, + if(avcodec_open2(m_codecCtx, codec, NULL)) + AUD_THROW(AUD_ERROR_FFMPEG, codec_error); + +- m_output_buffer.resize(FF_MIN_BUFFER_SIZE); ++ m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE); + int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs), AUD_DEVICE_SAMPLE_SIZE(m_specs)); + + if(m_codecCtx->frame_size <= 1) { +- m_input_size = FF_MIN_BUFFER_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels; ++ m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels; + m_input_buffer.resize(m_input_size * samplesize); + } + else +diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +index d7fcd896e11..9e82df17dce 100644 +--- a/source/blender/blenkernel/intern/writeffmpeg.c ++++ b/source/blender/blenkernel/intern/writeffmpeg.c +@@ -619,8 +619,6 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + c->rc_buffer_aggressivity = 1.0; + #endif + +- c->me_method = ME_EPZS; +- + codec = avcodec_find_encoder(c->codec_id); + if (!codec) + return NULL; +@@ -682,14 +680,14 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + ) + { + PRINT("Using global header\n"); +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + /* Determine whether we are encoding interlaced material or not */ + if (rd->mode & R_FIELDS) { + PRINT("Encoding interlaced video\n"); +- c->flags |= CODEC_FLAG_INTERLACED_DCT; +- c->flags |= CODEC_FLAG_INTERLACED_ME; ++ c->flags |= AV_CODEC_FLAG_INTERLACED_DCT; ++ c->flags |= AV_CODEC_FLAG_INTERLACED_ME; + } + + /* xasp & yasp got float lately... */ +@@ -779,7 +777,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int + } + + if (of->oformat->flags & AVFMT_GLOBALHEADER) { +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + set_ffmpeg_properties(rd, c, "audio", &opts); +@@ -798,14 +796,14 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int + st->codec->time_base.den = st->codec->sample_rate; + + #ifndef FFMPEG_HAVE_ENCODE_AUDIO2 +- context->audio_outbuf_size = FF_MIN_BUFFER_SIZE; ++ context->audio_outbuf_size = AV_INPUT_BUFFER_MIN_SIZE; + #endif + + if (c->frame_size == 0) + // used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD)) + // not sure if that is needed anymore, so let's try out if there are any + // complaints regarding some ffmpeg versions users might have +- context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels; ++ context->audio_input_samples = AV_INPUT_BUFFER_MIN_SIZE * 8 / c->bits_per_coded_sample / c->channels; + else { + context->audio_input_samples = c->frame_size; + #ifndef FFMPEG_HAVE_ENCODE_AUDIO2 +diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c +index eaf4dfd84b4..9c2f42feb52 100644 +--- a/source/blender/imbuf/intern/indexer.c ++++ b/source/blender/imbuf/intern/indexer.c +@@ -537,7 +537,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg( + av_opt_set_int(rv->c, "qmax", ffmpeg_quality, 0); + + if (rv->of->flags & AVFMT_GLOBALHEADER) { +- rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ rv->c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) { + diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 998f354fe07..50ced789481 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.79b -revision=2 +revision=4 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/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch new file mode 100644 index 00000000000..1ce9ea97b4b --- /dev/null +++ b/srcpkgs/bomi/patches/ffmpeg4.patch @@ -0,0 +1,195 @@ +source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa + +diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp +index 77b1df41c5..5365525c48 100644 +--- src/bomi/video/ffmpegfilters.hpp ++++ src/bomi/video/ffmpegfilters.hpp +@@ -6,7 +6,7 @@ + extern "C" { + #include