summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Deranek <marcin.deranek@booking.com>2022-01-29 14:58:19 +0100
committerSam James <sam@gentoo.org>2022-02-18 02:51:31 +0000
commit532d6cb41030f2c98b335f7ee56dfc6e1ddfb826 (patch)
tree72837710408e81ff1c8c88dae55bbeaaaabfb03e /media-gfx/iscan
parentdev-libs/libdispatch: Support musl (diff)
downloadgentoo-532d6cb41030f2c98b335f7ee56dfc6e1ddfb826.tar.gz
gentoo-532d6cb41030f2c98b335f7ee56dfc6e1ddfb826.tar.bz2
gentoo-532d6cb41030f2c98b335f7ee56dfc6e1ddfb826.zip
media-gfx/iscan: Support build with sane-backends-1.1
Signed-off-by: Marcin Deranek <marcin.deranek@slonko.net> Closes: https://bugs.gentoo.org/831823 Closes: https://github.com/gentoo/gentoo/pull/24014 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/iscan')
-rw-r--r--media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch11
-rw-r--r--media-gfx/iscan/iscan-3.65.0.ebuild1
2 files changed, 12 insertions, 0 deletions
diff --git a/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch b/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch
new file mode 100644
index 000000000000..97979c6a313a
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch
@@ -0,0 +1,11 @@
+--- a/sane/version.hpp 2020-12-22 07:44:15.000000000 +0100
++++ b/sane/version.hpp 2022-01-22 22:47:47.508608348 +0100
+@@ -37,7 +37,7 @@
+ #include <sane/sane.h>
+ }
+
+-#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_MINOR == 0))
++#if !(SANE_MAJOR == SANE_CURRENT_MAJOR)
+ #error "SANE installation violates versioning portability constraints."
+ #endif
+
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index f143a5474646..38fb610ef483 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
+ "${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch
)
src_prepare() {