From 8b320439cecf385d3f82b4e2f27c17c01c82f0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 26 Aug 2022 17:00:34 +0700 Subject: [PATCH] imagescan: rebuild for boost-1.80 --- srcpkgs/imagescan/patches/boost-1.80.patch | 15 +++++++++++++++ srcpkgs/imagescan/patches/sane.patch | 11 +++++++++++ srcpkgs/imagescan/template | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/imagescan/patches/boost-1.80.patch create mode 100644 srcpkgs/imagescan/patches/sane.patch diff --git a/srcpkgs/imagescan/patches/boost-1.80.patch b/srcpkgs/imagescan/patches/boost-1.80.patch new file mode 100644 index 00000000000..4425d84a34a --- /dev/null +++ b/srcpkgs/imagescan/patches/boost-1.80.patch @@ -0,0 +1,15 @@ +_1 should be looked up via ADL, don't know +--- a/utsushi/functional.hpp ++++ b/utsushi/functional.hpp +@@ -59,6 +59,11 @@ using NAMESPACE::function; + using NAMESPACE::ref; + using NAMESPACE::reference_wrapper; + ++#if __cplusplus >= 201103L && !WITH_INCLUDED_BOOST ++using std::placeholders::_1; ++using std::placeholders::_2; ++#endif ++ + } // namespace utsushi + + #undef NAMESPACE diff --git a/srcpkgs/imagescan/patches/sane.patch b/srcpkgs/imagescan/patches/sane.patch new file mode 100644 index 00000000000..58e220ba786 --- /dev/null +++ b/srcpkgs/imagescan/patches/sane.patch @@ -0,0 +1,11 @@ +--- a/sane/version.hpp ++++ b/sane/version.hpp +@@ -37,7 +37,7 @@ extern "C" { // neede + #include + } + +-#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_MINOR == 0)) ++#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_CURRENT_MINOR == 0)) + #error "SANE installation violates versioning portability constraints." + #endif + diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template index a12adfe0571..152ef2f83b3 100644 --- a/srcpkgs/imagescan/template +++ b/srcpkgs/imagescan/template @@ -1,7 +1,7 @@ # Template file for 'imagescan' pkgname=imagescan version=3.65.0 -revision=1 +revision=2 wrksrc=utsushi-0.65.0 build_style=gnu-configure configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib