Revert "Revert "Update firebird to version 2.5.4""

This reverts commit 69632c9c.

Change-Id: I4704c30ade878b9e62ac829b03648f301534b51c
Reviewed-on: https://gerrit.libreoffice.org/16986Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

download.lst

@@ -39,8 +39,8 @@ export ETONYEK_MD5SUM := e5947373dd7834f27e93f1636faa419f
 export ETONYEK_VERSION_MICRO := 3
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
-export FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5
-export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2
+export FIREBIRD_MD5SUM := 7a17ec9889424b98baa29e001a054434
+export FIREBIRD_TARBALL := Firebird-2.5.4.26856-0.tar.bz2
 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
 # export FIREBIRD_TARBALL := Firebird-3.0-alpha1-20130302.tar.gz
 export FONTCONFIG_TARBALL := 77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz

external/firebird/ExternalPackage_firebird.mk

@@ -14,9 +14,9 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
 else ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.4))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.4))
 endif
 
 $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/firebird/firebird.msg))

external/firebird/ExternalProject_firebird.mk

@@ -63,6 +63,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 		   $(MAKE) firebird_embedded \
 		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
 			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
-			$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \
+			$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.4) \
 	)
 # vim: set noet sw=4 ts=4:

external/firebird/UnpackedTarball_firebird.mk

@@ -12,11 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,firebird))
 $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	external/firebird/firebird-icu.patch.1 \
 	external/firebird/firebird-rpath.patch.0 \
 	external/firebird/firebird-c++11.patch.1 \
 	external/firebird/firebird-c++11replfn.patch.0 \
-	external/firebird/firebird-no-open-temp-on-shutdown.patch.1 \
         external/firebird/firebird.disable-ib-util-not-found.patch.1 \
 ))
 
@@ -30,6 +28,7 @@ endif
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 	external/firebird/firebird-macosx.patch.1 \
+	external/firebird/firebird-configure-x86-64-macosx.patch.1 \
 ))
 endif
 # vim: set noet sw=4 ts=4:

external/firebird/firebird-configure-x86-64-macosx.patch.1

+--- firebird.org/configure	2015-03-27 16:00:42.000000000 +0200
++++ firebird/configure	2015-06-09 15:33:26.000000000 +0300
+@@ -2373,7 +2373,7 @@
+     ;;
+ 
+   i*86-*-darwin* | i*86_*-darwin*)
+-    MAKEFILE_PREFIX=darwin_i386
++    MAKEFILE_PREFIX=darwin_x86_64
+     MAKEFILE_POSTFIX=darwin
+     PLATFORM=DARWIN
+     INSTALL_PREFIX=darwin
+@@ -2386,7 +2386,7 @@
+     EDITLINE_FLG=Y
+     SHRLIB_EXT=dylib
+     ICU_PLATFORM=MacOSX
+-    CPU_TYPE=i386
++    CPU_TYPE=x86_64
+     ;;
+ 
+   powerpc-*-darwin*)

external/firebird/firebird-cygwin-msvc.patch.1

@@ -422,9 +422,10 @@ unchanged:
  
 -case "$target" in
 +case "$host" in
-   i*86-*-darwin*)
- dnl    MAKEFILE_PREFIX=darwin_i386
+   x*64-*-darwin* | x*64_*-darwin*)
      MAKEFILE_PREFIX=darwin_x86_64
+     MAKEFILE_POSTFIX=darwin
+
 @@ -112,7 +86,7 @@
  
    amd64-*-freebsd* | x86_64*-*-freebsd* | x86_64*-*-k*bsd*-gnu)
@@ -483,8 +484,8 @@ unchanged:
  [AC_DEFINE(WORKING_SEM_INIT,1,[Define this if sem_init() works on the platform])
  AC_MSG_RESULT(yes)],
  [AC_MSG_RESULT(no)
--AC_SEARCH_LIBS(sem_open, rt)])
-+AC_SEARCH_LIBS(sem_open, rt)],
+-AC_SEARCH_LIBS(sem_open, rt pthread)])
++AC_SEARCH_LIBS(sem_open, rt pthread)]),
 +[AC_DEFINE(WORKING_SEM_INIT,1,[Define this if sem_init() works on the platform])
 +AC_MSG_RESULT(cross-compiling, assuming yes)])
  fi
@@ -659,15 +660,15 @@ unchanged:
  #include <io.h> // umask, close, lseek, read, open, _sopen
  #include <process.h>
  #include <sys/types.h>
-@@ -121,7 +123,7 @@
- 
+@@ -122,7 +124,7 @@
  #ifdef WIN_NT
  #include <shlobj.h>
+ #if _MSC_VER <= 1500
 -#include <shfolder.h>
 +//#include <shfolder.h>
+ #endif
  #define _WINSOCKAPI_
  #include <share.h>
- #include "err_proto.h"
 unchanged:
 --- firebird.org/src/jrd/isc.cpp	2013-06-26 10:05:24.922009300 +0100
 +++ firebird/src/jrd/isc.cpp	2013-06-29 10:38:56.698423800 +0100
