diff --git a/mingw-w64-visualizationlibrary/0001-vl-remove-std-mem-fun-ref.patch b/mingw-w64-visualizationlibrary/0001-vl-remove-std-mem-fun-ref.patch new file mode 100644 index 0000000000..1dfb54cca7 --- /dev/null +++ b/mingw-w64-visualizationlibrary/0001-vl-remove-std-mem-fun-ref.patch @@ -0,0 +1,14 @@ +--- a/src/external/tristripper/detail/graph_array.h ++++ b/src/external/tristripper/detail/graph_array.h +@@ -444,7 +444,10 @@ + template + inline void unmark_nodes(graph_array & G) + { +- std::for_each(G.begin(), G.end(), std::mem_fun_ref(&graph_array::node::unmark)); ++ for (auto& node : G) ++ { ++ node.unmark(); ++ } + } + + diff --git a/mingw-w64-visualizationlibrary/PKGBUILD b/mingw-w64-visualizationlibrary/PKGBUILD index c9cbb4cd34..85b7282831 100644 --- a/mingw-w64-visualizationlibrary/PKGBUILD +++ b/mingw-w64-visualizationlibrary/PKGBUILD @@ -16,14 +16,26 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cc" 'git') _commit='d2a0e321288152008957e29a0bc270ad192f75be' -source=("${_realname}"::"git+https://github.com/MicBosi/VisualizationLibrary.git#commit=${_commit}") -sha256sums=('SKIP') +source=("${_realname}"::"git+https://github.com/MicBosi/VisualizationLibrary.git#commit=${_commit}" + 0001-vl-remove-std-mem-fun-ref.patch) +sha256sums=('SKIP' + '6f194c1103c94575be8269c3ba5affdf2f73a92a46a596244d1af2141d77bd90') pkgver() { cd "${_realname}" git describe --long --tags --abbrev=7 "${_commit}" | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g' } +prepare() { + cd "${_realname}" + + # for clang, due to cmath includes its own headers + rm "src/external/libtiff/version" + + # https://github.com/GPSnoopy/TriStripper/commit/79fd402a43a9e92aafc155f88ff53a0b044f1e81.patch + patch -p1 -i "${srcdir}/0001-vl-remove-std-mem-fun-ref.patch" +} + build() { declare -a _extra_config if check_option "debug" "n"; then