diff --git a/common/shlibs b/common/shlibs index 8a73d334871..7df69a38714 100644 --- a/common/shlibs +++ b/common/shlibs @@ -631,42 +631,42 @@ libnm-glib.so.4 libnm-0.9.1.90_1 libnm-glib-vpn.so.1 libnm-0.9.1.90_1 libnm.so.0 libnm-1.0.0_1 libKF5ItemModels.so.5 kitemmodels-5.26.0_1 -libboost_context.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_coroutine.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_container.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_prg_exec_monitor.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_signals.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_timer.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_random.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_filesystem.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_unit_test_framework.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_math_c99f.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_math_tr1f.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_regex.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_serialization.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_chrono.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_wserialization.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_graph.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_log.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_locale.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_math_tr1l.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_program_options.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_iostreams.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_system.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_thread.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_log_setup.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_date_time.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_math_c99.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_wave.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_math_tr1.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_atomic.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_math_c99l.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_type_erasure.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_fiber.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_stacktrace_noop.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_stacktrace_addr2line.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_stacktrace_basic.so.1.65.1 boost-1.65.1_1<1.66_1 -libboost_python.so.1.65.1 boost-python-1.65.1<1.66_1 +libboost_context.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_coroutine.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_container.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_prg_exec_monitor.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_signals.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_timer.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_random.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_filesystem.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_unit_test_framework.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_math_c99f.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_math_tr1f.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_regex.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_serialization.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_chrono.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_wserialization.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_graph.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_log.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_locale.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_math_tr1l.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_program_options.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_iostreams.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_system.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_thread.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_log_setup.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_date_time.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_math_c99.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_wave.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_math_tr1.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_atomic.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_math_c99l.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_type_erasure.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_fiber.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_stacktrace_noop.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_stacktrace_addr2line.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_stacktrace_basic.so.1.68.0 boost-1.68.0_1<1.69.0 +libboost_python27.so.1.68.0 boost-python-1.68.0_1<1.69.0 libexempi.so.3 exempi-2.1.1_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2.so.2 libsgutils-1.42_1 diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index acdc843a4ef..651fc60ac9b 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.23 -revision=4 +revision=5 wrksrc="${pkgname}-${version}-alpha" hostmakedepends="pkg-config perl cmake python" makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch new file mode 100644 index 00000000000..d33a7238bb2 --- /dev/null +++ b/srcpkgs/Aegisub/patches/boost-1.68.patch @@ -0,0 +1,34 @@ +From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 9 Jul 2018 20:15:29 +0000 +Subject: [PATCH] Keep using std::distance after Boost 1.68 + +src/search_replace_engine.cpp:256:14: error: call to + 'distance' is ambiguous + count += distance( + ^~~~~~~~ +/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = + boost::u32regex_iterator >] +distance(_InputIter __first, _InputIter __last) +^ +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = + boost::u32regex_iterator >] + distance(SinglePassIterator first, SinglePassIterator last) + ^ +--- + src/search_replace_engine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp +index 594c21e5e..14c71680d 100644 +--- src/search_replace_engine.cpp ++++ src/search_replace_engine.cpp +@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() { + if (MatchState ms = matches(&diag, 0)) { + auto& diag_field = diag.*get_dialogue_field(settings.field); + std::string const& text = diag_field.get(); +- count += distance( ++ count += std::distance( + boost::u32regex_iterator(begin(text), end(text), *ms.re), + boost::u32regex_iterator()); + diag_field = u32regex_replace(text, *ms.re, settings.replace_with); diff --git a/srcpkgs/EmulationStation-rpi/patches/musl.patch b/srcpkgs/EmulationStation-rpi/patches/musl.patch new file mode 100644 index 00000000000..14ee228a040 --- /dev/null +++ b/srcpkgs/EmulationStation-rpi/patches/musl.patch @@ -0,0 +1,22 @@ +--- es-core/src/Util.cpp 2016-03-13 20:31:00.000000000 +0100 ++++ - 2018-10-05 11:16:58.054469211 +0200 +@@ -32,7 +32,7 @@ + } + + +-#if _MSC_VER < 1800 ++#if 0 + float round(float num) + { + return (float)((int)(num + 0.5f)); +--- es-core/src/Util.h 2016-03-13 20:31:00.000000000 +0100 ++++ - 2018-10-05 11:17:16.991980845 +0200 +@@ -15,7 +15,7 @@ + Eigen::Vector3f roundVector(const Eigen::Vector3f& vec); + Eigen::Vector2f roundVector(const Eigen::Vector2f& vec); + +-#if _MSC_VER < 1800 ++#if 0 + float round(float num); + #endif /* _MSC_VER */ + diff --git a/srcpkgs/EmulationStation-rpi/template b/srcpkgs/EmulationStation-rpi/template index a52bd6efab3..7e1f532c82b 100644 --- a/srcpkgs/EmulationStation-rpi/template +++ b/srcpkgs/EmulationStation-rpi/template @@ -1,7 +1,7 @@ # Template file for 'EmulationStation-rpi' pkgname=EmulationStation-rpi version=2.0.1a -revision=1 +revision=2 _githash=93f6e11c95f9e7a0c00d3a70c744b22d9a931127 build_style=cmake only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" diff --git a/srcpkgs/EmulationStation/template b/srcpkgs/EmulationStation/template index 28c49c53a07..d6b5b6b9f42 100644 --- a/srcpkgs/EmulationStation/template +++ b/srcpkgs/EmulationStation/template @@ -1,7 +1,7 @@ # Template file for 'EmulationStation' pkgname=EmulationStation version=2.7.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config git" makedepends="libcurl-devel MesaLib-devel freetype-devel freeimage-devel diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index 6b15b3ffe17..52c4bc58ca7 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,7 +1,7 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader version=3.3 -revision=2 +revision=3 wrksrc="lgogdownloader-${version}" build_style=cmake hostmakedepends="pkg-config" diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template index 0654da035c1..d6de893f362 100644 --- a/srcpkgs/Lucene++/template +++ b/srcpkgs/Lucene++/template @@ -1,7 +1,7 @@ # Template file for 'Lucene++' pkgname=Lucene++ version=3.0.7 -revision=7 +revision=8 wrksrc=LucenePlusPlus-rel_$version build_style=cmake configure_args="-Wno-dev" diff --git a/srcpkgs/OpenXcom/template b/srcpkgs/OpenXcom/template index bfcf315b706..198f65bc3a5 100644 --- a/srcpkgs/OpenXcom/template +++ b/srcpkgs/OpenXcom/template @@ -1,7 +1,7 @@ # Template file for 'OpenXcom' pkgname=OpenXcom version=1.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-silent-rules --disable-werror" hostmakedepends="automake pkg-config xmlto" diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template index fd29d9d172b..d172da2e315 100644 --- a/srcpkgs/SMC/template +++ b/srcpkgs/SMC/template @@ -1,7 +1,7 @@ # Template file for 'SMC'. pkgname=SMC version=1.9 -revision=5 +revision=6 wrksrc=${pkgname,,}-${version} build_style=gnu-configure hostmakedepends="automake libtool gettext-devel pkg-config unzip" diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template index 8f92ff778e3..b98fdc981f1 100644 --- a/srcpkgs/TSC/template +++ b/srcpkgs/TSC/template @@ -1,7 +1,7 @@ # Template file for 'TSC' pkgname=TSC version=2.0.0 -revision=6 +revision=7 build_style=cmake build_wrksrc=tsc configure_args="-DFIXED_DATA_DIR=/usr/share/TSC -DBINARY_DIR=/usr/bin" diff --git a/srcpkgs/adriconf/template b/srcpkgs/adriconf/template index 51f79c452b0..e558c69a4ee 100644 --- a/srcpkgs/adriconf/template +++ b/srcpkgs/adriconf/template @@ -1,7 +1,7 @@ # Template file for 'adriconf' pkgname=adriconf version=1.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config glib-devel" makedepends="MesaLib-devel gtkmm-devel boost-devel libxml++-devel pciutils-devel gtest-devel" diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index 6d77c8f234b..863208f82bd 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,7 +1,7 @@ # Template file for 'astroid' pkgname=astroid version=0.14 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config scdoc" makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 071fdb24849..3dad6aa36e2 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.16.3 -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/blender/template b/srcpkgs/blender/template index b5ab8110587..c95722e1fcd 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.79b -revision=7 +revision=8 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 17fc39f7c2e..024635849cb 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,7 +1,7 @@ # Template file for 'boost' pkgname=boost -version=1.65.1 -revision=4 +version=1.68.0 +revision=1 wrksrc="${pkgname}_${version//\./_}" hostmakedepends="bzip2-devel icu-devel python-devel" makedepends="zlib-devel bzip2-devel icu-devel python-devel" @@ -10,9 +10,9 @@ maintainer="Juan RP " homepage="http://www.boost.org/" license="Boost Software License 1.0" distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2" -checksum=9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81 +checksum=7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7 -CXXFLAGS="-std=c++11" +CXXFLAGS="-std=c++14" case "$XBPS_TARGET_MACHINE" in i686*) _arch=x86; _toolset="gcc-i386"; _abi=sysv ;; @@ -80,7 +80,7 @@ boost-python_package() { depends="boost-${version}_${revision} python" short_desc+=" - Python bindings" pkg_install() { - vmove usr/lib/libboost_python* + vmove "usr/lib/libboost_python*" } } boost-build_package() { @@ -98,7 +98,7 @@ boost-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template index a6e9b2a3260..7909eb2e226 100644 --- a/srcpkgs/btfs/template +++ b/srcpkgs/btfs/template @@ -1,7 +1,7 @@ # Template file for 'btfs' pkgname=btfs version=2.18 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="boost-devel libcurl-devel libtorrent-rasterbar-devel fuse-devel" diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index ba68632420c..c10522bf5f4 100644 --- a/srcpkgs/cclive/template +++ b/srcpkgs/cclive/template @@ -1,7 +1,7 @@ # Template file for 'cclive' pkgname=cclive version=0.7.16 -revision=10 +revision=11 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel" diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template index 9a0062d01fe..60561b6b48f 100644 --- a/srcpkgs/cegui/template +++ b/srcpkgs/cegui/template @@ -1,7 +1,7 @@ # Template file for 'cegui' pkgname=cegui version=0.8.7 -revision=8 +revision=9 build_style=cmake hostmakedepends="graphviz doxygen dejavu-fonts-ttf gd glm perl pkg-config" makedepends="libxml2-devel boost-devel glu-devel glew-devel glfw-devel diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template index 32b71c99032..fd94cacc4b4 100644 --- a/srcpkgs/cgal/template +++ b/srcpkgs/cgal/template @@ -1,7 +1,7 @@ # Template file for 'cgal' pkgname=cgal version=4.11.3 -revision=1 +revision=2 wrksrc="CGAL-${version}" build_style=cmake makedepends="boost-devel eigen mpfr-devel" diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template index 095ebf7edbd..387c5c77ddc 100644 --- a/srcpkgs/cpp-hocon/template +++ b/srcpkgs/cpp-hocon/template @@ -1,7 +1,7 @@ # Template file for 'cpp-hocon' pkgname=cpp-hocon version=0.2.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel leatherman libcurl-devel" diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template index 8d0a67745c3..bd16d22cd57 100644 --- a/srcpkgs/eiskaltdcpp-qt/template +++ b/srcpkgs/eiskaltdcpp-qt/template @@ -1,7 +1,7 @@ # Template file for 'eiskaltdcpp-qt' pkgname=eiskaltdcpp-qt version=2.2.10 -revision=4 +revision=5 wrksrc="eiskaltdcpp-${version}" build_style=cmake configure_args="-DUSE_MINIUPNP=ON" diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index ff4db014d54..106365ff633 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.12.0 -revision=4 +revision=5 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="ruby-devel" diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template index 3d9ae183944..ae1340f1c33 100644 --- a/srcpkgs/fifengine/template +++ b/srcpkgs/fifengine/template @@ -1,7 +1,7 @@ # Template file for 'fifengine' pkgname=fifengine version=0.4.1 -revision=2 +revision=3 build_style=cmake hostmakedepends="swig python" makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel diff --git a/srcpkgs/freecad/patches/020-boost-1.68.patch b/srcpkgs/freecad/patches/020-boost-1.68.patch new file mode 100644 index 00000000000..4b871e7e65f --- /dev/null +++ b/srcpkgs/freecad/patches/020-boost-1.68.patch @@ -0,0 +1,39 @@ +From 3c9e6b038ed544e446c61695dab62f83e781a28a Mon Sep 17 00:00:00 2001 +From: wmayer +Date: Sat, 21 Apr 2018 11:12:45 +0200 +Subject: [PATCH] fix requesting boost python component for version >= 1.67.0 + +--- + src/Mod/Path/libarea/CMakeLists.txt | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git src/Mod/Path/libarea/CMakeLists.txt src/Mod/Path/libarea/CMakeLists.txt +index ef95c29d37d..dd03a39a797 100644 +--- src/Mod/Path/libarea/CMakeLists.txt ++++ src/Mod/Path/libarea/CMakeLists.txt +@@ -16,13 +16,19 @@ OPTION(USE_BOOST_PYTHON "use BOOST_PYTHON, otherwise use PYBIND11" ON) + + if(USE_BOOST_PYTHON) + if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER) +- if(NOT PYTHON_VERSION_MAJOR LESS 3) +- find_package( Boost COMPONENTS python3) +- if (NOT Boost_PYTHON3_FOUND) +- find_package( Boost COMPONENTS python REQUIRED) +- endif() ++ # for boost >= 1.67 we must add the Python version suffix to ++ # the component name ++ if (Boost_VERSION VERSION_GREATER 106699) ++ find_package(Boost COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED) # find BOOST and boost-python + else() +- find_package( Boost COMPONENTS python REQUIRED) # find BOOST and boost-python ++ if(NOT PYTHON_VERSION_MAJOR LESS 3) ++ find_package( Boost COMPONENTS python3) ++ if (NOT Boost_PYTHON3_FOUND) ++ find_package( Boost COMPONENTS python REQUIRED) ++ endif() ++ else() ++ find_package( Boost COMPONENTS python REQUIRED) # find BOOST and boost-python ++ endif() + endif() + + if(Boost_FOUND) diff --git a/srcpkgs/freecad/patches/021-boost-1.68.patch b/srcpkgs/freecad/patches/021-boost-1.68.patch new file mode 100644 index 00000000000..4a2f31031f8 --- /dev/null +++ b/srcpkgs/freecad/patches/021-boost-1.68.patch @@ -0,0 +1,36 @@ +From 869b5c8918674d6069652b2b688e4faf59c87ffe Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Tue, 17 Apr 2018 06:46:22 +0000 +Subject: [PATCH] Explicitly link against -lpthread on Unix + +/usr/bin/ld.lld: error: undefined symbol: pthread_condattr_init +>>> referenced by src/3rdParty/salomesmesh/src/SMESH/SMESH_Mesh.cpp +>>> src/3rdParty/salomesmesh/CMakeFiles/SMESH.dir/src/SMESH/SMESH_Mesh.cpp.o:(boost::condition_variable::condition_variable()) + +/usr/bin/ld.lld: error: undefined symbol: pthread_condattr_setclock +>>> referenced by src/3rdParty/salomesmesh/src/SMESH/SMESH_Mesh.cpp +>>> src/3rdParty/salomesmesh/CMakeFiles/SMESH.dir/src/SMESH/SMESH_Mesh.cpp.o:(boost::condition_variable::condition_variable()) + +/usr/bin/ld.lld: error: undefined symbol: pthread_condattr_destroy +>>> referenced by src/3rdParty/salomesmesh/src/SMESH/SMESH_Mesh.cpp +>>> src/3rdParty/salomesmesh/CMakeFiles/SMESH.dir/src/SMESH/SMESH_Mesh.cpp.o:(boost::condition_variable::condition_variable()) +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git CMakeLists.txt CMakeLists.txt +index cc06f908642..7230ae70de8 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -596,6 +596,11 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + find_package(Boost ${BOOST_MIN_VERSION} + COMPONENTS filesystem program_options regex signals system thread REQUIRED) + ++ if(UNIX AND NOT APPLE) ++ # Boost.Thread 1.67+ headers reference pthread_condattr_* ++ list(APPEND Boost_LIBRARIES pthread) ++ endif() ++ + IF(NOT Boost_FOUND) + MESSAGE(FATAL_ERROR "========================================\n" + "boost not found, install the components:\n" diff --git a/srcpkgs/freecad/patches/030-gcc8.patch b/srcpkgs/freecad/patches/030-gcc8.patch new file mode 100644 index 00000000000..e9ffb14c7b5 --- /dev/null +++ b/srcpkgs/freecad/patches/030-gcc8.patch @@ -0,0 +1,29 @@ +From 45945836131998ef267c632ef9c0c04b63321f31 Mon Sep 17 00:00:00 2001 +From: Gabriel Souza Franco +Date: Wed, 9 May 2018 01:22:59 +0200 +Subject: [PATCH] Fix compilation with GCC 8 + +--- + src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx +index a362ed290bc..7e23608f52d 100644 +--- src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx ++++ src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx +@@ -30,6 +30,7 @@ + + #include "SMESH_SMESH.hxx" + ++#include "SMDS_MeshNode.hxx" + #include "SMDSAbs_ElementType.hxx" + #include "SMESH_Comment.hxx" + #include "SMESH_ComputeError.hxx" +@@ -45,7 +46,6 @@ + #include + #include + +-class SMDS_MeshNode; + class SMESHDS_Mesh; + class SMESHDS_SubMesh; + class SMESH_Gen; diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index dd4c63093dc..72e5e3d723f 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -5,7 +5,7 @@ # - python3: freecad code not yet ready for it, probably at 0.18 pkgname=freecad version=0.17 -revision=4 +revision=5 wrksrc="FreeCAD-${version}" build_style=cmake diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index 3942da421f1..9e6debe0b20 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -1,7 +1,7 @@ # Template file for 'freeorion' pkgname=freeorion version=0.4.8 -revision=1 +revision=2 _release=${version}_2018-08-23.26f16b0 wrksrc="src-tarball" build_style=cmake diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 3a40e1910ef..e7fba995698 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,7 +1,7 @@ # Template file for 'gnucash' pkgname=gnucash version=3.3 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1" hostmakedepends="pkg-config guile python3 libxslt perl" diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index 56d9e4c4d02..00f69c79eca 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.1.4 -revision=2 +revision=3 wrksrc="gr-osmosdr-${version}" build_style=cmake pycompile_module="osmosdr" diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index b873becda92..b1e868e38d3 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.7.13.4 -revision=1 +revision=2 build_style=cmake nocross="relies on volk, which is not complete for arm" conf_files="/etc/gnuradio/conf.d/*" diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index fecd633f345..2f02c12c16c 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -1,7 +1,7 @@ # Template file for 'gource' pkgname=gource version=0.49 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF" hostmakedepends="pkg-config" diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template index 464e83a26e8..54e3dd30e0a 100644 --- a/srcpkgs/gpick/template +++ b/srcpkgs/gpick/template @@ -1,7 +1,7 @@ # Template file for 'gpick' pkgname=gpick version=0.2.5 -revision=3 +revision=4 wrksrc="${pkgname}-${pkgname}-${version}" build_style=scons hostmakedepends="pkg-config" diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template index 45682f0cdc0..b972c087bcf 100644 --- a/srcpkgs/gqrx/template +++ b/srcpkgs/gqrx/template @@ -1,7 +1,7 @@ # Template file for 'gqrx' pkgname=gqrx version=2.11.5 -revision=2 +revision=3 wrksrc="gqrx-sdr-${version}" build_style=cmake configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio) diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template index 4905703c077..e4db7dc7dab 100644 --- a/srcpkgs/grive2/template +++ b/srcpkgs/grive2/template @@ -1,7 +1,7 @@ # Template file for 'grive' pkgname=grive2 version=0.5.0 -revision=4 +revision=5 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel" diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index c5102fcc679..51d4fbf8e59 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -1,7 +1,7 @@ # Template file for 'guitarix2' pkgname=guitarix2 version=0.37.3 -revision=1 +revision=2 wrksrc="guitarix-${version}" build_style=waf configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust --no-lv2 diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 8b58937a472..a05e20266d2 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2018.0.0 -revision=8 +revision=9 wrksrc="${pkgname}-${version}" build_style=cmake pycompile_module="hpi.py hsi.py" diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index f96b3866f65..e0ca47a6071 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,24 +1,23 @@ # Template file for 'i2pd' pkgname=i2pd -version=2.15.0 -revision=5 -short_desc="I2P Daemon - a full-featured C++ implementation of I2P client" -homepage="http://i2pd.website/" -license="BSD" +version=2.21.0 +revision=1 build_style=gnu-makefile make_build_args="USE_UPNP=yes" +makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel + libatomic-devel" +short_desc="I2P Daemon - a full-featured C++ implementation of I2P client" maintainer="Obosob " -makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel" +license="BSD" +homepage="http://i2pd.website/" distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz" -checksum=87649a1963b1d1b8f9424c0bccbdf6bbde0bb87db8dcf0b5c61f4c7f13181b86 +checksum=96c15cf7b51feacd5bb3f7032c7d961961325102574a1a4d6cb8dd794e906e5b system_accounts="_i2pd" +disable_parallel_build=true case "${XBPS_TARGET_MACHINE}" in aarch64*|armv*|mips*) make_build_args+=" USE_AESNI=no USE_AVX=no" ;; esac -case "${XBPS_TARGET_MACHINE}" in - armv[56]*|mips*) makedepends+=" libatomic-devel"; LDFLAGS="-latomic" ;; -esac do_install() { vbin i2pd diff --git a/srcpkgs/i2pd/update b/srcpkgs/i2pd/update deleted file mode 100644 index af550066795..00000000000 --- a/srcpkgs/i2pd/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://api.github.com/repos/PurpleI2P/i2pd/tags" -pattern='"name":\s*"\K([\d\.]+)(?=")' diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index 917fdbec1f7..f86c223413f 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -1,7 +1,7 @@ # Template file for 'icinga2' pkgname=icinga2 version=2.9.2 -revision=1 +revision=2 build_style=cmake configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template index 838b9dd451b..3477ee9323d 100644 --- a/srcpkgs/imagescan/template +++ b/srcpkgs/imagescan/template @@ -1,7 +1,7 @@ # Template file for 'imagescan' pkgname=imagescan version=3.47.0 -revision=1 +revision=2 wrksrc="utsushi-0.47.0" build_style=gnu-configure configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template index f1c563294d5..d4ae612f999 100644 --- a/srcpkgs/innoextract/template +++ b/srcpkgs/innoextract/template @@ -1,7 +1,7 @@ # Template file for 'innoextract' pkgname=innoextract version=1.7 -revision=2 +revision=3 build_style=cmake configure_args="-DCMAKE_INSTALL_PREFIX=/usr" hostmakedepends="boost" diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index 496b643abd0..7971689495a 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,7 +1,7 @@ # Template file for 'kea' pkgname=kea version=1.4.0.P1 -revision=1 +revision=2 wrksrc="kea-${version/.P/-P}" build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 49ca2499302..59c57360bfd 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,7 +1,7 @@ # Template file for 'kig' pkgname=kig version=18.08.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config python" makedepends="boost-devel boost-python kparts-devel ktexteditor-devel python-devel" diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index b46f1c7f804..7aa29bf6565 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=4.1.5 -revision=1 +revision=2 nocross=yes build_style=cmake replaces="calligra-krita>=0" diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index 8f0393656ce..8d3b1ddb92f 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -2,7 +2,7 @@ # Note: always revbump cpp-hocon when updating as it links against this static lib pkgname=leatherman version=1.5.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel" diff --git a/srcpkgs/ledger/patches/boost-1.68.patch b/srcpkgs/ledger/patches/boost-1.68.patch new file mode 100644 index 00000000000..9fb7c2a45e6 --- /dev/null +++ b/srcpkgs/ledger/patches/boost-1.68.patch @@ -0,0 +1,11 @@ +--- src/utils.h 2016-01-11 16:59:38.000000000 +0100 ++++ - 2018-10-01 19:53:37.981217940 +0200 +@@ -44,7 +44,7 @@ + #ifndef _UTILS_H + #define _UTILS_H + +-#include ++#include + + /** + * @name Default values diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index 22414d203ee..3cc499d4710 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -1,7 +1,7 @@ # Template file for 'ledger' pkgname=ledger version=3.1.1 -revision=8 +revision=9 build_style=cmake maintainer="Daniel Santana " makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel" diff --git a/srcpkgs/libcmis/patches/boost-1.68.patch b/srcpkgs/libcmis/patches/boost-1.68.patch new file mode 100644 index 00000000000..443b2897229 --- /dev/null +++ b/srcpkgs/libcmis/patches/boost-1.68.patch @@ -0,0 +1,11 @@ +--- src/libcmis/xml-utils.cxx 2016-03-01 17:14:26.000000000 +0100 ++++ - 2018-10-01 13:30:30.734080390 +0200 +@@ -31,7 +31,7 @@ + #include + #include + +-#include ++#include + #include + + #include "xml-utils.hxx" diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template index aeb55df5810..2fc5a516343 100644 --- a/srcpkgs/libcmis/template +++ b/srcpkgs/libcmis/template @@ -1,7 +1,7 @@ # Template file for 'libcmis' pkgname=libcmis version=0.5.1 -revision=4 +revision=5 build_style=gnu-configure configure_args="DOCBOOK2MAN=docbook2man --disable-werror" hostmakedepends="pkg-config docbook2x" diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index eb2fca833ae..242a7bd0d2c 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -2,7 +2,7 @@ pkgname=libixion reverts=0.14.0_1 version=0.13.0 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel mdds python3-devel" diff --git a/srcpkgs/libogre/template b/srcpkgs/libogre/template index eb46b16ad34..891fb1c3199 100644 --- a/srcpkgs/libogre/template +++ b/srcpkgs/libogre/template @@ -1,7 +1,7 @@ # Template file for 'ogre' pkgname=libogre version=1.10.11 -revision=2 +revision=3 build_style=cmake configure_args="-DCMAKE_INSTALL_PREFIX=/usr \ -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ diff --git a/srcpkgs/liborcus/patches/boost-1.67.patch b/srcpkgs/liborcus/patches/boost-1.67.patch new file mode 100644 index 00000000000..c8ed9358551 --- /dev/null +++ b/srcpkgs/liborcus/patches/boost-1.67.patch @@ -0,0 +1,42 @@ +From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001 +From: Adam Majer +Date: Wed, 23 May 2018 10:45:56 +0200 +Subject: [PATCH] Fix build with Boost 1.67 + +Boost:DateTime that no longer accepts non-integer types. +In the past, these types were implicitly cast down to integer +values. Now this requires explicit cast. + +https://svn.boost.org/trac10/ticket/11168 + +This fixes #60 +--- +--- src/spreadsheet/sheet.cpp 2017-11-16 00:12:57.000000000 +0100 ++++ - 2018-10-01 19:35:16.014316314 +0200 +@@ -387,7 +387,7 @@ + + double days_since_epoch = (d - origin).days(); + +- double ms = second * 1000000.0; ++ long ms = second * 1000000.0; + + posix_time::time_duration t( + posix_time::hours(hour) + +@@ -731,7 +731,7 @@ + if (time_fraction) + { + // Convert a fraction day to microseconds. +- double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0; ++ long long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0; + posix_time::time_duration td = posix_time::microsec(ms); + + hours = td.hours(); +@@ -740,7 +740,7 @@ + + td -= posix_time::hours(hours); + td -= posix_time::minutes(minutes); +- td -= posix_time::seconds(seconds); ++ td -= posix_time::seconds((long)seconds); + + ms = td.total_microseconds(); // remaining microseconds. + diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template index 24713cf9f84..eccb678fec6 100644 --- a/srcpkgs/liborcus/template +++ b/srcpkgs/liborcus/template @@ -2,7 +2,7 @@ pkgname=liborcus reverts=0.14.0_1 version=0.13.4 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3" makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel" diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index bc9403b1c76..4dcb27cfba4 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -2,7 +2,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=6.1.0.3 -revision=2 +revision=3 build_style=meta make_build_args="build-nocheck" nocross=yes @@ -12,7 +12,7 @@ nocross=yes # Missing, required libraries are downloaded and built internally # hostmakedepends="automake flex git gperf hyphen icu libtool openldap - perl-Archive-Zip pkg-config sane ucpp unzip wget zip" + perl-Archive-Zip pkg-config sane ucpp unzip wget zip python3-setuptools" makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel libatomic_ops-devel libbluetooth-devel diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 5037ede12f3..0a09cb1637d 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -1,7 +1,7 @@ # Template file for 'libtorrent-rasterbar' pkgname=libtorrent-rasterbar version=1.1.10 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-python-binding --with-boost=${XBPS_CROSS_BASE}/usr" hostmakedepends="automake pkg-config intltool libtool python-devel" diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 4a4bf56ac2b..49ccef23843 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.16.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template index 1e0215d7bc8..d1e40dad98f 100644 --- a/srcpkgs/logstalgia/template +++ b/srcpkgs/logstalgia/template @@ -1,7 +1,7 @@ # Template file for 'logstalgia' pkgname=logstalgia version=1.1.2 -revision=1 +revision=2 wrksrc="$pkgname-$version" build_style=gnu-configure hostmakedepends="pkg-config" diff --git a/srcpkgs/luxrays/patches/boost.patch b/srcpkgs/luxrays/patches/boost.patch new file mode 100644 index 00000000000..dbbf94d3cd0 --- /dev/null +++ b/srcpkgs/luxrays/patches/boost.patch @@ -0,0 +1,11 @@ +--- cmake/Dependencies.cmake 2015-08-29 23:34:01.000000000 +0200 ++++ - 2018-10-05 21:42:24.139024667 +0200 +@@ -58,7 +58,7 @@ + + set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0") + +-set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python) ++set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python27) + find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS}) + if (NOT Boost_FOUND) + # Try again with the other type of libs diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template index 77c8d70dfbe..ecd06e58642 100644 --- a/srcpkgs/luxrays/template +++ b/srcpkgs/luxrays/template @@ -1,7 +1,7 @@ # Template file for 'luxrays' pkgname=luxrays version=3.1 -revision=11 +revision=12 build_style=cmake configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON" hostmakedepends="flex bison boost-python" diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 8d94648447b..69beb5e421b 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=27.0.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt" hostmakedepends="autoconf docbook-xsl libxslt pkg-config ruby" diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 224c8ab64d1..0228145400f 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,7 +1,7 @@ # Template file for 'monero-gui' pkgname=monero-gui version=0.13.0.3 -revision=1 +revision=2 build_style=qmake hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel" makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel monero-devel diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 9499fcde14b..a8cd748520f 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -2,6 +2,7 @@ pkgname=monero version=0.13.0.3 revision=1 +revision=2 conf_files="/etc/monerod.conf" build_style=cmake hostmakedepends="pkg-config qt5-host-tools" diff --git a/srcpkgs/mongodb/template b/srcpkgs/mongodb/template index 9cbf4e66d53..11fa9658291 100644 --- a/srcpkgs/mongodb/template +++ b/srcpkgs/mongodb/template @@ -1,10 +1,10 @@ # Template file for 'mongodb' pkgname=mongodb version=3.4.17 -revision=1 +revision=2 wrksrc="mongodb-src-r${version}" hostmakedepends="scons" -makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel +makedepends="pcre-devel snappy-devel libressl-devel libpcap-devel gperftools libsasl-devel yaml-cpp-devel" depends="cyrus-sasl-modules" conf_files="/etc/mongodb/mongodb.conf" @@ -57,7 +57,6 @@ do_build() { CPPPATH="${XBPS_CROSS_BASE}/usr/include" \ --prefix="/usr" \ --use-system-pcre \ - --use-system-boost \ --use-system-snappy \ --use-system-zlib \ --use-system-yaml \ diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template index e617e611b0d..f3251cd8623 100644 --- a/srcpkgs/mupen64plus/template +++ b/srcpkgs/mupen64plus/template @@ -1,7 +1,7 @@ # Template file for 'mupen64plus' pkgname=mupen64plus version=2.5 -revision=10 +revision=11 wrksrc="mupen64plus-bundle-src-${version}" hostmakedepends="pkg-config" makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel" diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index 5da2b4a3d82..f06a4a655b0 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -1,18 +1,20 @@ # Template file for 'namecoin' pkgname=namecoin -version=0.13.99 -revision=9 -hostmakedepends="pkg-config yasm automake libtool" +version=0.16.2 +revision=1 build_style=gnu-configure -makedepends="libevent-devel db-devel protobuf-devel boost-devel miniupnpc-devel libevent-devel qrencode-devel" +configure_args="--with-incompatible-bdb --disable-static + --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" +hostmakedepends="pkg-config yasm automake libtool" +makedepends="libevent-devel db-devel protobuf-devel boost-devel + miniupnpc-devel libevent-devel qrencode-devel" short_desc="Distributed key/value database" maintainer="ananteris " license="MIT" homepage="https://namecoin.org" -wrksrc="${pkgname}-core-nc${version}-name-tab-beta1" -distfiles="https://github.com/${pkgname}/${pkgname}-core/archive/nc${version}-name-tab-beta1.tar.gz" -checksum=0a973d0bed8142a0733ef11ca10e4a40dee5fd6c311e77160e4e8dc47a4d1967 -configure_args="--with-incompatible-bdb --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" +wrksrc="${pkgname}-core-nc${version}" +distfiles="https://github.com/namecoin/namecoin-core/archive/nc${version}.tar.gz" +checksum=2dec11332ce3284dfe3d9a6291eb770e1c27fcdb707f13b542494db527aa8d99 case "${XBPS_TARGET_MACHINE}" in armv[56]*) diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index 0a1da43a253..884ef531814 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp version=0.8.2 -revision=3 +revision=4 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw" diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index aee7f87adf8..b97d6e37fb2 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -1,7 +1,7 @@ # Template file for 'omxplayer' pkgname=omxplayer version=20160723 -revision=3 +revision=4 short_desc="Commandline OMX player for the Raspberry Pi" maintainer="Juan RP " license="GPL-2" diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index a866a224aa6..6cfbcc12bb0 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=1.8.15 -revision=1 +revision=2 wrksrc="oiio-Release-${version}" build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 31eee7952d8..2d077f3afe3 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -1,7 +1,7 @@ # Template file for 'openmw' pkgname=openmw version=0.44.0 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake configure_args="-DDESIRED_QT_VERSION=5" diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template index ceca0facf07..b0f36e2c0bd 100644 --- a/srcpkgs/openscad/template +++ b/srcpkgs/openscad/template @@ -1,7 +1,7 @@ # Template file for 'openscad' pkgname=openscad version=2015.03.2 -revision=8 +revision=9 _distver="${version%.*}-${version##*.}" wrksrc="${pkgname}-${_distver}" build_style=qmake diff --git a/srcpkgs/pamixer/template b/srcpkgs/pamixer/template index e9369af3ab4..f2a8a00d91a 100644 --- a/srcpkgs/pamixer/template +++ b/srcpkgs/pamixer/template @@ -1,7 +1,7 @@ # Template file for 'pamixer' pkgname=pamixer version=1.3.1 -revision=6 +revision=7 build_style=gnu-makefile makedepends="pulseaudio-devel boost-devel" short_desc="Pulseaudio command line mixer" diff --git a/srcpkgs/pingus/template b/srcpkgs/pingus/template index d540ea71b4a..a9174f71c3c 100644 --- a/srcpkgs/pingus/template +++ b/srcpkgs/pingus/template @@ -1,7 +1,7 @@ # Template file for 'pingus' pkgname=pingus version=0.7.6 -revision=11 +revision=12 wrksrc="pingus-v${version}" build_style=scons hostmakedepends="pkg-config" diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index d042983deff..0b0bea9a973 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=2.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template index ea9e4b9dcc6..0648054d5e7 100644 --- a/srcpkgs/povray/template +++ b/srcpkgs/povray/template @@ -1,7 +1,7 @@ # Template file for 'povray' pkgname=povray version=3.7.0.7 -revision=1 +revision=2 build_style=gnu-configure _v=${version%.*.*} conf_files=" diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template index 85a25db5423..bbae04cdfa9 100644 --- a/srcpkgs/pulseview/template +++ b/srcpkgs/pulseview/template @@ -1,7 +1,7 @@ # Template file for 'pulseview' pkgname=pulseview version=0.4.0 -revision=5 +revision=6 build_style=cmake configure_args="-DDISABLE_WERROR=TRUE" hostmakedepends="pkg-config qt5-qmake" diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index 567e98d3ebd..74e14a27667 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,7 +1,7 @@ # Template file for 'qbittorrent' pkgname=qbittorrent version=4.1.3 -revision=1 +revision=2 create_wrksrc=yes build_style=qmake hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-tools" diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index a2a49b5578e..7517010b046 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio version=1.1.456 -revision=1 +revision=2 only_for_archs="i686 x86_64" build_style=cmake make_install_args="INSTALL_ROOT=${DESTDIR} \ diff --git a/srcpkgs/scantailor/template b/srcpkgs/scantailor/template index d5b11eb149e..68af70833b2 100644 --- a/srcpkgs/scantailor/template +++ b/srcpkgs/scantailor/template @@ -1,7 +1,7 @@ # Template file for 'scantailor' pkgname=scantailor version=0.9.12.1 -revision=1 +revision=2 wrksrc=${pkgname}-RELEASE_${version//./_} build_style=cmake #configure_args="-DPTHREADS_CFLAGS=-pthread -DPTHREADS_LIBS=-pthread" diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index 49af4381e51..0fff350310e 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -2,7 +2,7 @@ pkgname=schroot reverts="1.7.2_9" version=1.6.10 -revision=8 +revision=9 _debian_version=3+deb9u1 build_pie=yes build_style=gnu-configure diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 960e9d9d771..45f82596920 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper version=0.7.1 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure configure_args="--disable-zypp --with-conf=/etc/conf.d --sbindir=/usr/bin" diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template index 4ecf00fc5cf..29a7275f79f 100644 --- a/srcpkgs/source-highlight/template +++ b/srcpkgs/source-highlight/template @@ -1,7 +1,7 @@ # Template file for 'source-highlight' pkgname=source-highlight version=3.1.8 -revision=8 +revision=9 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --with-bash-completion=/usr/share/bash-completion/completions" diff --git a/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch b/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch new file mode 100644 index 00000000000..319b8da6a53 --- /dev/null +++ b/srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch @@ -0,0 +1,23 @@ +From bbcd068659ced596402dedc78f49fabfab6470bd Mon Sep 17 00:00:00 2001 +From: David Runge +Date: Sat, 29 Sep 2018 17:14:18 +0200 +Subject: [PATCH] server/supernova/utilities/time_tag.hpp: Adding static_cast + to long for time_duration offset in microseconds to satisfy boost >= 1.67.0. + +--- + server/supernova/utilities/time_tag.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git server/supernova/utilities/time_tag.hpp server/supernova/utilities/time_tag.hpp +index 33b1effd80..3d0f21dba9 100644 +--- server/supernova/utilities/time_tag.hpp ++++ server/supernova/utilities/time_tag.hpp +@@ -229,7 +229,7 @@ class time_tag + #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG + time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds()); + #else +- time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000); ++ time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(static_cast(get_nanoseconds()/1000)); + #endif + return ptime(base, offset); + } diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 1312e7a459b..644d6f271d8 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,20 +1,24 @@ # Template file for 'supercollider' pkgname=supercollider version=3.9.3 -revision=3 +revision=4 wrksrc=SuperCollider-Source build_style=cmake configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON" hostmakedepends="emacs pkg-config" -makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libXt-devel libatomic-devel libsndfile-devel qt5-declarative-devel qt5-devel qt5-location-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-sensors-devel qt5-tools-devel qt5-webkit-devel yaml-cpp-devel" +makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libatomic-devel + libsndfile-devel libXt-devel qt5-declarative-devel qt5-location-devel + qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite + qt5-plugin-tds qt5-sensors-devel qt5-tools-devel qt5-webkit-devel + yaml-cpp-devel" short_desc="An environment and programming language for real time audio synthesis" maintainer="Andrea Brancaleoni " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/supercollider/supercollider" distfiles="${homepage}/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2" checksum=b939964a93709d747711552d116fb935508d39ba3fb64e55a45b0210a8eb11b5 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" fi @@ -22,7 +26,13 @@ case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libglob-devel";; esac +case "$XBPS_TARGET_MACHINE" in + x86_64*|i686*);; + *) configure_args+=" -DSSE=OFF -DSSE2=OFF";; +esac + pre_configure() { + rm -rf external_libraries/boost # https://github.com/supercollider/supercollider/issues/4096 sed -i 's/yaml/yaml-cpp/g' CMakeLists.txt editors/sc-ide/CMakeLists.txt case "$XBPS_TARGET_MACHINE" in *-musl) diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template index a1982291f50..fab84e8c11d 100644 --- a/srcpkgs/swiften/template +++ b/srcpkgs/swiften/template @@ -1,7 +1,7 @@ # Template file for 'swiften' pkgname=swiften version=3.0 -revision=8 +revision=9 wrksrc="swift-${version}" build_style=scons makedepends="boost-devel libressl-devel libxml2-devel libidn-devel" diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index b961fda086f..362d190c6f8 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -1,7 +1,7 @@ # Template file for 'synfig' pkgname=synfig version=1.2.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="boost-build ImageMagick pkg-config intltool" diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template index 4dbb535a1ff..34a71889706 100644 --- a/srcpkgs/tmfs/template +++ b/srcpkgs/tmfs/template @@ -1,7 +1,7 @@ # Template file for 'tmfs' pkgname=tmfs version=r5 -revision=4 +revision=5 build_style=cmake hostmakedepends="pkg-config" makedepends="fuse-devel boost-devel" diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index afd4050cb4f..44def61977f 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -1,7 +1,7 @@ # Template file for 'tomahawk' pkgname=tomahawk version=0.8.4 -revision=16 +revision=17 wrksrc=${pkgname}-${_commit} _commit=00f602e10203b76fc28b4615868c567e6bd4ced4 build_style=cmake @@ -9,7 +9,7 @@ build_options="upower hatchet kde xmpp" desc_option_hatchet="Enable support for http://hatchet.is" desc_option_kde="Enable support for KDE" desc_option_xmpp="Enable support for XMPP" -build_options_default="xmpp hatcher upower" +build_options_default="xmpp upower" configure_args="-Wno-dev -DBUILD_RELEASE=ON \ $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \ -DBUILD_WITH_QT4=OFF \ @@ -21,8 +21,9 @@ hostmakedepends="pkg-config extra-cmake-modules" makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel - quazip-devel sparsehash taglib-devel vlc-devel $(vopt_if hatchet websocketpp) - $(vopt_if xmpp jreen-qt5-devel) $(vopt_if kde telepathy-qt5-devel)" + quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel + $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-qt5-devel) + $(vopt_if kde telepathy-qt5-devel)" depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)" short_desc="Multi-source social music player" maintainer="Duncaen " @@ -31,7 +32,7 @@ homepage="https://tomahawk-player.org/" distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz" checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" fi diff --git a/srcpkgs/usbtop/template b/srcpkgs/usbtop/template index a058a9f1862..607b5bb2e78 100644 --- a/srcpkgs/usbtop/template +++ b/srcpkgs/usbtop/template @@ -1,7 +1,7 @@ # Template file for 'usbtop' pkgname=usbtop version=0.2 -revision=1 +revision=2 wrksrc="usbtop-release-${version}" build_style=cmake makedepends="boost-devel libpcap-devel" @@ -12,6 +12,15 @@ license="BSD-3-Clause" distfiles="https://github.com/aguinet/usbtop/archive/release-${version}.tar.gz" checksum=6283454ccbfecab44276344b6bc1bf74e86808fb9f539ca63eb0447d7741487e +LDFLAGS="-lpthread" + +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + *-musl);; + *) sed -i -e 's/\${Boost_LIBRARIES}/${Boost_LIBRARIES} "-lpthread"/g' src/CMakeLists.txt;; + esac +} + do_install() { vbin build/src/usbtop vdoc README.md diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template index f120865d63c..91a2f089df1 100644 --- a/srcpkgs/volk/template +++ b/srcpkgs/volk/template @@ -1,7 +1,7 @@ # Template file for 'volk' pkgname=volk version=1.4 -revision=2 +revision=3 build_style=cmake nocross="not complete for arm" short_desc="Vector-Optimized Library of Kernels" diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 983eeb77904..370d87aa8fb 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,7 +1,7 @@ # Template file for 'wesnoth' pkgname=wesnoth version=1.14.5 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config" diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template index 41752d4bc38..3d47a541f03 100644 --- a/srcpkgs/widelands/template +++ b/srcpkgs/widelands/template @@ -1,7 +1,7 @@ # Template file for 'widelands' pkgname=widelands version=19 -revision=7 +revision=8 wrksrc="${pkgname}-build${version}-src" build_style=cmake configure_args="