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 A50211382C5 for ; Fri, 15 Jan 2021 20:25:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEBA8E083D; Fri, 15 Jan 2021 20:25:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B047DE083D for ; Fri, 15 Jan 2021 20:25:22 +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 6921E335D9E for ; Fri, 15 Jan 2021 20:25:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C004253 for ; Fri, 15 Jan 2021 20:25:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1610742303.b2757129ca25c1b7ff6e4e0095445c6650e2c5f0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/iscan/files/iscan-2.30.4.2-c99.patch media-gfx/iscan/iscan-2.30.4.2-r1.ebuild X-VCS-Directories: media-gfx/iscan/files/ media-gfx/iscan/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b2757129ca25c1b7ff6e4e0095445c6650e2c5f0 X-VCS-Branch: master Date: Fri, 15 Jan 2021 20:25:19 +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: 8482c4b1-03db-4a26-8b8c-93c96a99efcb X-Archives-Hash: 4eb9c849c18ecfae8117de1061af98f8 commit: b2757129ca25c1b7ff6e4e0095445c6650e2c5f0 Author: Hector Martin marcan st> AuthorDate: Mon Jan 4 08:22:12 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 15 20:25:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2757129 media-gfx/iscan: fix build due to `bool` mismatch Use instead of a custom bool type when available, to avoid build failures if other packages include later, which redefines it to _Bool. This causes build failures due to mismatch between declarations and definitions. Closes: https://bugs.gentoo.org/755884 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Hector Martin marcan.st> Closes: https://github.com/gentoo/gentoo/pull/18938 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/iscan/files/iscan-2.30.4.2-c99.patch | 24 ++++++++++++++++++++++++ media-gfx/iscan/iscan-2.30.4.2-r1.ebuild | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch b/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch new file mode 100644 index 00000000000..93683c2887b --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch @@ -0,0 +1,24 @@ +--- a/backend/defines.h 2021-01-04 08:13:48.995137756 -0000 ++++ b/backend/defines.h 2021-01-04 08:16:00.524563361 -0000 +@@ -31,6 +31,13 @@ + + + #ifndef __cplusplus ++ ++/* Use the C99 bool type if available ++ */ ++#ifdef HAVE_STDBOOL_H ++#include ++#else ++ + /*! A C++ Boolean type and corresponding keywords for our C code. + */ + typedef enum { +@@ -38,6 +45,7 @@ + true + } bool; + #endif ++#endif + + + /* Run-time contract validation. diff --git a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild index 333d41b9b1c..c1eb390986e 100644 --- a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild +++ b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -70,6 +70,7 @@ PATCHES=( "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch "${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch "${FILESDIR}"/iscan-2.30.4.2-sscanf.patch + "${FILESDIR}"/iscan-2.30.4.2-c99.patch ) QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"