commit:     3a3c565c4461e0984b09d50c435cf66ba3cea832
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  6 11:35:27 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jul  6 11:35:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a3c565c

net-print/cups-filters: Fixed build with USE="-test"

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups-filters/cups-filters-1.27.5.ebuild             |  2 +-
 .../cups-filters-1.27.5-make-missing-testfont-non-fatal.patch | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

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 7abb7a7fcbf..a62c679e894 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.4-make-missing-testfont-non-fatal.patch
+               eapply 
"${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal.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.patch
new file mode 100644
index 00000000000..0d5b6e6e06c
--- /dev/null
+++ 
b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch
@@ -0,0 +1,11 @@
+--- cups-filters-1.27.5/configure.ac
++++ cups-filters-1.27.5/configure.ac
+@@ -791,7 +791,7 @@
+ 
+ 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!)]
+ )
+ 
+ # ================

Reply via email to