download.lst | 4 ++--
external/postgresql/postgres-msvc-build.patch.1 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit e4e2c7ca00151b27c8928f785af1845f918ed721
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Jun 11 17:05:14 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jun 11 18:33:09 2024 +0200
postgresql: Upgrade to 14.12 (master only)
Postgres 13 will reach the EOL in November 13, 2025
https://www.postgresql.org/support/versioning/ so upgrade it
now after the creation of the libreoffice-24-8 branch towards
LibreOffice 25.2
Downloaded from
https://ftp.postgresql.org/pub/source/v14.12/postgresql-14.12.tar.bz2
Change-Id: I1f78f682ef14b486a98912ed23a08163d819837e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168687
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 944601fee9a4..ae94ea3a24a1 100644
--- a/download.lst
+++ b/download.lst
@@ -550,8 +550,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POSTGRESQL_SHA256SUM :=
42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925
-POSTGRESQL_TARBALL := postgresql-13.15.tar.bz2
+POSTGRESQL_SHA256SUM :=
6118d08f9ddcc1bd83cf2b7cc74d3b583bdcec2f37e6245a8ac003b8faa80923
+POSTGRESQL_TARBALL := postgresql-14.12.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/postgresql/postgres-msvc-build.patch.1
b/external/postgresql/postgres-msvc-build.patch.1
index dec31742238e..161ea7e91daf 100644
--- a/external/postgresql/postgres-msvc-build.patch.1
+++ b/external/postgresql/postgres-msvc-build.patch.1
@@ -33,7 +33,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32,
and why even check
libraries => [],
--- postgresql/src/tools/msvc/Solution.pm.orig 2021-01-19 18:03:04.594229100
+0100
+++ postgresql/src/tools/msvc/Solution.pm 2021-01-19 18:04:13.677610100
+0100
-@@ -59,7 +59,7 @@
+@@ -62,7 +62,7 @@
{
my $self = shift;
@@ -41,7 +41,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32,
and why even check
+ if (1) #($^O eq "MSWin32")
{
# Examine CL help output to determine if we are in 32 or 64-bit
mode.
- my $output = `cl /? 2>&1`;
+ my $output = `cl /help 2>&1`;
@@ -1100,7 +1100,7 @@
}
if ($fld ne "")
