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 53E9F138334 for ; Wed, 25 Dec 2019 20:46:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA123E0BF3; Wed, 25 Dec 2019 20:46:40 +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 81683E0BF3 for ; Wed, 25 Dec 2019 20:46:40 +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 7744334DB63 for ; Wed, 25 Dec 2019 20:46:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3092878 for ; Wed, 25 Dec 2019 20:46:38 +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: <1577306780.cafa6007bf77dd0cd210ed9aeecd9e47053a9223.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch sci-libs/gdal/gdal-2.4.1-r2.ebuild X-VCS-Directories: sci-libs/gdal/files/ sci-libs/gdal/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cafa6007bf77dd0cd210ed9aeecd9e47053a9223 X-VCS-Branch: master Date: Wed, 25 Dec 2019 20:46:38 +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: 6666edca-2967-4739-a65c-0c6dafadb9d7 X-Archives-Hash: 09eb699c2a3e7d06d4ee0f7a8deb13c3 commit: cafa6007bf77dd0cd210ed9aeecd9e47053a9223 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 25 20:42:13 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 25 20:46:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafa6007 sci-libs/gdal: Fix build with app-text/poppler-0.83.0 Closes: https://bugs.gentoo.org/703790 Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../gdal/files/gdal-2.4.1-poppler-0.83-1.patch | 27 ++++++++++++++ .../gdal/files/gdal-2.4.1-poppler-0.83-2.patch | 42 ++++++++++++++++++++++ sci-libs/gdal/gdal-2.4.1-r2.ebuild | 1 + 3 files changed, 70 insertions(+) diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch new file mode 100644 index 00000000000..f077f463238 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch @@ -0,0 +1,27 @@ +From 1f8fa16f58cfe0364099ddad0e1d86522d8de41a Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Wed, 13 Nov 2019 14:07:22 +0100 +Subject: [PATCH] PDF: fix build against Poppler 0.83.0dev + +--- + gdal/frmts/pdf/pdfdataset.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp +index 8f944c40d30..88017953de5 100644 +--- a/frmts/pdf/pdfdataset.cpp ++++ b/frmts/pdf/pdfdataset.cpp +@@ -4267,7 +4267,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo ) + CPLMutexHolderD(&hGlobalParamsMutex); + /* poppler global variable */ + if (globalParams == nullptr) ++ { ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83 ++ globalParams.reset(new GlobalParams()); ++#else + globalParams = new GlobalParams(); ++#endif ++ } + + globalParams->setPrintCommands(CPLTestBool( + CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE"))); diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch new file mode 100644 index 00000000000..74614e925f6 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch @@ -0,0 +1,42 @@ +From 7318576fc7037412b755f038f8148f2d299587aa Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Tue, 26 Nov 2019 14:33:32 +0100 +Subject: [PATCH] PDF: fix to build against latest Poppler master (0.83dev) + +--- + gdal/frmts/pdf/pdfio.cpp | 3 +++ + gdal/frmts/pdf/pdfio.h | 7 ++++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp +index 917e92330ae..c0b9dad93cb 100644 +--- a/frmts/pdf/pdfio.cpp ++++ b/frmts/pdf/pdfio.cpp +@@ -170,6 +170,9 @@ getStart_ret_type VSIPDFFileStream::getStart() + /************************************************************************/ + + StreamKind VSIPDFFileStream::getKind() ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83 ++ const ++#endif + { + return strFile; + } +diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h +index aa34ab7210d..23344d33f77 100644 +--- a/frmts/pdf/pdfio.h ++++ b/frmts/pdf/pdfio.h +@@ -81,7 +81,12 @@ class VSIPDFFileStream final: public BaseStream + virtual void setPos(setPos_offset_type pos, int dir = 0) override; + virtual void moveStart(moveStart_delta_type delta) override; + +- virtual StreamKind getKind() override; ++ virtual StreamKind getKind() ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83 ++ const ++#endif ++ override; ++ + virtual GooString *getFileName() override; + + virtual int getChar() override; diff --git a/sci-libs/gdal/gdal-2.4.1-r2.ebuild b/sci-libs/gdal/gdal-2.4.1-r2.ebuild index fa26cc48e93..897a9cf41ae 100644 --- a/sci-libs/gdal/gdal-2.4.1-r2.ebuild +++ b/sci-libs/gdal/gdal-2.4.1-r2.ebuild @@ -85,6 +85,7 @@ PATCHES=( "${FILESDIR}/${P}-poppler-0.76.patch" "${FILESDIR}/${P}-swig-4.patch" # bug 689110 "${FILESDIR}/${P}-poppler-0.82.patch" + "${FILESDIR}"/${P}-poppler-0.83-{1,2}.patch # bug 703790 ) src_prepare() {