diff --git a/download.lst b/download.lst index c166c62e0d52..4718572d92c0 100644 --- a/download.lst +++ b/download.lst @@ -121,8 +121,8 @@ EXPAT_TARBALL := expat-2.8.4.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -FIREBIRD_SHA256SUM := bd263c4f685fb8fc3f1dcb8be8a411033cc31c5404d1dfce5d3849aa3f63a64d -FIREBIRD_TARBALL := Firebird-3.0.13.33818-0.tar.bz2 +FIREBIRD_SHA256SUM := dce3f26c0f015b3c40f36085f8cc21de58dd568e0f347fdd0fcc7942deda8cff +FIREBIRD_TARBALL := Firebird-3.0.14.33856-0.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 33416eea12fe..c6271652db46 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -16,11 +16,11 @@ $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient. $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/Engine12.dll,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/Engine12.dll)) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/intl/fbintl.dll,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/intl/fbintl.dll)) else ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.dylib.3.0.13,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.13)) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.dylib.3.0.14,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.14)) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.dylib,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib)) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/intl/libfbintl.dylib,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/intl/libfbintl.dylib)) else ifeq ($(DISABLE_DYNLOADING),) -$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.so.2,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.so.3.0.13)) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.so.2,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.so.3.0.14)) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.so,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.so)) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/intl/libfbintl.so,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/intl/libfbintl.so)) endif diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 140a6624484f..aff91097d20a 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\ )) firebird_BUILDDIR = $(EXTERNAL_WORKDIR)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird -firebird_VERSION := 3.0.13 +firebird_VERSION := 3.0.14 $(call gb_ExternalProject_get_state_target,firebird,build): $(call gb_Trace_StartRange,firebird,EXTERNAL) diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 42bec1e356c1..46364a2e8ec7 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -47,7 +47,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1 \ external/firebird/msvc.patch \ external/firebird/wnt-per-process-trace-storage.patch.1 \ - external/firebird/configure-c99.patch \ external/firebird/Wincompatible-function-pointer-types.patch \ external/firebird/0001-Revert-Backported-fix-for-7122-Invalid-state-of-mapp.patch.1 \ external/firebird/0001-Revert-Fix-for-most-cases-of-7522-7828.patch.1 \ diff --git a/external/firebird/configure-c99.patch b/external/firebird/configure-c99.patch deleted file mode 100644 index 3b5569b8c7c1..000000000000 --- a/external/firebird/configure-c99.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- configure -+++ configure -@@ -20687,8 +20687,9 @@ - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+#include - #include -- main () { -+ int main () { - sem_t s; - return sem_init(&s,0,0); - } -@@ -21432,8 +21433,9 @@ - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+#include - #include -- main () { -+ int main () { - return !(sizeof(off_t) == 8); - } - _ACEOF -@@ -21647,8 +21649,9 @@ - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+#include - #include --main () { -+int main () { - struct s { - char a; - union { long long x; sem_t y; } b; -@@ -21683,7 +21686,8 @@ - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --main () { -+#include -+int main () { - struct s { - char a; - double b; diff --git a/external/firebird/firebird-cygwin-msvc.patch b/external/firebird/firebird-cygwin-msvc.patch index 02b9efae6b4e..5a7faf051d9a 100644 --- a/external/firebird/firebird-cygwin-msvc.patch +++ b/external/firebird/firebird-cygwin-msvc.patch @@ -29,10 +29,10 @@ --- configure 2023-11-11 02:44:14.576802800 +0900 +++ configure 2023-11-11 02:59:09.005211200 +0900 -@@ -21650,11 +21650,10 @@ +@@ -21674,11 +21674,10 @@ + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include -#include int main () { struct s {