diff --git a/Firebird-4.0.0.2496-0.tar.xz b/Firebird-4.0.5.3140-0.tar.xz similarity index 83% rename from Firebird-4.0.0.2496-0.tar.xz rename to Firebird-4.0.5.3140-0.tar.xz index f63b909ac95764cebd9a0272a2c9940186e49cb5..9c3c712b209d133eeed5b3f6e145a876e94598e6 100644 Binary files a/Firebird-4.0.0.2496-0.tar.xz and b/Firebird-4.0.5.3140-0.tar.xz differ diff --git a/cloop-honour-build-flags.patch b/cloop-honour-build-flags.patch index b854300a70fe820df5bfbff21f0159a69cdc23bc..6d554879aa4ae9c1c1fba9275e434b3b5d90d5f5 100644 --- a/cloop-honour-build-flags.patch +++ b/cloop-honour-build-flags.patch @@ -11,16 +11,16 @@ index 08516c2..1573dc2 100644 SRC_DIR := src BUILD_DIR := build -@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$(wildcard $(sdir)/*.cpp)) +@@ -27,8 +27,9 @@ OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C)) OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP)) -C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter --CXX_FLAGS := $(C_FLAGS) +-CXX_FLAGS := $(C_FLAGS) -std=c++11 +COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter +C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS) -+CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) - FPC_FLAGS := -Mdelphi ++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) -std=c++11 + FPC_FLAGS := -Mdelphi -Cg ifeq ($(shell uname),FreeBSD) diff --git a/extern/btyacc/Makefile b/extern/btyacc/Makefile diff --git a/firebird.spec b/firebird.spec index 6b0d46163b8f0ddeb918f22dc87a8d7598d10098..deac11064646359dac6e72adf64fe2f534f6f371 100644 --- a/firebird.spec +++ b/firebird.spec @@ -1,5 +1,5 @@ %define anolis_release 1 -%global upversion 4.0.0.2496 +%global upversion 4.0.5.3140 %global pkgversion Firebird-%{upversion}-0 %global major 4.0 @@ -17,7 +17,7 @@ Summary: SQL relational database management system License: Interbase URL: http://www.firebirdsql.org/ -Source0: https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/%{pkgversion}.tar.xz +Source0: https://github.com/FirebirdSQL/firebird/releases/download/v4.0.5/%{pkgversion}.tar.xz Source1: firebird-logrotate Source2: README.Fedora Source3: firebird.service @@ -372,6 +372,9 @@ fi %changelog +* Mon Aug 26 2024 songmingliang - 4.0.5.3140-1.1 +- update to Firebird-4.0.5.3140-0 + * Thu Jan 18 2024 yangxianzhao - 4.0.0.2496-1.1 - add loongarch support diff --git a/no-copy-from-icu.patch b/no-copy-from-icu.patch index 7f84e0b06add2334e07de81520ef568d00ffb5f5..22a8b40ca9121540435189fe3d2bdac9dc4f270b 100644 --- a/no-copy-from-icu.patch +++ b/no-copy-from-icu.patch @@ -1,12 +1,11 @@ diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in -index bb4ceb1..87e75a2 100644 ---- a/builds/posix/Makefile.in -+++ b/builds/posix/Makefile.in -@@ -534,7 +534,7 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB) +--- a/builds/posix/Makefile.in 2024-08-08 16:59:40.000000000 +0800 ++++ b/builds/posix/Makefile.in 2024-08-26 16:27:26.340664464 +0800 +@@ -550,7 +550,7 @@ isql: $(ISQL) $(ISQL): $(ISQL_Objects) $(COMMON_LIB) -- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..) +- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) + $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) $(ICU_LIBS) $(call LINK_DARWIN_RPATH,..) nbackup: $(NBACKUP)