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 771AB138334 for ; Wed, 30 Jan 2019 21:21:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F16DE0817; Wed, 30 Jan 2019 21:21:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 3EFBEE0817 for ; Wed, 30 Jan 2019 21:21:57 +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 382FC335CB7 for ; Wed, 30 Jan 2019 21:21:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E66444B for ; Wed, 30 Jan 2019 21:21:53 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1548883287.ecdea30cd4b1c5df9e7642921f0004f5137607a5.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/files/poppler-0.68.0-bool.patch app-text/poppler/poppler-0.68.0.ebuild X-VCS-Directories: app-text/poppler/files/ app-text/poppler/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: ecdea30cd4b1c5df9e7642921f0004f5137607a5 X-VCS-Branch: master Date: Wed, 30 Jan 2019 21:21:53 +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: 009b65ef-419f-42fc-92b7-7011fdec9c6f X-Archives-Hash: e86413c2f13b96dcdf167d4d3cdadaf2 commit: ecdea30cd4b1c5df9e7642921f0004f5137607a5 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Jan 30 21:21:27 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Jan 30 21:21:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecdea30c app-text/poppler: backport jpeg buildfix, bug #670252 jpeg-9c defines TRUE and FALSE as 'enum' values not compatible to bool. Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/670252 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> app-text/poppler/files/poppler-0.68.0-bool.patch | 36 ++++++++++++++++++++++++ app-text/poppler/poppler-0.68.0.ebuild | 1 + 2 files changed, 37 insertions(+) diff --git a/app-text/poppler/files/poppler-0.68.0-bool.patch b/app-text/poppler/files/poppler-0.68.0-bool.patch new file mode 100644 index 00000000000..a2d8ba7bd40 --- /dev/null +++ b/app-text/poppler/files/poppler-0.68.0-bool.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/670252 + +From de34900993bff73c8da651319027b2fa8c490172 Mon Sep 17 00:00:00 2001 +From: Ed Porras +Date: Sun, 26 Aug 2018 20:24:23 +0200 +Subject: [PATCH] fix macOS compilation due to boolean define in jpeglib + +typedef enum { FALSE = 0, TRUE = 1 } boolean; +--- + goo/JpegWriter.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc +index 16c97afe..26fa77a7 100644 +--- a/goo/JpegWriter.cc ++++ b/goo/JpegWriter.cc +@@ -11,6 +11,7 @@ + // Copyright (C) 2013 Peter Breitenlohner + // Copyright (C) 2017, 2018 Albert Astals Cid + // Copyright (C) 2018 Martin Packman ++// Copyright (C) 2018 Ed Porras + // + //======================================================================== + +@@ -143,7 +144,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI) + } + + // Set whether to compute optimal Huffman coding tables +- priv->cinfo.optimize_coding = priv->optimize; ++ priv->cinfo.optimize_coding = static_cast(priv->optimize); + + // Get ready for data + jpeg_start_compress(&priv->cinfo, TRUE); +-- +2.20.1 + diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild index 16588ae074d..e2839fc0c54 100644 --- a/app-text/poppler/poppler-0.68.0.ebuild +++ b/app-text/poppler/poppler-0.68.0.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" + "${FILESDIR}/${PN}-0.68.0-bool.patch" ) src_prepare() {