From 8f4b7cd443435524fcde045b17d79242ddec4e30 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Fri, 15 Mar 2024 12:42:37 +0000 Subject: [PATCH] postgresql: bump to 16.2 --- packages/postgresql/build.sh | 4 +-- .../src-backend-utils-adt-xml.c.patch | 29 ------------------- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 packages/postgresql/src-backend-utils-adt-xml.c.patch diff --git a/packages/postgresql/build.sh b/packages/postgresql/build.sh index b91af75a86..7d89b2c92f 100644 --- a/packages/postgresql/build.sh +++ b/packages/postgresql/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Object-relational SQL database" TERMUX_PKG_LICENSE="PostgreSQL" TERMUX_PKG_LICENSE_FILE="COPYRIGHT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="16.1" +TERMUX_PKG_VERSION="16.2" TERMUX_PKG_SRCURL=https://ftp.postgresql.org/pub/source/v$TERMUX_PKG_VERSION/postgresql-$TERMUX_PKG_VERSION.tar.bz2 -TERMUX_PKG_SHA256=ce3c4d85d19b0121fe0d3f8ef1fa601f71989e86f8a66f7dc3ad546dd5564fec +TERMUX_PKG_SHA256=446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952 TERMUX_PKG_DEPENDS="libandroid-execinfo, libandroid-shmem, libicu, libuuid, libxml2, openssl, readline, zlib" # - pgac_cv_prog_cc_LDFLAGS_EX_BE__Wl___export_dynamic: Needed to fix PostgreSQL 16 that # causes initdb failure: cannot locate symbol diff --git a/packages/postgresql/src-backend-utils-adt-xml.c.patch b/packages/postgresql/src-backend-utils-adt-xml.c.patch deleted file mode 100644 index 241326576d..0000000000 --- a/packages/postgresql/src-backend-utils-adt-xml.c.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fixes the following error - -/home/builder/.termux-build/postgresql/src/src/backend/utils/adt/xml.c:1177:45: error: incompatible function pointer types passing 'void (void *, xmlErrorPtr)' (aka 'void (void *, struct _xmlError *)') to parameter of type 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const struct _xmlError *)') [-Wincompatible-function-pointer-types] - xmlSetStructuredErrorFunc((void *) errcxt, xml_errorHandler); - ^~~~~~~~~~~~~~~~ -/data/data/com.termux/files/usr/include/libxml2/libxml/xmlerror.h:898:29: note: passing argument to parameter 'handler' here - xmlStructuredErrorFunc handler); - ^ - ---- a/src/backend/utils/adt/xml.c -+++ b/src/backend/utils/adt/xml.c -@@ -123,7 +123,7 @@ - xmlParserCtxtPtr ctxt); - static void xml_errsave(Node *escontext, PgXmlErrorContext *errcxt, - int sqlcode, const char *msg); --static void xml_errorHandler(void *data, xmlErrorPtr error); -+static void xml_errorHandler(void *data, const struct _xmlError *error); - static int errdetail_for_xml_code(int code); - static void chopStringInfoNewlines(StringInfo str); - static void appendStringInfoLineSeparator(StringInfo str); -@@ -2002,7 +2002,7 @@ - * Error handler for libxml errors and warnings - */ - static void --xml_errorHandler(void *data, xmlErrorPtr error) -+xml_errorHandler(void *data, const struct _xmlError *error) - { - PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data; - xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt;