diff --git a/common/shlibs b/common/shlibs index 5e3bc31b708..430ff7c0a71 100644 --- a/common/shlibs +++ b/common/shlibs @@ -120,7 +120,6 @@ libXrender.so.1 libXrender-0.9.4_1 libXrandr.so.2 libXrandr-1.3.0_1 libGLU.so.1 glu-9.0.0_1 libEGL.so.1 libEGL-7.11_1 -libEGL.so.1 nvidia-libs-346.72_2 libGLESv1_CM.so.1 libGLES-1.0_1 libGLESv2.so.2 libGLES-1.0_1 libEGL.so rpi-userland-0.0.0.0.20150907_1 @@ -128,13 +127,8 @@ libGLESv2.so rpi-userland-0.0.0.0.20150907_1 libbrcmEGL.so rpi-userland-20180103_2 libbrcmGLESv2.so rpi-userland-20180103_2 libbrcmOpenVG.so rpi-userland-20180103_2 -libGLESv2.so opera-49.0.2725.39_1 libwayland-egl.so.1 libwayland-egl-9.0.1_4 libGL.so.1 libGL-7.11_1 -libGL.so.1 catalyst-libs-14.2_1 -libGL.so.1 nvidia-libs-346.47_1 -libGL.so.1 nvidia304-libs-304.00_1 -libGL.so.1 nvidia340-libs-340.46_1 libnvidia-ml.so.1 nvidia-libs-346.47_1 ignore libnvidia-ml.so.1 nvidia304-libs-304.00_1 ignore libnvidia-ml.so.1 nvidia340-libs-340.46_1 ignore @@ -386,15 +380,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 @@ -749,8 +743,8 @@ 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 @@ -986,6 +980,7 @@ libev.so.4 libev-4.04_1 libgvnc-1.0.so.0 gtk-vnc-0.4.4_1 libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4_1 libyaml-0.so.2 libyaml-0.1.4_1 +libuchardet.so.0 uchardet-0.0.6_1 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1 libyajl.so.2 yajl-2.0.1_1 libconfuse.so.2 confuse-3.2.1_1 @@ -1220,7 +1215,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 @@ -1285,7 +1280,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 @@ -1361,12 +1355,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 @@ -1557,7 +1545,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 @@ -1690,11 +1677,11 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1 libtcmalloc_debug.so.4 gperftools-2.1.90_1 libprofiler.so.0 gperftools-2.1.90_1 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1 -libHalf.so.12 ilmbase-2.2.0_1 -libIex-2_2.so.12 ilmbase-2.2.0_1 -libIexMath-2_2.so.12 ilmbase-2.2.0_1 -libImath-2_2.so.12 ilmbase-2.2.0_1 -libIlmThread-2_2.so.12 ilmbase-2.2.0_1 +libHalf.so.23 ilmbase-2.2.1_1 +libIex-2_2.so.23 ilmbase-2.2.1_1 +libIexMath-2_2.so.23 ilmbase-2.2.1_1 +libImath-2_2.so.23 ilmbase-2.2.1_1 +libIlmThread-2_2.so.23 ilmbase-2.2.1_1 libIlmImf-2_2.so.22 libopenexr-2.2.0_1 libIlmImfUtil-2_2.so.22 libopenexr-2.2.0_1 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1 @@ -2025,11 +2012,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 @@ -2087,8 +2074,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 @@ -2402,7 +2389,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 @@ -2784,12 +2771,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 @@ -2923,7 +2904,6 @@ 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 @@ -3006,9 +2986,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 @@ -3075,10 +3055,6 @@ libtecla_r.so.1 libtecla-1.6.3_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 @@ -3164,8 +3140,8 @@ 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.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 @@ -3297,7 +3273,6 @@ 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 @@ -3384,12 +3359,10 @@ libkid3-core.so.3.6.0 kid3-3.6.0_1 libkid3-gui.so.3.6.0 kid3-3.6.0_1 libcfitsio.so.3 cfitsio-3.450_1 libapparmor.so.1 libapparmor-2.12.0_1 -libcue.so.2 libcue-2.2.0_1 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 -libgsettings-qt.so.1 gsettings-qt-0.1.20160329_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 @@ -3397,10 +3370,11 @@ 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 -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/set_mirror.sh b/common/travis/set_mirror.sh index bb03b006ad4..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=vm1.a-mci-us.m.voidlinux.org +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/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index e29399cd4a5..5819e362d21 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,6 +1,6 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.93.1.22 +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=f2b7323bc31c494e338003dfb6c067504acc55d81df91b257330cb13e70e708e +checksum=f48162f6880322251410c79757d2eae751f6bc75dc4a4852ba961f09e93841b1 pre_configure() { NOCONFIGURE=1 ./autogen.sh 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/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 dd31539111a..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=3 +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/template b/srcpkgs/MEGAsdk/template index 2b96ed54fd8..af306b293ea 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,6 +1,6 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk -version=3.3.8 +version=3.3.9 revision=1 wrksrc=sdk-${version} build_style=gnu-configure @@ -13,10 +13,10 @@ 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=a64bf54b335ebbfc0138f4d81f3106bc4f02e9c1c8f840cd90515a7b34c01cd4 +checksum=522b63bf2f2d1eeff0644ef106fff94fcd4f6a844e01539cc6cfb30d16463dba replaces="libmega>=0" build_options="libuv mediainfo" diff --git a/srcpkgs/MEGAsync/template b/srcpkgs/MEGAsync/template index ed50e9e40d5..33dd86ef6d0 100644 --- a/srcpkgs/MEGAsync/template +++ b/srcpkgs/MEGAsync/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsync' pkgname=MEGAsync version=3.6.6.0 -revision=1 +revision=2 wrksrc="${pkgname}-${version}_Linux" build_wrksrc="src" build_style=qmake 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/Quaternion/template b/srcpkgs/Quaternion/template index d72faea08d1..9639cd581d7 100644 --- a/srcpkgs/Quaternion/template +++ b/srcpkgs/Quaternion/template @@ -1,8 +1,8 @@ # Template file for 'Quaternion' pkgname=Quaternion -version=0.0.9 +version=0.0.9.2 revision=1 -_libqmatrix_version=0.2.1 +_libqmatrix_version=0.3.0.2 create_wrksrc=yes build_wrksrc="Quaternion-${version}" build_style=cmake @@ -16,8 +16,9 @@ homepage="https://github.com/QMatrixClient/Quaternion" distfiles=" https://github.com/QMatrixClient/Quaternion/archive/v${version}.tar.gz https://github.com/QMatrixClient/libqmatrixclient/archive/v${_libqmatrix_version}.tar.gz" -checksum="0f471051abf31acdd70a80de3b731775d4d8ad4fbe45f4d72371fc7229321b16 - 615f52f29b0958a633587846bd9f8ff711cc58f7e0fbb98ea485e0746d7f01a3" +checksum=" + e859b232802ca0ce68a3fd97bd44bf4252718324c95d1d740bc20a1d02bf5568 + c363af0c9d1e357000ed3f50af70722a35d6511c6bd2b9faec287da101a7877a" post_extract() { mv libqmatrixclient-${_libqmatrix_version}/* ${build_wrksrc}/lib 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/XyGrib-maps/template b/srcpkgs/XyGrib-maps/template new file mode 100644 index 00000000000..76437050938 --- /dev/null +++ b/srcpkgs/XyGrib-maps/template @@ -0,0 +1,20 @@ +# Template file for 'XyGrib-maps' +pkgname=XyGrib-maps +version=2.4 +revision=1 +build_style=fetch +depends="XyGrib" +short_desc="XyGrib - high resolution maps" +maintainer="Andrew Benson " +license="GPL-3.0-or-later" +homepage="https://opengribs.org" +distfiles="https://opengribs.org/en/downloads/send/3-maps/3-xygrib_maps${version/./-}" +checksum=3cd6bf3de709ff4afb193a7bb5455f28d6ab540687a97f2d978bd0a21592750e +noarch=yes + +do_install() { + vmkdir usr/libexec/XyGrib + tar zxf "3-xygrib_maps${version/./-}" \ + -C ${DESTDIR}/usr/libexec/XyGrib \ + --exclude="README.gshhs*" +} diff --git a/srcpkgs/XyGrib/files/XyGrib b/srcpkgs/XyGrib/files/XyGrib new file mode 100644 index 00000000000..278aa78dbc3 --- /dev/null +++ b/srcpkgs/XyGrib/files/XyGrib @@ -0,0 +1,5 @@ +#!/bin/bash + +cd /usr/libexec/XyGrib +./bin/XyGrib + diff --git a/srcpkgs/XyGrib/files/XyGrib.desktop b/srcpkgs/XyGrib/files/XyGrib.desktop new file mode 100644 index 00000000000..d7a288f26b0 --- /dev/null +++ b/srcpkgs/XyGrib/files/XyGrib.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=3.6 +Encoding=UTF-8 +Type=Application +Name=XyGrib +Comment=GRIB File Viewer +Comment[fr]=Visualisation de données météo au format GRIB +Terminal=false +Categories=XyGrib;Meteo;Utility +Icon=XyGrib.png +Exec=/usr/bin/XyGrib diff --git a/srcpkgs/XyGrib/files/XyGrib.png b/srcpkgs/XyGrib/files/XyGrib.png new file mode 100644 index 00000000000..472e6080f8a Binary files /dev/null and b/srcpkgs/XyGrib/files/XyGrib.png differ diff --git a/srcpkgs/XyGrib/patches/dont-build-own-qwt.patch b/srcpkgs/XyGrib/patches/dont-build-own-qwt.patch new file mode 100644 index 00000000000..dc27983cb40 --- /dev/null +++ b/srcpkgs/XyGrib/patches/dont-build-own-qwt.patch @@ -0,0 +1,90 @@ +https://github.com/opengribs/XyGrib/commit/a687a2b9ddbd988661ba000b9a2685e7493bc92c.patch + +From a687a2b9ddbd988661ba000b9a2685e7493bc92c Mon Sep 17 00:00:00 2001 +From: Menno +Date: Sun, 10 Jun 2018 00:31:06 +0200 +Subject: [PATCH] remove references to qwt from Makefiles + +--- + Makefile | 12 +----------- + src/xyGrib.pro | 4 ++-- + 2 files changed, 3 insertions(+), 13 deletions(-) + +diff --git a/Makefile b/Makefile +index f7b81e1..46c1e0c 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,19 +2,16 @@ QMAKE=/usr/bin/qmake + + INSTALLDIR=$(HOME)/XyGrib + MACQTBIN=/usr/local/Qt-5.3.2/bin/ +-QWTDIR=src/qwt-6.1.3 + + all: XyGrib + +-SRC= src/*.h src/*.cpp src/*/*.h src/*/*.cpp \ +- src/qwt*/src/*.cpp src/qwt*/src/*.h ++SRC= src/*.h src/*.cpp src/*/*.h src/*/*.cpp + + mac: $(SRC) + rm -f ./XyGrib + rm -fr ./XyGrib.app + rm -f src/Makefile + cd src/g2clib; make -f makefile.osx +- cd $(QWTDIR)/src; $(MACQTBIN)/qmake; make -j6 + cd src; $(MACQTBIN)/qmake; make -j6 + + macclean: +@@ -22,8 +19,6 @@ macclean: + rm -fr XyGrib.app + rm -f src/XyGrib + rm -f src/release/XyGrib.exe +- rm -f $(QWTDIR)/lib/* +- cd $(QWTDIR)/src; $(MACQTBIN)/qmake; make clean + cd src; $(MACQTBIN)/qmake; make clean + + clean: +@@ -34,15 +29,12 @@ clean: + cd src; $(QMAKE); make clean + + veryclean: clean +- rm -f $(QWTDIR)/lib/* +- cd $(QWTDIR)/src; $(QMAKE); make clean + rm -f src/g2clib/libg2c.a + rm -f src/g2clib/*.o + + XyGrib: $(SRC) + @ echo + rm -f ./XyGrib +- cd $(QWTDIR)/src; $(QMAKE); make -j6 + cd src/g2clib; make + cd src; $(QMAKE); make -j6 + @ echo "-----------------------------------" +@@ -64,5 +56,3 @@ install: XyGrib + echo 'bin/XyGrib $$*' >> ./XyGrib + chmod 755 ./XyGrib + cp -af XyGrib $(INSTALLDIR) +- +- +diff --git a/src/xyGrib.pro b/src/xyGrib.pro +index 2523af8..30879ed 100644 +--- a/src/xyGrib.pro ++++ b/src/xyGrib.pro +@@ -8,7 +8,7 @@ TEMPLATE = app + TARGET = XyGrib + + DEPENDPATH += . util map GUI +-INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib ++INCLUDEPATH += . util map GUI g2clib + + # ---------------------------------------------------- + # platform specific +@@ -36,7 +36,7 @@ else { + } + } + +-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt ++LIBS += -lbz2 -lz -lproj -lnova + LIBS += -Lg2clib -lg2c -lpng -ljasper # respect order! + + # ---------------------------------------------------- diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template new file mode 100644 index 00000000000..d76d3d8febb --- /dev/null +++ b/srcpkgs/XyGrib/template @@ -0,0 +1,33 @@ +# Template file for 'XyGrib' +pkgname=XyGrib +version=1.0.1 +revision=1 +wrksrc="${pkgname}-${version}-src" +patch_args="-Np1" +build_style=gnu-makefile +hostmakedepends="qt5-devel" +makedepends="jasper-devel libnova-devel nettle-devel proj-devel qt5-devel qwt-devel" +short_desc="Weather data visulization" +maintainer="Andrew Benson " +license="GPL-3.0-or-later" +homepage="https://opengribs.org/" +distfiles="https://github.com/opengribs/XyGrib/releases/download/v${version}/XyGrib-${version}-src.tgz" +checksum=2309505161577a6bf4787b8b9e7ead4ca9dfdb05b3e655b4583d69bdb9f2be9e + +if [ -n "$CROSS_BUILD" ]; then + make_build_args="LINK=${XBPS_CROSS_TRIPLET}-c++" +fi + +pre_configure() { + sed -i "s|\$(HOME)|$DESTDIR/usr/libexec|" Makefile +} + +post_install() { + vbin ${FILESDIR}/XyGrib + + vmkdir usr/share/applications + vinstall ${FILESDIR}/XyGrib.desktop 0644 usr/share/applications + + vmkdir usr/share/icons + vinstall ${FILESDIR}/XyGrib.png 0644 usr/share/icons +} 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/accountsservice/template b/srcpkgs/accountsservice/template index 6cd64838f6d..bd1f4f14b81 100644 --- a/srcpkgs/accountsservice/template +++ b/srcpkgs/accountsservice/template @@ -1,6 +1,6 @@ # Template file for 'accountsservice' pkgname=accountsservice -version=0.6.49 +version=0.6.50 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-systemd @@ -11,10 +11,10 @@ hostmakedepends="glib-devel intltool pkg-config makedepends="polkit-devel" short_desc="D-Bus interfaces for querying and manipulating user account information" maintainer="Juan RP " -homepage="http://cgit.freedesktop.org/accountsservice/" license="GPL-3.0-or-later" -distfiles="${FREEDESKTOP_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=251e5dd56db839e9470d97692ef6e5e07dc659196f27b65b228a3e14f46e560c +homepage="http://cgit.freedesktop.org/accountsservice/" +distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" +checksum=035928f5dea46f2220657e0bd669bc7fac45165b700c0a81b2b66ff2c3dbc74a make_dirs=" /var/lib/AccountsService/users 755 root root /var/lib/AccountsService/icons 755 root root" 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 ebf53aeaa55..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=20180531 +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=8f6cdcaa4039c2b3db141117ec8223f0e1297684b8ab47839e211bddad027665 +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/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/amp/template b/srcpkgs/amp/template index 12a5ee63009..8c6face1bc2 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.1 +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=c6c3df2183145db45242c03b05c1bac972b0be15dd86aa2db54a95baa34be2a7 nocross=yes do_build() { 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 2c095f04880..da03419afcf 100644 --- a/srcpkgs/annie/template +++ b/srcpkgs/annie/template @@ -1,6 +1,6 @@ # Template file for 'annie' pkgname=annie -version=0.7.4 +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=0b2125a21e7ffa51ebae5c4c6e1b28e0d20a5aeba588ad3d0ab6875c72c348a1 +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 6bd5d4234da..5cb31710547 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=2.5.5 +version=2.6.1 revision=1 noarch=yes build_style=python2-module @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz" -checksum=d7e5aae60c0e76c824bf8a410fe247b5c4afcfaee272f6283b4f996d237e365a +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/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 17bc96396b9..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, diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 6d625d2d222..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=2 +revision=4 _short_ver=${version%\.*} wrksrc="${pkgname}-v${_short_ver}" configure_args="--prefix=/usr --with-perl --with-python" diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template index 0a894d5132c..113e86ce094 100644 --- a/srcpkgs/appstream-glib/template +++ b/srcpkgs/appstream-glib/template @@ -1,7 +1,7 @@ # Template file for 'appstream-glib' pkgname=appstream-glib -version=0.7.9 -revision=2 +version=0.7.10 +revision=1 build_style=meson configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false -Dintrospection=$(vopt_if gir true false)" @@ -12,8 +12,9 @@ short_desc="Install and update applications" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://people.freedesktop.org/~hughsient/appstream-glib/" +changelog="https://raw.githubusercontent.com/hughsie/appstream-glib/master/NEWS" distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz" -checksum=278331da5049067f076330962400e680234b2e0ecbe6fa5d4668040ae0a88c47 +checksum=43453b8cde676b203830e70981e5aff91c7809233eeca96edaf8b73d2d047a21 build_options="gir" if [ -z "$CROSS_BUILD" ]; then 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/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/template b/srcpkgs/attract/template index 4e303bda652..b59ed53fe55 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 +version=2.4.0 +revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" make_build_args="VERBOSE=1" @@ -13,7 +13,7 @@ maintainer="Pedro Narciso García Revington " license="GPL-3" homepage="http://attractmode.org/" distfiles="https://github.com/mickelson/attract/archive/v${version}.tar.gz" -checksum=561c5bcd9a10d216c2f43de7eb9224fa000d5ac8690e2d41cb4a8cec86b72583 +checksum=ce75bfc9ca928ad8fe6b4bd7b0ae425eba3806dca06c9cbbe5ee0ce6ce3ea788 CFLAGS="-std=gnu++11" CFLAGS+=" -I extlibs/audio/include" 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/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/bash/files/bash44-020 b/srcpkgs/bash/files/bash44-020 new file mode 100644 index 00000000000..1c42643b63d --- /dev/null +++ b/srcpkgs/bash/files/bash44-020 @@ -0,0 +1,177 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-020 + +Bug-Reported-by: Graham Northup +Bug-Reference-ID: <537530c3-61f0-349b-9de6-fa4e2487f428@clarkson.edu> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00025.html + +Bug-Description: + +In circumstances involving long-running scripts that create and reap many +processes, it is possible for the hash table bash uses to store exit +statuses from asynchronous processes to develop loops. This patch fixes +the loop causes and adds code to detect any future loops. + +Patch (apply with `patch -p0'): + +*** ../bash-4.4-patched/jobs.c 2016-11-11 13:42:55.000000000 -0500 +--- jobs.c 2017-02-22 15:16:28.000000000 -0500 +*************** +*** 813,818 **** + struct pidstat *ps; + +! bucket = pshash_getbucket (pid); +! psi = bgp_getindex (); + ps = &bgpids.storage[psi]; + +--- 796,815 ---- + struct pidstat *ps; + +! /* bucket == existing chain of pids hashing to same value +! psi = where were going to put this pid/status */ +! +! bucket = pshash_getbucket (pid); /* index into pidstat_table */ +! psi = bgp_getindex (); /* bgpids.head, index into storage */ +! +! /* XXX - what if psi == *bucket? */ +! if (psi == *bucket) +! { +! #ifdef DEBUG +! internal_warning ("hashed pid %d (pid %d) collides with bgpids.head, skipping", psi, pid); +! #endif +! bgpids.storage[psi].pid = NO_PID; /* make sure */ +! psi = bgp_getindex (); /* skip to next one */ +! } +! + ps = &bgpids.storage[psi]; + +*************** +*** 842,845 **** +--- 839,843 ---- + { + struct pidstat *ps; ++ ps_index_t *bucket; + + ps = &bgpids.storage[psi]; +*************** +*** 847,856 **** + return; + +! if (ps->bucket_next != NO_PID) + bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev; +! if (ps->bucket_prev != NO_PID) + bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next; + else +! *(pshash_getbucket (ps->pid)) = ps->bucket_next; + } + +--- 845,861 ---- + return; + +! if (ps->bucket_next != NO_PIDSTAT) + bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev; +! if (ps->bucket_prev != NO_PIDSTAT) + bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next; + else +! { +! bucket = pshash_getbucket (ps->pid); +! *bucket = ps->bucket_next; /* deleting chain head in hash table */ +! } +! +! /* clear out this cell, just in case */ +! ps->pid = NO_PID; +! ps->bucket_next = ps->bucket_prev = NO_PIDSTAT; + } + +*************** +*** 859,863 **** + pid_t pid; + { +! ps_index_t psi; + + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) +--- 864,868 ---- + pid_t pid; + { +! ps_index_t psi, orig_psi; + + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) +*************** +*** 865,871 **** + + /* Search chain using hash to find bucket in pidstat_table */ +! for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) +! if (bgpids.storage[psi].pid == pid) +! break; + + if (psi == NO_PIDSTAT) +--- 870,883 ---- + + /* Search chain using hash to find bucket in pidstat_table */ +! for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) +! { +! if (bgpids.storage[psi].pid == pid) +! break; +! if (orig_psi == bgpids.storage[psi].bucket_next) /* catch reported bug */ +! { +! internal_warning ("bgp_delete: LOOP: psi (%d) == storage[psi].bucket_next", psi); +! return 0; +! } +! } + + if (psi == NO_PIDSTAT) +*************** +*** 905,909 **** + pid_t pid; + { +! ps_index_t psi; + + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) +--- 917,921 ---- + pid_t pid; + { +! ps_index_t psi, orig_psi; + + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) +*************** +*** 911,917 **** + + /* Search chain using hash to find bucket in pidstat_table */ +! for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) +! if (bgpids.storage[psi].pid == pid) +! return (bgpids.storage[psi].status); + + return -1; +--- 923,936 ---- + + /* Search chain using hash to find bucket in pidstat_table */ +! for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) +! { +! if (bgpids.storage[psi].pid == pid) +! return (bgpids.storage[psi].status); +! if (orig_psi == bgpids.storage[psi].bucket_next) /* catch reported bug */ +! { +! internal_warning ("bgp_search: LOOP: psi (%d) == storage[psi].bucket_next", psi); +! return -1; +! } +! } + + return -1; +*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/srcpkgs/bash/files/bash44-021 b/srcpkgs/bash/files/bash44-021 new file mode 100644 index 00000000000..37da331d56b --- /dev/null +++ b/srcpkgs/bash/files/bash44-021 @@ -0,0 +1,57 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-021 + +Bug-Reported-by: werner@suse.de +Bug-Reference-ID: <201803281402.w2SE2VOa000476@noether.suse.de> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2018-03/msg00196.html + +Bug-Description: + +A SIGINT received inside a SIGINT trap handler can possibly cause the +shell to loop. + +Patch (apply with `patch -p0'): + +*** ../bash-20180329/jobs.c 2018-02-11 18:07:22.000000000 -0500 +--- jobs.c 2018-04-02 14:24:21.000000000 -0400 +*************** +*** 2690,2694 **** + if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB)) + { +! old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); + waiting_for_child = 0; + if (old_sigint_handler == SIG_IGN) +--- 2690,2704 ---- + if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB)) + { +! SigHandler *temp_sigint_handler; +! +! temp_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); +! if (temp_sigint_handler == wait_sigint_handler) +! { +! #if defined (DEBUG) +! internal_warning ("wait_for: recursively setting old_sigint_handler to wait_sigint_handler: running_trap = %d", running_trap); +! #endif +! } +! else +! old_sigint_handler = temp_sigint_handler; + waiting_for_child = 0; + if (old_sigint_handler == SIG_IGN) +*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/srcpkgs/bash/files/bash44-022 b/srcpkgs/bash/files/bash44-022 new file mode 100644 index 00000000000..f692a2c46f1 --- /dev/null +++ b/srcpkgs/bash/files/bash44-022 @@ -0,0 +1,61 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-022 + +Bug-Reported-by: Nuzhna Pomoshch +Bug-Reference-ID: <1317167476.1492079.1495999776464@mail.yahoo.com> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2017-05/msg00005.html + +Bug-Description: + +There are cases where a failing readline command (e.g., delete-char at the end +of a line) can cause a multi-character key sequence to `back up' and attempt +to re-read some of the characters in the sequence. + +Patch (apply with `patch -p0'): + +*** ../bash-4.4-patched/lib/readline/readline.c 2016-04-20 15:53:52.000000000 -0400 +--- lib/readline/readline.c 2018-05-26 17:19:00.000000000 -0400 +*************** +*** 1058,1062 **** + r = _rl_dispatch (ANYOTHERKEY, m); + } +! else if (r && map[ANYOTHERKEY].function) + { + /* We didn't match (r is probably -1), so return something to +--- 1056,1060 ---- + r = _rl_dispatch (ANYOTHERKEY, m); + } +! else if (r < 0 && map[ANYOTHERKEY].function) + { + /* We didn't match (r is probably -1), so return something to +*************** +*** 1070,1074 **** + return -2; + } +! else if (r && got_subseq) + { + /* OK, back up the chain. */ +--- 1068,1072 ---- + return -2; + } +! else if (r < 0 && got_subseq) /* XXX */ + { + /* OK, back up the chain. */ +*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/srcpkgs/bash/files/bash44-023 b/srcpkgs/bash/files/bash44-023 new file mode 100644 index 00000000000..dd8d75d9bc7 --- /dev/null +++ b/srcpkgs/bash/files/bash44-023 @@ -0,0 +1,52 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-023 + +Bug-Reported-by: Martijn Dekker +Bug-Reference-ID: <5326d6b9-2625-1d32-3e6e-ad1d15462c09@inlv.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00041.html + +Bug-Description: + +When sourcing a file from an interactive shell, setting the SIGINT handler +to the default and typing ^C will cause the shell to exit. + +Patch (apply with `patch -p0'): + +*** ../bash-4.4-patched/builtins/trap.def 2016-01-25 13:32:38.000000000 -0500 +--- builtins/trap.def 2016-11-06 12:04:35.000000000 -0500 +*************** +*** 99,102 **** +--- 99,103 ---- + + extern int posixly_correct, subshell_environment; ++ extern int sourcelevel, running_trap; + + int +*************** +*** 213,216 **** +--- 214,220 ---- + if (interactive) + set_signal_handler (SIGINT, sigint_sighandler); ++ /* special cases for interactive == 0 */ ++ else if (interactive_shell && (sourcelevel||running_trap)) ++ set_signal_handler (SIGINT, sigint_sighandler); + else + set_signal_handler (SIGINT, termsig_sighandler); +*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template index c46913ec96a..bc5789345cc 100644 --- a/srcpkgs/bash/template +++ b/srcpkgs/bash/template @@ -1,22 +1,22 @@ -# Template build file for 'bash'. +# Template file for 'bash' pkgname=bash _bash_distver=4.4 -_bash_patchlevel=019 -version=${_bash_distver}.${_bash_patchlevel} -revision=2 -wrksrc=${pkgname}-${_bash_distver} +_bash_patchlevel=023 +version="${_bash_distver}.${_bash_patchlevel}" +revision=1 +wrksrc="${pkgname}-${_bash_distver}" build_style=gnu-configure configure_args="--without-bash-malloc --with-curses --without-installed-readline" make_build_args="TERMCAP_LIB=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a" hostmakedepends="bison" makedepends="ncurses-devel" conflicts="chroot-bash>=0" -register_shell="/bin/bash" +register_shell=/bin/bash short_desc="The GNU Bourne Again Shell" maintainer="Juan RP " homepage="http://www.gnu.org/software/bash/bash.html" -license="GPL-3" -distfiles="${GNU_SITE}/$pkgname/$pkgname-${_bash_distver}.tar.gz" +license="GPL-3.0-or-later" +distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_bash_distver}.tar.gz" CFLAGS="-DSYS_BASHRC='\"/etc/bash/bashrc\"'" make_dirs="/etc/bash/bashrc.d 755 root root" checksum=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb @@ -34,9 +34,11 @@ pre_configure() { msg_normal " Applying patch bash${ver}-$p.\n" done } + do_check() { make tests } + post_install() { rm -r ${DESTDIR}/usr/share/doc ln -s bash ${DESTDIR}/usr/bin/rbash 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/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/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 9b47f002673..a4a34fdd724 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.16.1 -revision=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" 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 c5e0f65e6cc..06bec29e92e 100644 --- a/srcpkgs/blackbox/template +++ b/srcpkgs/blackbox/template @@ -1,6 +1,6 @@ # Template file for 'blackbox' pkgname=blackbox -version=1.20180615 +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=ff79e896cb4d5a31472899c9ed48ac3b234fc87486a90978f64e03be2c63ac06 +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 8566a01fbf9..50ced789481 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.79b -revision=1 +revision=4 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template new file mode 100644 index 00000000000..9bb936e22a4 --- /dev/null +++ b/srcpkgs/blush/template @@ -0,0 +1,17 @@ +# Template file for 'blush' +pkgname=blush +version=0.5.3 +revision=1 +build_style=go +go_import_path=github.com/arsham/blush +hostmakedepends="git" +short_desc="Grep with colours" +maintainer="travankor " +license="MIT" +homepage="https://github.com/arsham/blush" +distfiles="https://github.com/arsham/blush/archive/v${version}.tar.gz" +checksum=1d96e080e7db9d57bb3aee1a7fae3df2aaa3a3f85cf41077e8235c78840ae740 + +post_install() { + vlicense LICENSE +} 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