gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Closes: https://bugs.gentoo.org/731082
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
This commit is contained in:
Thomas Deutschmann
2020-07-07 16:17:31 +02:00
parent b5009e568e
commit bd6220d7b9
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-print/cups-filters/cups-filters-1.27.5.ebuild
View File

@@ -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

11
net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch → net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
View File

@@ -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])
+ ]
)
# ================