commit e22f96e7661b9bd27e56c16608802445ad3f5cc5
Author: Krzysztof Mrozowicz <[email protected]>
Date: Fri Aug 23 22:31:28 2024 +0000
- rebuild with poppler 24.08.0
detect_poppler.patch | 26 ++++++++++++++++++++++++++
gdal.spec | 6 +++++-
2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/gdal.spec b/gdal.spec
index 6e85912..eec7766 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -53,7 +53,7 @@ Summary: Geospatial Data Abstraction Library
Summary(pl.UTF-8): Biblioteka abstrakcji danych dotyczących powierzchni
Ziemi
Name: gdal
Version: 3.0.4
-Release: 23
+Release: 23.1
License: BSD-like
Group: Libraries
Source0:
https://github.com/OSGeo/gdal/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -70,6 +70,7 @@ Patch8: %{name}_tirpcinc.patch
Patch9: jasper.patch
Patch10: gcc11.patch
Patch11: %{name}-libxml2.patch
+Patch12: detect_poppler.patch
URL: http://www.gdal.org/
# 1.x or 2.x supported
BuildRequires: CharLS-devel
@@ -287,6 +288,7 @@ Moduł Pythona GDAL.
%patch9 -p2
%patch10 -p2
%patch11 -p1
+%patch12 -p1
# need to regenerate (old ones don't support perl 5.10)
%{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
@@ -398,6 +400,8 @@ done
%{__make} -j1 -C swig/perl generate
%{__make} \
+ CFLAGS="%{rpmcflags}" \
+ CXXFLAGS="%{rpmcxxflags} -std=c++20" \
%{?with_grass:GRASS_INCLUDE="-I/usr/include/grass64"} \
%{?with_fyba:SOSI_INC="-I/usr/include/fyba"}
diff --git a/detect_poppler.patch b/detect_poppler.patch
new file mode 100644
index 0000000..9ee568e
--- /dev/null
+++ b/detect_poppler.patch
@@ -0,0 +1,26 @@
+--- gdal-3.0.4/configure~ 2024-08-23 21:21:42.948960702 +0000
++++ gdal-3.0.4/configure 2024-08-23 21:39:24.818460350 +0000
+@@ -43438,8 +43438,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
+--- gdal-3.0.4/configure.ac~ 2024-08-23 21:21:41.218936948 +0000
++++ gdal-3.0.4/configure.ac 2024-08-23 21:40:31.555371878 +0000
+@@ -4881,8 +4881,8 @@
+ [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`],
[POPPLER_VERSION=])
+ 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/e22f96e7661b9bd27e56c16608802445ad3f5cc5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
