diff options
Diffstat (limited to 'gis/gdal')
| -rw-r--r-- | gis/gdal/gdal.SlackBuild | 4 | ||||
| -rw-r--r-- | gis/gdal/poppler.patch | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild index 2973ebf43c..7ab777df08 100644 --- a/gis/gdal/gdal.SlackBuild +++ b/gis/gdal/gdal.SlackBuild @@ -71,6 +71,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/poppler.patch + # OpenCL, webp, Spatialite and Grass support need special arrangements. # Everything else is handled automatically by configure. WITHLIST="" @@ -112,6 +114,8 @@ else WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX}" fi +# The CPPFLAGS are for the newer mariadb (thanks pprkut!) +CPPFLAGS="-I/usr/include/mysql/server" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/gis/gdal/poppler.patch b/gis/gdal/poppler.patch new file mode 100644 index 0000000000..59e9c5b5b3 --- /dev/null +++ b/gis/gdal/poppler.patch @@ -0,0 +1,12 @@ +diff -Naur gdal-2.2.4.orig/frmts/pdf/pdfobject.cpp gdal-2.2.4/frmts/pdf/pdfobject.cpp +--- gdal-2.2.4.orig/frmts/pdf/pdfobject.cpp 2018-03-19 14:26:54.000000000 +0100 ++++ gdal-2.2.4/frmts/pdf/pdfobject.cpp 2019-10-15 06:58:41.248215000 +0200 +@@ -1055,7 +1055,7 @@ + { + if (GetType() == PDFObjectType_String) + { +- GooString* gooString = m_po->getString(); ++ const GooString* gooString = m_po->getString(); + return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()), + static_cast<int>(gooString->getLength()))); + } |