making it work

Author: chensjlv

build.gradle

@@ -78,8 +78,7 @@ def repackedPlatforms = [
         ['name':'windows', 'arch':'amd64']
 ]
 
-if (pgMajorVersionParam > 14
-        || (pgMajorVersionParam == 14 && pgMinorVersionParam >= 1)) {
+if (pgMajorVersionParam >= 13) {
     repackedPlatforms << ['name':'darwin', 'arch':'arm64v8']
 }
 

build_and_release.sh

@@ -14,7 +14,7 @@ function do_build {
     cp repacked-platforms/build/tmp/buildAmd64DarwinBundle/bundle/postgres-darwin-x86_64.txz "release/postgresql-${version}-darwin-amd64.txz"
     cp repacked-platforms/build/tmp/buildArm64v8DarwinBundle/bundle/postgres-darwin-arm_64.txz "release/postgresql-${version}-darwin-arm64.txz"
 
-    ./gradlew clean install -Pversion="${version}.0" -PpgVersion="${version}" -ParchName=amd64
+    ./gradlew clean install -Pversion="${version}.0" -PpgVersion="${version}" -ParchName=amd64 -PpostgisVersion=3.4.0
     cp custom-debian-platform/build/tmp/buildCustomDebianBundle/bundle/postgres-linux-debian.txz "release/postgresql-${version}-linux-amd64.txz"
 }
 
@@ -26,7 +26,7 @@ function do_release {
     gh release create "${release_name}" --notes "${sums}" --title "" release/postgresql-${version}-*
 }
 
-for version in "14.10" "15.5" "16.1"; do
+for version in "13.14" "14.11" "15.6" "16.2"; do
     do_build "$version"
     do_release "$version"
 done

scripts/build-postgres-debian.sh

@@ -36,10 +36,10 @@ docker run -i --rm -v ${TRG_DIR}:/usr/local/pg-dist \
 -e PG_VERSION=$PG_VERSION \
 -e POSTGIS_VERSION=$POSTGIS_VERSION \
 -e ICU_ENABLED=$ICU_ENABLED \
--e PROJ_VERSION=6.0.0 \
+-e PROJ_VERSION=8.2.1 \
 -e PROJ_DATUMGRID_VERSION=1.8 \
--e GEOS_VERSION=3.7.2 \
--e GDAL_VERSION=2.4.1 \
+-e GEOS_VERSION=3.8.3 \
+-e GDAL_VERSION=3.4.3 \
 $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binaries" \
     && sed "[email protected]@us.archive.ubuntu.com@" -i /etc/apt/sources.list \
     && ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime && echo "Etc/UTC" > /etc/timezone \
@@ -100,7 +100,7 @@ $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binari
     && make -C contrib install \
     \
     && if [ -n "$POSTGIS_VERSION" ]; then \
-      apt-get install -y --no-install-recommends curl libjson-c-dev libsqlite3-0 libsqlite3-dev sqlite3 unzip \
+      apt-get install -y --no-install-recommends curl libjson-c-dev libsqlite3-0 libsqlite3-dev libtiff5-dev libcurl4-openssl-dev sqlite3 unzip \
       && mkdir -p /usr/src/proj \
         && curl -sL "https://download.osgeo.org/proj/proj-$PROJ_VERSION.tar.gz" | tar -xzf - -C /usr/src/proj --strip-components 1 \
         && cd /usr/src/proj \
@@ -124,7 +124,7 @@ $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binari
         && cd /usr/src/gdal \
         && curl -sL "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=b8ee5f79949d1d40e8820a774d813660e1be52d3" > config.guess \
         && curl -sL "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=b8ee5f79949d1d40e8820a774d813660e1be52d3" > config.sub \
-        && ./configure --disable-static --prefix=/usr/local/pg-build \
+        && ./configure --disable-static --prefix=/usr/local/pg-build --with-proj=/usr/local/pg-build \
         && make -j$(nproc) \
         && make install \
       && mkdir -p /usr/src/postgis \
@@ -138,6 +138,7 @@ $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binari
             --with-geosconfig=/usr/local/pg-build/bin/geos-config \
             --with-projdir=/usr/local/pg-build \
             --with-gdalconfig=/usr/local/pg-build/bin/gdal-config \
+            --without-protobuf \
         && make -j$(nproc) \
         && make install \
     ; fi \