1 |
commit: 0c75ede9ad372d0ef40e8ac024593ea94a2bbc0b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 26 17:03:46 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 26 17:10:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c75ede9 |
7 |
|
8 |
sci-libs/gdal: poppler-0.73 support was upstreamed |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
sci-libs/gdal/gdal-2.3.1.ebuild | 12 ++++++------ |
14 |
1 file changed, 6 insertions(+), 6 deletions(-) |
15 |
|
16 |
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild |
17 |
index 9f81394be02..1e486dbbe8a 100644 |
18 |
--- a/sci-libs/gdal/gdal-2.3.1.ebuild |
19 |
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild |
20 |
@@ -82,8 +82,9 @@ PATCHES=( |
21 |
"${FILESDIR}/${PN}-2.2.3-soname.patch" |
22 |
"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866 |
23 |
"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840 |
24 |
- "${FILESDIR}/${PN}-2.3.1-poppler-0.69.0.patch" |
25 |
- "${FILESDIR}/${PN}-2.3.1-poppler-0.71.0.patch" # bug 674556 |
26 |
+ # fixed in 2.4.0: |
27 |
+ "${FILESDIR}/${P}-poppler-0.69.0.patch" |
28 |
+ "${FILESDIR}/${P}-poppler-0.71.0.patch" # bug 674556 |
29 |
) |
30 |
|
31 |
src_prepare() { |
32 |
@@ -120,10 +121,9 @@ src_prepare() { |
33 |
|
34 |
default |
35 |
|
36 |
- # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12: |
37 |
- has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch" |
38 |
- # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16: |
39 |
- has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch" |
40 |
+ # fixed in git master or what will become 2.4.1: |
41 |
+ has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${P}-poppler-0.72.0.patch" |
42 |
+ has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${P}-poppler-0.73.0.patch" |
43 |
|
44 |
eautoreconf |
45 |
} |