diff options
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch | 53 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-2.4.1-r1.ebuild | 1 |
3 files changed, 56 insertions, 1 deletions
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 4b50bad1e4f7..613e4e04d1d7 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -3,8 +3,9 @@ AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6 AUX gdal-2.4.1-poppler-0.75.patch 5452 BLAKE2B 7cb3b1e84f2f1ff91af49cb4292047f055aeff5a45c8f0d4c440c99d2ab746d32500f11c040f0eaba72b8da9122ab5fc3b5d50dc082c60281354652ab65fff9f SHA512 7482a8a160f514c31c11d101e1f8a2c32dcc862b3c7bc76ac11712bca7c3088975b4fefae33a6d68a847a5e54982b8d02d6bdc8dee27dd0d5efea0f6d28590ed AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fdbefcd4bb6949ddf9fa18b856b1ae20d2a2ec9dbcc0d973097cd2ba5f6e72e852b26a93997ffe4b428fe79d44b5c1cf SHA512 09cdd963dbc5e09d211663f54b1cef72eeeda7484ad10b08862907df60aefc068d840e80d4fd0aa0776a03edca89e8affb8b614c4db02085e854bb4a14342d4f +AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d891fe170ec5b6954d34a3986ce949f2c428f184d8ffbe6292cf6fb7915753db7e81b4993c71fe2b1e4016745c8595fd SHA512 9aca4c69c1df413666d58d75e9b235cc7039224e400188e982b5e9de22773b20829c09eb467069c9e56ea79aa4de2f0e1267d2ed4cd8bb1be7e0432f2c7297c2 AUX gdal-2.4.1-swig-4.patch 4239 BLAKE2B d3bfc88aa79fa94015816cd6e620b7520c765379668542dc1fa5c20192898e9e25fcd1a4cc7aed98fca8d07dc1e0a06b6bcd60fa19049af738f061f7537a7129 SHA512 7db4206ce24a35b4b71859310cc4218fd02c3c2900892fc51950d7ddb90b5e743dc42fe4fe545404063ffeb2f0eaa4319f616a200ed3e92723ed04db4300f7c0 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483 -EBUILD gdal-2.4.1-r1.ebuild 8154 BLAKE2B b1e5e5d599a521fab13bdd696d2148b82dec36b4b04f5a9ac60097d7020479a37ae43f347e9feb06344546eaf106e9ff7c6b9a7b95fbe1781f0752090bc4fb56 SHA512 4a2d654bc206fc5c3d3a7f1ffebd34d2b9eead0107ef453eaafdfcb418f99e459e6873ae837edc73ff91cc8503d30625499ada40edff7541a5ad13ba46f9dc44 +EBUILD gdal-2.4.1-r1.ebuild 8193 BLAKE2B a07ad5889a6d80a2fa92aab151cb279769e19bdb7b85293cead93ebecfda9be6689eb762b7e4ad237ad8ab32cd6f3ce9d45e36865116f8b1e1b6e8ed27892ae1 SHA512 b626dc9c2568d76aec6ab7a1e16172d983661289cb3b531e84a3ece9862168c57316c8b1fe9ec177b17a8f811b039bc7e4a6d6eff5d2f1c9ac589b3e0c424365 EBUILD gdal-2.4.1.ebuild 8103 BLAKE2B 64c0da0778d1d685931f26d5503ea2842094b9d2575d11d81f4bfc494087917079bc458c2cef6237fa666f7290912b2990311bffca1d4a4170891c3d9fcc50c0 SHA512 41fb4a70b214b754b47168b0518b7f2265c1d879d3b99229ff658586c25edd4c1bed086dacb1cd644595cd996ec9e4bff52b04b7bd65a4d6f4924cbec905e09a MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch new file mode 100644 index 000000000000..740856814f86 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch @@ -0,0 +1,53 @@ +From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Tue, 22 Oct 2019 13:11:57 +0200 +Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev + +--- + gdal/frmts/pdf/pdfdataset.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp +index 15537ca7fd7..8f944c40d30 100644 +--- a/frmts/pdf/pdfdataset.cpp ++++ b/frmts/pdf/pdfdataset.cpp +@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev + virtual void drawChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode code, int nBytes, Unicode *u, int uLen) override ++ CharCode code, int nBytes, ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82 ++ const ++#endif ++ Unicode *u, int uLen) override + { + if (bEnableText) + SplashOutputDev::drawChar(state, x, y, dx, dy, +From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sun, 29 Sep 2019 23:55:18 +0200 +Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev + +--- + gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp +index 3d68f92abe8..b3db5374227 100644 +--- a/frmts/pdf/pdfdataset.cpp ++++ b/frmts/pdf/pdfdataset.cpp +@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev + + virtual void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg) override ++ GBool interpolate, ++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82 ++ const ++#endif ++ int *maskColors, ++ GBool inlineImg) override + { + if (bEnableBitmap) + SplashOutputDev::drawImage(state, ref, str, diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild index 2c9beae3deb6..db767c561b77 100644 --- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild +++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild @@ -85,6 +85,7 @@ PATCHES=( "${FILESDIR}/${P}-poppler-0.75.patch" "${FILESDIR}/${P}-poppler-0.76.patch" "${FILESDIR}/${P}-swig-4.patch" # bug 689110 + "${FILESDIR}/${P}-poppler-0.82.patch" ) src_prepare() { |