| 1 |
commit: 5f490d3e5588fb52ccf6fd5ccc57630be75dc1e4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 10 23:18:46 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 10 23:18:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f490d3e |
| 7 |
|
| 8 |
sci-libs/gdal: fix build with Poppler 22.01.0 (build with C++ 17) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/830883 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/gdal-3.4.1-poppler-22.01.0-c++17.patch | 23 ++++++++++++++++++++++ |
| 14 |
sci-libs/gdal/gdal-3.4.1.ebuild | 1 + |
| 15 |
2 files changed, 24 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..dac3bd3776d9 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch |
| 22 |
@@ -0,0 +1,23 @@ |
| 23 |
+https://bugs.gentoo.org/830883 |
| 24 |
+https://github.com/OSGeo/gdal/commit/3f528f2b5f9244698c89d31b74155765538ef362 |
| 25 |
+ |
| 26 |
+From: Even Rouault <even.rouault@×××××××××.com> |
| 27 |
+Date: Sat, 8 Jan 2022 14:25:09 +0100 |
| 28 |
+Subject: [PATCH] frmts/pdf/GNUmakefile: force c++17 with Poppler > 21 (fixes |
| 29 |
+ #5071) |
| 30 |
+ |
| 31 |
+--- a/frmts/pdf/GNUmakefile |
| 32 |
++++ b/frmts/pdf/GNUmakefile |
| 33 |
+@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle |
| 34 |
+ endif |
| 35 |
+ |
| 36 |
+ ifeq ($(HAVE_POPPLER),yes) |
| 37 |
++# Poppler 2022.1 requires c++17 |
| 38 |
++ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0) |
| 39 |
++CXX := $(subst -std=c++11,,${CXX}) |
| 40 |
++CXX := $(subst -std=c++14,,${CXX}) |
| 41 |
++CXX := ${CXX} -std=c++17 |
| 42 |
++endif |
| 43 |
+ CPPFLAGS += -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION) |
| 44 |
+ endif |
| 45 |
+ |
| 46 |
|
| 47 |
diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild |
| 48 |
index 4967e5533a3b..56d451eed723 100644 |
| 49 |
--- a/sci-libs/gdal/gdal-3.4.1.ebuild |
| 50 |
+++ b/sci-libs/gdal/gdal-3.4.1.ebuild |
| 51 |
@@ -91,6 +91,7 @@ PATCHES=( |
| 52 |
"${FILESDIR}/${PN}-2.2.3-soname.patch" |
| 53 |
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840 |
| 54 |
"${FILESDIR}/${PN}-3.3.0-libdir.patch" |
| 55 |
+ "${FILESDIR}/${P}-poppler-22.01.0-c++17.patch" |
| 56 |
) |
| 57 |
|
| 58 |
src_prepare() { |
Archives