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 289591382C5 for ; Sun, 4 Feb 2018 18:58:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43367E0B17; Sun, 4 Feb 2018 18:58: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 137A0E0B17 for ; Sun, 4 Feb 2018 18:58:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 75FD6335C38 for ; Sun, 4 Feb 2018 18:58:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 979391C5 for ; Sun, 4 Feb 2018 18:58:11 +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: <1517770662.9340ca0e6718d790d4fdd949a7e8f7392441a4d9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch app-office/libreoffice/libreoffice-6.0.0.3.ebuild app-office/libreoffice/libreoffice-6.0.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9340ca0e6718d790d4fdd949a7e8f7392441a4d9 X-VCS-Branch: master Date: Sun, 4 Feb 2018 18:58: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-Archives-Salt: 6ee26b20-a7c1-49fa-b69a-46771f14c5b0 X-Archives-Hash: 0b0547df34b29013bb2287d14f6c0198 commit: 9340ca0e6718d790d4fdd949a7e8f7392441a4d9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 4 18:57:42 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 4 18:57:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9340ca0e app-office/libreoffice: Fix build with media-libs/jpeg Backport picked from upstream. Bug: https://bugs.gentoo.org/638520 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../files/libreoffice-6.0.0.3-jpeg-9.patch | 41 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-6.0.0.3.ebuild | 7 ++-- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 4 +-- app-office/libreoffice/libreoffice-9999.ebuild | 4 +-- 4 files changed, 50 insertions(+), 6 deletions(-) diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch b/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch new file mode 100644 index 00000000000..40dfb08d56a --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch @@ -0,0 +1,41 @@ +From 5184506ffddca982f22eede24cffad64ff3576e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Sat, 3 Feb 2018 16:39:12 +0000 +Subject: tdf#115416 allow build with classic libjpeg +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6 +Reviewed-on: https://gerrit.libreoffice.org/49187 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +--- + vcl/source/filter/jpeg/jpegc.cxx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx +index 570c036..059ec20 100644 +--- a/vcl/source/filter/jpeg/jpegc.cxx ++++ b/vcl/source/filter/jpeg/jpegc.cxx +@@ -244,6 +244,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream, + eScanlineFormat = ScanlineFormat::N8BitPal; + nPixelSize = 1; + } ++#if defined(JCS_EXTENSIONS) + else if (eFinalFormat == ScanlineFormat::N32BitTcBgra) + { + best_out_color_space = JCS_EXT_BGRA; +@@ -262,7 +263,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream, + eScanlineFormat = eFinalFormat; + nPixelSize = 4; + } +- ++#endif + if (rContext.cinfo.jpeg_color_space == JCS_YCCK) + rContext.cinfo.out_color_space = JCS_CMYK; + +-- +cgit v1.1 + diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild index fb3e9b376d0..170a95f8825 100644 --- a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild @@ -254,6 +254,9 @@ PATCHES=( # gtk3-kde5 vcl plugin backported from master "${WORKDIR}"/${PATCHSET/.tar.xz/} + + # 6.1 branch + "${FILESDIR}/${P}-jpeg-9.patch" ) pkg_pretend() { @@ -261,8 +264,8 @@ pkg_pretend() { ewarn "If you plan to use Base application you should enable java or you will get various crashes." if has_version "