From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2304138359 for ; Tue, 7 Jul 2020 14:18:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BC51E0864; Tue, 7 Jul 2020 14:18:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB71CE0864 for ; Tue, 7 Jul 2020 14:18:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36D9534F0A2 for ; Tue, 7 Jul 2020 14:18:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E427F290 for ; Tue, 7 Jul 2020 14:18:07 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1594131481.bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups-filters/cups-filters-1.27.5.ebuild net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal.patch X-VCS-Directories: net-print/cups-filters/files/ net-print/cups-filters/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d X-VCS-Branch: master Date: Tue, 7 Jul 2020 14:18:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3faf154c-b0ea-49ad-80ce-0b346c8f6ec8 X-Archives-Hash: 1f624e5433175b5f0c9abc947534fb37 commit: bd6220d7b9f9fd9f2a99b2dbb4862a6af54e6d6d Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Jul 7 14:17:31 2020 +0000 Commit: Thomas Deutschmann gentoo 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 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]) ++ ] ) # ================