Refactor patches

compute/compute-node.Dockerfile

@@ -258,7 +258,6 @@ RUN case "${DEBIAN_VERSION}" in \
 
 # Postgis 3.5.0 supports v17
 WORKDIR /ext-src
-COPY compute/patches/postgis_pg${PG_VERSION}.patc? /ext-src
 RUN case "${PG_VERSION:?}" in \
     "v17") \
         export POSTGIS_VERSION=3.5.0 \
@@ -274,7 +273,7 @@ RUN case "${PG_VERSION:?}" in \
     esac && \
     wget https://download.osgeo.org/postgis/source/postgis-${POSTGIS_VERSION}.tar.gz -O postgis.tar.gz && \
     echo "${POSTGIS_CHECKSUM} postgis.tar.gz" | sha256sum --check && \
-    mkdir postgis-src && cd postgis-src && tar xzf ../postgis.tar.gz --strip-components=1 -C . && [ -f ../postgis_pg${PG_VERSION}.patch ] && patch -p1 <../postgis_pg${PG_VERSION}.patch
+    mkdir postgis-src && cd postgis-src && tar xzf ../postgis.tar.gz --strip-components=1 -C .
 
 # This is reused for pgrouting
 FROM pg-build AS postgis-build-deps

compute/patches/postgis_pg17.patch

@@ -1,14 +0,0 @@
-diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
-index 3dd65b9..2735398 100644
---- a/regress/core/tests.mk.in
-+++ b/regress/core/tests.mk.in
-@@ -143,8 +143,7 @@ TESTS += \
- 	$(top_srcdir)/regress/core/oriented_envelope \
- 	$(top_srcdir)/regress/core/point_coordinates \
- 	$(top_srcdir)/regress/core/out_geojson \
--  $(top_srcdir)/regress/core/wrapx \
--	$(top_srcdir)/regress/core/computed_columns
-+        $(top_srcdir)/regress/core/wrapx
- 
- # Slow slow tests
- TESTS_SLOW = \

docker-compose/ext-src/postgis-src/neon-test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 set -ex
 cd "$(dirname "$0")"
+sed -i '/computed_columns/d' regress/core/tests.mk
 make installcheck-base