summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-06-12 12:00:09 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-06-12 12:02:13 +0200
commite0d7c6e5e8fa39d87e399460567bd8a405e400a9 (patch)
tree8ff0cf8a5fc32e6487ccd52c0319f5aff43f4b50 /sci-libs/gdal/files
parentapp-office/scribus: Drop 1.5.5_pre20190124 (diff)
downloadgentoo-e0d7c6e5e8fa39d87e399460567bd8a405e400a9.tar.gz
gentoo-e0d7c6e5e8fa39d87e399460567bd8a405e400a9.tar.bz2
gentoo-e0d7c6e5e8fa39d87e399460567bd8a405e400a9.zip
sci-libs/gdal: Drop 2.4.0
Broken by current stable poppler. Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs/gdal/files')
-rw-r--r--sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch58
-rw-r--r--sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch35
2 files changed, 0 insertions, 93 deletions
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
deleted file mode 100644
index 3302df9100d..00000000000
--- a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.72.0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b471814ef406582f2b1bc0aabbe430c0026608c7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 12 Jan 2019 17:21:54 +0100
-Subject: [PATCH] Fix build with poppler-0.72.0
-
-Non-upstreamable patch that breaks backward compatibility.
----
- frmts/pdf/pdfdataset.cpp | 4 ++--
- frmts/pdf/pdfobject.cpp | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 84fe1fe..38b8c30 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -3459,7 +3459,7 @@ void PDFDataset::FindLayersPoppler()
- #endif
- if( ocg != nullptr && ocg->getName() != nullptr )
- {
-- const char* pszLayerName = (const char*)ocg->getName()->getCString();
-+ const char* pszLayerName = (const char*)ocg->getName()->c_str();
- AddLayer(pszLayerName);
- oLayerOCGMapPoppler[pszLayerName] = ocg;
- }
-@@ -4787,7 +4787,7 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
- GooString* poMetadata = poCatalogPoppler->readMetadata();
- if (poMetadata)
- {
-- const char* pszContent = poMetadata->getCString();
-+ const char* pszContent = poMetadata->c_str();
- if (pszContent != nullptr &&
- STARTS_WITH(pszContent, "<?xpacket begin="))
- {
-diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
-index 0a5f907..9bed6c1 100644
---- a/frmts/pdf/pdfobject.cpp
-+++ b/frmts/pdf/pdfobject.cpp
-@@ -1061,7 +1061,7 @@ const CPLString& GDALPDFObjectPoppler::GetString()
- #else
- GooString* gooString = m_po->getString();
- #endif
-- return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
-+ return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
- static_cast<int>(gooString->getLength())));
- }
- else
-@@ -1422,7 +1422,7 @@ char* GDALPDFStreamPoppler::GetBytes()
- char* pszContent = (char*) VSIMalloc(m_nLength + 1);
- if (pszContent)
- {
-- memcpy(pszContent, gstr->getCString(), m_nLength);
-+ memcpy(pszContent, gstr->c_str(), m_nLength);
- pszContent[m_nLength] = '\0';
- }
- delete gstr;
---
-2.20.1
-
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
deleted file mode 100644
index 8529d99e735..00000000000
--- a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 77ea05388924fcf2a8c9fd4a777c97e4d69f5e17 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 16 Jan 2019 20:52:59 +0100
-Subject: [PATCH] Fix build with poppler-0.73
-
----
- gdal/frmts/pdf/pdfsdk_headers.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
-index 9150b0f410..574943b41f 100644
---- a/frmts/pdf/pdfsdk_headers.h
-+++ b/frmts/pdf/pdfsdk_headers.h
-@@ -50,7 +50,6 @@
- #pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */
- #endif
-
--#include <goo/gtypes.h>
- #include <goo/GooList.h>
-
- /* begin of poppler xpdf includes */
-@@ -79,6 +78,10 @@
-
- /* end of poppler xpdf includes */
-
-+/* poppler-0.73 compatibility */
-+#define Guchar unsigned char
-+#define Guint unsigned int
-+
- #ifdef _MSC_VER
- #pragma warning( pop )
- #endif
---
-2.20.1
-