summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Deranek <marcin.deranek@booking.com>2020-11-03 15:15:40 +0100
committerJoonas Niilola <juippis@gentoo.org>2020-11-05 10:11:33 +0200
commit4fe8a9e6c60f9163cadad830ba4935c069c67b10 (patch)
tree420de31680a499af0881840ee881e6dff2d64c6d /media-gfx/iscan
parentmedia-video/motion: remove version 4.1.1-r1 (diff)
downloadgentoo-4fe8a9e6c60f9163cadad830ba4935c069c67b10.tar.gz
gentoo-4fe8a9e6c60f9163cadad830ba4935c069c67b10.tar.bz2
gentoo-4fe8a9e6c60f9163cadad830ba4935c069c67b10.zip
media-gfx/iscan: Allow to build with >=sys-devel/autoconf-2.70_beta2
Closes: https://bugs.gentoo.org/749693 Signed-off-by: Marcin Deranek <marcin.deranek@slonko.net> Closes: https://github.com/gentoo/gentoo/pull/18119 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-gfx/iscan')
-rw-r--r--media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch34
-rw-r--r--media-gfx/iscan/iscan-3.63.0.ebuild1
2 files changed, 35 insertions, 0 deletions
diff --git a/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch b/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch
new file mode 100644
index 000000000000..bda932904ac5
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac 2020-10-19 22:50:43.160537331 +0200
++++ b/configure.ac 2020-10-19 22:56:41.724847150 +0200
+@@ -352,7 +352,7 @@
+ AM_CONDITIONAL([have_libusb], [test x != "x$LIBUSB_LIBS"])
+
+ AS_IF([test xno != "x$with_magick_pp"],
+- AS_CASE("x$with_magick_pp",
++ [AS_CASE("x$with_magick_pp",
+ [xGraphicsMagick],
+ [PKG_CHECK_MODULES([LIBMAGICK_PP], [GraphicsMagick++],
+ [AC_DEFINE([HAVE_GRAPHICS_MAGICK_PP], [1])])
+@@ -373,11 +373,11 @@
+ ],
+ [dnl default case
+ AC_MSG_ERROR([unknown value: --with-magick-pp=$with_magick_pp])
+- ]))
++ ])])
+ AM_CONDITIONAL([have_libmagick_pp], [test x != "x$LIBMAGICK_PP_LIBS"])
+
+ AS_IF([test xno != "x$with_magick"],
+- AS_CASE("x$with_magick",
++ [AS_CASE("x$with_magick",
+ [xGraphicsMagick],
+ [AC_CHECK_PROGS([MAGICK_CONVERT], [gm])
+ AS_IF([test xgm != x$MAGICK_CONVERT],
+@@ -408,7 +408,7 @@
+ ],
+ [dnl default case
+ AC_MSG_ERROR([unknown value: --with-magick=$with_magick])
+- ]))
++ ])])
+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
+ AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"])
+
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
index 3d5f0e15b002..aa9f572ec9db 100644
--- a/media-gfx/iscan/iscan-3.63.0.ebuild
+++ b/media-gfx/iscan/iscan-3.63.0.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
"${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
)
src_prepare() {