@@ -714,14 +715,12 @@ unchanged:
 unchanged:
 --- firebird.org/src/jrd/os/win32/mod_loader.cpp	2013-06-26 10:05:25.006951300 +0100
 +++ firebird/src/jrd/os/win32/mod_loader.cpp	2013-06-27 18:30:42.642374700 +0100
-@@ -93,6 +93,10 @@
-                     "msvcr80.dll",
- #elif _MSC_VER == 1500
+@@ -95,6 +95,8 @@
                      "msvcr90.dll",
-+#elif _MSC_VER == 1600
-+					"mscvr100.dll",
+ #elif _MSC_VER == 1600
+                     "msvcr100.dll",
 +#elif _MSC_VER == 1700
-+					"mscvr110.dll",
++                    "msvcr110.dll",
  #else
                      #error Specify CRT DLL name here !
  #endif

external/firebird/firebird-icu.patch.1

-diff -ur firebird.org/builds/posix/Makefile.in.examples firebird/builds/posix/Makefile.in.examples
---- firebird.org/builds/posix/Makefile.in.examples	2013-06-21 20:47:17.047657633 +0100
-+++ firebird/builds/posix/Makefile.in.examples	2013-06-21 21:01:45.297638456 +0100
-@@ -53,10 +53,10 @@
- export PATH
- 
- ifeq ($(PLATFORM),DARWIN)
--DYLD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
-+DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib
- export DYLD_LIBRARY_PATH
- else
--LD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib
-+LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib
- export LD_LIBRARY_PATH
- endif
- GPRE_FLAGS=	-r -m -z -n
-diff -ur firebird.org/builds/posix/Makefile.in.firebird firebird/builds/posix/Makefile.in.firebird
---- firebird.org/builds/posix/Makefile.in.firebird	2013-06-21 20:47:17.060657632 +0100
-+++ firebird/builds/posix/Makefile.in.firebird	2013-06-21 21:12:00.559624868 +0100
-@@ -44,7 +44,7 @@
- TEST_PATH = @FIREBIRD_BUILD_DIR@
- # Firebird libs path set at link time (-R) so do not override local requirements - nmcc 28/12/2002
- #LD_LIBRARY_PATH=$(RealFirebirdPath)/lib
--LD_LIBRARY_PATH=$(LIB)
-+LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(LIB)
- 
- #export ISC_USER
- #export ISC_PASSWORD

external/firebird/firebird-macosx.patch.1

@@ -21,7 +21,7 @@
 +PLAT_CLASSIC_POST_TARGET=
  
 -PLAT_SUPER_PRE_TARGET=darwin_setup_framework
--PLAT_SUPER_POST_TRAGET=darwin_finish_ss_framework
+-PLAT_SUPER_POST_TARGET=darwin_finish_ss_framework
 +PLAT_SUPER_PRE_TARGET=
 +PLAT_SUPER_POST_TRAGET=
  
@@ -65,7 +65,7 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.
  	mkdir -p $(FB_FW)/Resources/doc
 --- firebird.org/builds/posix/prefix.darwin_i386
 +++ firebird/builds/posix/prefix.darwin_i386
-@@ -19,7 +19,7 @@
+@@ -24,7 +24,7 @@
  # 4. for  CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386'
  # 5. export MACOSX_DEPLOYMENT_TARGET=10.6
  
@@ -74,17 +74,19 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.
  export DYLD_LIBRARY_PATH
  
  MACOSX_DEPLOYMENT_TARGET=10.6
-@@ -32,8 +32,8 @@
+@@ -32,9 +32,9 @@
  
  OS_ServerFiles=inet_server.cpp
  
 -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.6
 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6
+-CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
 +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
 +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
- CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
  EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
  CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
+ 	fbtracemgr
 --- firebird.org/builds/posix/prefix.darwin_x86_64
 +++ firebird/builds/posix/prefix.darwin_x86_64
 @@ -19,7 +19,7 @@

external/firebird/firebird-vs2013.patch.1

-# -*- Mode: Diff -*-
---- firebird/src/jrd/os/win32/mod_loader.cpp
-+++ firebird/src/jrd/os/win32/mod_loader.cpp
+--- firebird/src/jrd/os/win32/mod_loader.cpp.orig       2015-06-05 07:18:34.639613335 +0300
++++ firebird/src/jrd/os/win32/mod_loader.cpp    2015-06-05 07:41:08.383489041 +0300
 @@ -97,6 +97,8 @@
- 					"mscvr100.dll",
+                     "msvcr100.dll",
  #elif _MSC_VER == 1700
- 					"mscvr110.dll",
+                     "msvcr110.dll",
 +#elif _MSC_VER == 1800
-+					"mscvr120.dll",
++                     "mscvr120.dll",
  #else
                      #error Specify CRT DLL name here !
  #endif