svn commit: r545232 - head/graphics/gdal/files
Tobias C. Berner
tcberner at FreeBSD.org
Tue Aug 18 14:19:55 UTC 2020
Author: tcberner
Date: Tue Aug 18 14:19:54 2020
New Revision: 545232
URL: https://svnweb.freebsd.org/changeset/ports/545232
Log:
graphics/gdal: add upstream fix for poppler 20.08.x
- graphics poppler changed the versionsing scheme
- add upstream patch to handle the minor-release with leading zeroes.
- the exp-run in pr 248419 could not catch this as the option is off by default
- obtained from upstream:
https://github.com/OSGeo/gdal/commit/2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6.patch
PR: 248703
Submitted by: russo at bogodyn.org
Reported by: John Hein <jcfyecrayz at liamekaens.com>
Added:
head/graphics/gdal/files/patch-configure (contents, props changed)
Added: head/graphics/gdal/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gdal/files/patch-configure Tue Aug 18 14:19:54 2020 (r545232)
@@ -0,0 +1,23 @@
+From 2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault at spatialys.com>
+Date: Mon, 3 Aug 2020 14:52:25 +0200
+Subject: [PATCH] Unix build: fix detection of minor version number of Poppler
+ with the new YY.MM.X numbering scheme (fixes #2823) (#2825)
+
+Authored-by: @chris2553
+
+https://github.com/OSGeo/gdal/commit/2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6.patch
+
+--- configure 2020-08-17 13:00:41.028145000 -0600
++++ configure 2020-08-17 13:00:54.784398000 -0600
+@@ -40695,8 +40683,8 @@
+ fi
+ if test "$POPPLER_VERSION" != ""; then
+ HAVE_POPPLER=yes
+- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'`
+- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'`
++ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
+ POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
+ fi
+ else
More information about the svn-ports-head
mailing list