[SCM] PostGIS branch stable-3.3 updated. 3.3.10-87-g27f4d3304
git at osgeo.org
git at osgeo.org
Fri Jul 24 03:11:03 PDT 2026
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, stable-3.3 has been updated
via 27f4d3304b832ba82ef257b4412d9142be47c132 (commit)
via 6a0ff1711d61853d52ee82a7c7de89620a8f38d9 (commit)
from dd5f18e59eb69953a625ebce5c13889856df2540 (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 27f4d3304b832ba82ef257b4412d9142be47c132
Merge: dd5f18e59 6a0ff1711
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Fri Jul 24 03:11:02 2026 -0700
Merge pull request 'Fix PostgreSQL 19 SFCGAL builds on stable 3.3' (!498) from Komzpa/postgis:fix/sfcgal-pqsignal-stable33-20260724 into stable-3.3
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/498
commit 6a0ff1711d61853d52ee82a7c7de89620a8f38d9
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Jul 24 12:44:55 2026 +0400
Fix PostgreSQL 19 SFCGAL builds
Backpatch the SFCGAL part of 0b003a82991bf05022ab1b924b5f8e1e407cd043 to avoid relying on pqsignal() returning the previous handler. New PostgreSQL headers expose pqsignal() as void, which breaks Worker_Run builds on older stable branches.
References https://trac.osgeo.org/postgis/ticket/5841
diff --git a/NEWS b/NEWS
index dedcfa402..08f31397d 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ PostGIS 3.3.11
- GH-895, Qualify pg_class lookup during SRID/PROJ validation
(Darafei Praliaskouski)
- Fix PostgreSQL 19 GeoJSON output builds (Regina Obe)
+ - Fix PostgreSQL 19 SFCGAL builds (Paul Ramsey)
- GH-897, [topology] Harden topology helper functions and
maintenance SQL against identifier, tolerance, bigint, and cleanup
regressions (Darafei Praliaskouski)
diff --git a/sfcgal/lwgeom_sfcgal.c b/sfcgal/lwgeom_sfcgal.c
index 041f9d034..215e2202a 100644
--- a/sfcgal/lwgeom_sfcgal.c
+++ b/sfcgal/lwgeom_sfcgal.c
@@ -32,22 +32,12 @@
#include "utils/elog.h"
#include "utils/guc.h"
-#include "libpq/pqsignal.h"
#include "../liblwgeom/liblwgeom.h"
/*
* This is required for builds against pgsql
*/
PG_MODULE_MAGIC;
-#ifdef WIN32
-static void interruptCallback() {
- if (UNBLOCKED_SIGNAL_QUEUE())
- pgwin32_dispatch_queued_signals();
-}
-#endif
-
-static pqsigfunc coreIntHandler = 0;
-static void handleInterrupt(int sig);
/*
* Module load callback
@@ -56,16 +46,8 @@ void _PG_init(void);
void
_PG_init(void)
{
-
- coreIntHandler = pqsignal(SIGINT, handleInterrupt);
-
-#ifdef WIN32
- GEOS_interruptRegisterCallback(interruptCallback);
- lwgeom_register_interrupt_callback(interruptCallback);
-#endif
-
- /* install PostgreSQL handlers */
- pg_install_lwgeom_handlers();
+ /* install PostgreSQL handlers */
+ pg_install_lwgeom_handlers();
}
/*
@@ -75,27 +57,7 @@ void _PG_fini(void);
void
_PG_fini(void)
{
- elog(NOTICE, "Goodbye from PostGIS SFCGAL %s", POSTGIS_VERSION);
- pqsignal(SIGINT, coreIntHandler);
-}
-
-
-static void
-handleInterrupt(int sig)
-{
- /* NOTE: printf here would be dangerous, see
- * https://trac.osgeo.org/postgis/ticket/3644
- *
- * TODO: block interrupts during execution, to fix the problem
- */
- /* printf("Interrupt requested\n"); fflush(stdout); */
-
- /* request interruption of liblwgeom as well */
- lwgeom_request_interrupt();
-
- if ( coreIntHandler ) {
- (*coreIntHandler)(sig);
- }
+ elog(NOTICE, "Goodbye from PostGIS SFCGAL %s", POSTGIS_VERSION);
}
Datum postgis_sfcgal_version(PG_FUNCTION_ARGS);
@@ -731,4 +693,3 @@ Datum sfcgal_optimalalphashape(PG_FUNCTION_ARGS)
PG_RETURN_POINTER(output);
#endif
}
-
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
sfcgal/lwgeom_sfcgal.c | 45 +++------------------------------------------
2 files changed, 4 insertions(+), 42 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list