[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  7 14:17:31 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul  7 14:18:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6220d7

net-print/cups-filters: fix building without media-fonts/dejavu

Closes: https://bugs.gentoo.org/731082
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-print/cups-filters/cups-filters-1.27.5.ebuild             |  2 +-
 ...s-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch} | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/net-print/cups-filters/cups-filters-1.27.5.ebuild b/net-print/cups-filters/cups-filters-1.27.5.ebuild
index a62c679e894..c56df856744 100644
--- a/net-print/cups-filters/cups-filters-1.27.5.ebuild
+++ b/net-print/cups-filters/cups-filters-1.27.5.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
 	default
 
 	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal.patch
+		eapply "${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal-r1.patch
 		need_eautoreconf=yes
 	elif [[ "${PV}" == "9999" ]] ; then
 		need_eautoreconf=yes

diff --git a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
similarity index 56%
rename from net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch
rename to net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
index 0d5b6e6e06c..43aa6bf3b5a 100644
--- a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch
+++ b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
@@ -1,11 +1,14 @@
---- cups-filters-1.27.5/configure.ac
-+++ cups-filters-1.27.5/configure.ac
-@@ -791,7 +791,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -791,7 +791,10 @@ AC_ARG_WITH([test-font-path],
  
  AS_IF([test -f "$with_test_font_path"],
  	[AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])],
 -	[AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)]
-+	[AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)]
++	[
++		AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)
++		AC_DEFINE([TESTFONT])
++	]
  )
  
  # ================