diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-07-07 16:17:31 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-07-07 16:18:01 +0200 |
| commit | bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d (patch) | |
| tree | 5f7c60ee8ce98fec47f6e39eaba97ef67d391e30 /net-print | |
| parent | net-proxy/squidguard: drop old version (diff) | |
| download | gentoo-bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d.tar.gz gentoo-bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d.tar.bz2 gentoo-bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d.zip | |
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@gentoo.org>
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups-filters/cups-filters-1.27.5.ebuild | 2 | ||||
| -rw-r--r-- | net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch (renamed from net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.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 a62c679e894d..c56df8567443 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 index 0d5b6e6e06c5..43aa6bf3b5aa 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]) ++ ] ) # ================ |