public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/
Date: Mon,  6 Jul 2020 11:35:37 +0000 (UTC)	[thread overview]
Message-ID: <1594035335.3a3c565c4461e0984b09d50c435cf66ba3cea832.polynomial-c@gentoo> (raw)

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	other threads:[~2020-07-06 11:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-06 11:35 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-03-14 22:46 [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/ Sam James
2020-07-07 14:18 Thomas Deutschmann
2020-04-12 22:51 Thomas Deutschmann
2019-03-02 20:29 Andreas Sturmlechner
2017-10-18 11:19 Lars Wendler
2016-07-21 10:18 Lars Wendler
2016-03-27 19:59 Lars Wendler
2016-03-23  6:29 Mike Frysinger
2016-03-23  6:29 Mike Frysinger
2016-02-11  2:22 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1594035335.3a3c565c4461e0984b09d50c435cf66ba3cea832.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox