[packages/postgis] - fix building with json-c 0.13+
baggins
baggins at pld-linux.org
Fri May 11 07:21:51 CEST 2018
commit 92bfba3ea8cd4ac29775cd31bfc93e10b5950682
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri May 11 05:21:26 2018 +0000
- fix building with json-c 0.13+
json-c-0.13.patch | 10 ++++++++++
postgis.spec | 5 +++++
2 files changed, 15 insertions(+)
---
diff --git a/postgis.spec b/postgis.spec
index ead47f5..f02fb15 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -17,6 +17,8 @@ Group: Applications/Databases
Source0: http://download.osgeo.org/postgis/source/%{name}-%{version}%{subver}.tar.gz
# Source0-md5: dc3575a0aac5a7e0bbddde17eb6be400
Patch0: %{name}-link.patch
+Patch1: json-c-0.13.patch
+Patch2: postgres10.patch
URL: http://postgis.refractions.net/
%{?with_raster:BuildRequires: gdal-devel >= 1.8.0}
BuildRequires: geos-devel >= 3.5.0
@@ -114,8 +116,11 @@ Statyczna biblioteka lwgeom.
%prep
%setup -q -n %{name}-%{version}%{subver}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
+%{__autoconf}
%configure \
%{?with_gui:--with-gui} \
%{!?with_raster:--without-raster}
diff --git a/json-c-0.13.patch b/json-c-0.13.patch
new file mode 100644
index 0000000..5e55274
--- /dev/null
+++ b/json-c-0.13.patch
@@ -0,0 +1,10 @@
+--- postgis-2.2.1/liblwgeom/lwin_geojson.c~ 2015-11-06 21:14:47.000000000 +0000
++++ postgis-2.2.1/liblwgeom/lwin_geojson.c 2018-05-11 05:07:55.774871737 +0000
+@@ -19,7 +19,6 @@
+
+ #ifdef HAVE_LIBJSON_C
+ #include <json-c/json.h>
+-#include <json-c/json_object_private.h>
+ #else
+ #include <json/json.h>
+ #include <json/json_object_private.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/postgis.git/commitdiff/92bfba3ea8cd4ac29775cd31bfc93e10b5950682
More information about the pld-cvs-commit
mailing list