commit: 4fe8a9e6c60f9163cadad830ba4935c069c67b10 Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com> AuthorDate: Tue Nov 3 14:15:40 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Nov 5 08:11:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe8a9e6
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 <AT> slonko.net> Closes: https://github.com/gentoo/gentoo/pull/18119 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../iscan/files/iscan-3.63.0-autoconf-2.70.patch | 34 ++++++++++++++++++++++ media-gfx/iscan/iscan-3.63.0.ebuild | 1 + 2 files changed, 35 insertions(+) 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 00000000000..bda932904ac --- /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 3d5f0e15b00..aa9f572ec9d 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() {
