[SCM] PostGIS branch master updated. 3.5.0alpha2-60-g516ee8635

git at osgeo.org git at osgeo.org
Sat Sep 14 20:19:11 PDT 2024


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  516ee8635976411552f724b9911d86d70bd31644 (commit)
      from  5aba84713102a23d8755d1df3f56c277e1dff6b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 516ee8635976411552f724b9911d86d70bd31644
Author: Regina Obe <lr at pcorp.us>
Date:   Sat Sep 14 23:01:22 2024 -0400

    Prepping for 3.5.0beta1 release

diff --git a/NEWS b/NEWS
index acb4fbb67..dc230ff46 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-PostGIS 3.5.0
-2024/xx/xx
+PostGIS 3.5.0beta1
+2024/09/1x
 
 To take advantage of all postgis_sfcgal extension features SFCGAL 1.5 is needed.
 PostgreSQL 12-17 required. GEOS 3.8+ required. Proj 6.1+ required. 
diff --git a/README.postgis b/README.postgis
index 1611e5b72..1429dc454 100644
--- a/README.postgis
+++ b/README.postgis
@@ -1,8 +1,8 @@
 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================
 
-:Version: 3.5.0alpha1
-:Date: 2024-07-04
+:Version: 3.5.0beta1
+:Date: 2024-09-16
 :Website: https://postgis.net
 
 This distribution contains a module which implements GIS simple features, ties
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index f6c737f0b..a3d2a346b 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -57,12 +57,21 @@ fi
 
 sh autogen.sh
 
+# excluding topology cause it's erroring out on some tests
+EXTRA_CONFIGURE_ARGS="${EXTRA_CONFIGURE_ARGS} --without-topology"
+
+if [ $PG_VER == "17" ]; then
+  #skipping raster cause it's failing on cunit when building with new chain
+  EXTRA_CONFIGURE_ARGS="${EXTRA_CONFIGURE_ARGS} --without-raster"
+fi;
+
 if [ -n "$PCRE_VER" ]; then
     export PATH="${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
 fi
 
-
-if [[ "${INCLUDE_MINOR_LIB}" == "1" ]] ; then
+if [$INCLUDE_MINOR_LIB == "1"]; then
+  EXTRA_CONFIGURE_ARGS="${EXTRA_CONFIGURE_ARGS} --with-library-minor-version"
+fi
 
 #CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include" \
 #CFLAGS="-Wall -fno-omit-frame-pointer"
@@ -79,20 +88,7 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/lib -L${PROJECTS
   --with-gui --with-gettext=no \
   --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
   --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} --with-library-minor-version \
-  --without-topology
-  #exit
-else
-LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${LZ4_PATH}/bin -L${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib" \
-./configure \
-  --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config  \
-  --with-pgconfig=${PGPATH}/bin/pg_config \
-  --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
-  --with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
-  --with-gui --with-gettext=no \
-  --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
-  --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} \
-  --without-topology
-fi;
+  ${EXTRA_CONFIGURE_ARGS}
 
 
 #make distclean
diff --git a/ci/winnie/winnie_common.sh b/ci/winnie/winnie_common.sh
index c15a8d72b..7676de260 100644
--- a/ci/winnie/winnie_common.sh
+++ b/ci/winnie/winnie_common.sh
@@ -12,8 +12,8 @@ export MSYS2_ARG_CONV_EXCL=/config/tags
 export XML_CATALOG_FILES="/projects/docbook/docbook-5.0.1/catalog.xml"
 
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.13
-	export GDAL_VER=3.8.5
+	export GEOS_VER=3.13.0
+	export GDAL_VER=3.9.2
 	export PROJ_VER=8.2.1
 	export SFCGAL_VER=1.5.1
 	export CGAL_VER=5.6.1
@@ -46,6 +46,13 @@ fi;
 
 echo "ICON_VER ${ICON_VER}"
 
+if  [[ "${LZ4_VER}" == '' ]] ; then
+  export LZ4_VER=1.9.3
+fi;
+
+echo "LZ4_VER ${LZ4_VER}"
+
+
 #set to something even if override is on but not set
 if  [[ "${ZLIB_VER}" == '' ]] ; then
   export ZLIB_VER=1.2.13
@@ -53,7 +60,7 @@ fi;
 
 #set to something even if override is on but not set
 if  [[ "${LIBXML_VER}" == '' ]] ; then
-  export LIBXML_VER=2.9.14
+  export LIBXML_VER=2.12.5
 fi;
 
 #set to something even if override is on but not set
diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
index 542d07a00..a34f736de 100644
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -105,5 +105,4 @@ UPGRADEABLE_VERSIONS = \
 	3.4.2 \
 	3.4.3 \
 	3.4.4dev \
-	3.5.0alpha1 \
 	3.5.0alpha2

-----------------------------------------------------------------------

Summary of changes:
 NEWS                               |  4 ++--
 README.postgis                     |  4 ++--
 ci/winnie/regress_postgis.sh       | 28 ++++++++++++----------------
 ci/winnie/winnie_common.sh         | 13 ++++++++++---
 extensions/upgradeable_versions.mk |  1 -
 5 files changed, 26 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list