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 3ADDA138334 for ; Thu, 11 Apr 2019 20:49:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F816E07D0; Thu, 11 Apr 2019 20:49:15 +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 1A8B9E07D0 for ; Thu, 11 Apr 2019 20:49:14 +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 4CF28340D87 for ; Thu, 11 Apr 2019 20:49:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E141560 for ; Thu, 11 Apr 2019 20:49:11 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1555015733.bc9d0ab7531be52dcde085e832feac2f3a9b7e99.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/, sci-visualization/gle/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch sci-visualization/gle/gle-4.2.5-r1.ebuild X-VCS-Directories: sci-visualization/gle/ sci-visualization/gle/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: bc9d0ab7531be52dcde085e832feac2f3a9b7e99 X-VCS-Branch: master Date: Thu, 11 Apr 2019 20:49:11 +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: 04b2d996-7bd8-4be7-903d-7bd3b1c74ff9 X-Archives-Hash: a618552b10091e3ae3c8ddd1461d916c commit: bc9d0ab7531be52dcde085e832feac2f3a9b7e99 Author: David Seifert gentoo org> AuthorDate: Thu Apr 11 20:48:11 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Apr 11 20:48:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc9d0ab7 sci-visualization/gle: Fix building with media-libs/jpeg Closes: https://bugs.gentoo.org/647626 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: David Seifert gentoo.org> .../gle/files/gle-4.2.5-jpeg-9c.patch | 22 ++++++++++++++++++++++ sci-visualization/gle/gle-4.2.5-r1.ebuild | 10 ++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch new file mode 100644 index 00000000000..c5dd2205dc4 --- /dev/null +++ b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/647626 + +--- a/src/gle/gle-poppler.cpp ++++ b/src/gle/gle-poppler.cpp +@@ -194,7 +194,7 @@ + boolean gle_jpeg_empty_output_buffer(j_compress_ptr cinfo) { + gle_jpeg_term_destination(cinfo); + gle_jpeg_init_destination(cinfo); +- return true; ++ return TRUE; + } + + void gle_jpeg_memory_dest(j_compress_ptr cinfo, JOCTET* buffer, GLEWriteFuncAndClosure writeCallback) { +@@ -237,7 +237,7 @@ + cinfo.in_color_space = JCS_RGB; + } + jpeg_set_defaults(&cinfo); +- jpeg_start_compress(&cinfo, true); ++ jpeg_start_compress(&cinfo, TRUE); + JSAMPROW row = new JSAMPLE[cinfo.input_components * width]; + JSAMPROW row_pointer[1]; + row_pointer[0] = row; diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild index c9157c01809..f0d2a19ba6a 100644 --- a/sci-visualization/gle/gle-4.2.5-r1.ebuild +++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,9 +30,11 @@ RDEPEND="${DEPEND} S="${WORKDIR}"/${MY_P} -PATCHES=( "${FILESDIR}"/${P}-parallel.patch - "${FILESDIR}"/${P}-c++14.patch - ) +PATCHES=( + "${FILESDIR}"/${P}-parallel.patch + "${FILESDIR}"/${P}-c++14.patch + "${FILESDIR}"/${P}-jpeg-9c.patch +) src_prepare() { default