[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/firebird

[Julien Nabet]

 external/firebird/UnpackedTarball_firebird.mk                |    1 
 external/firebird/firebird.disable-ib-util-not-found.patch.1 |   19 +++++++++++
 2 files changed, 20 insertions(+)

New commits:
commit 3c2dd3d5b94c6bfa2dc1c87b3f45562f60b41136
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Jan 23 22:28:55 2015 +0100

    Resolves fdo#72543: ib_util not found when creating or accessing new firebird
    
    ... embedded database
    See https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8
    and https://bugs.freedesktop.org/show_bug.cgi?id=72543#c13
    
    Change-Id: I299ab193333f43ff9aa87362adf76d3a362279fc
    Reviewed-on: https://gerrit.libreoffice.org/14146
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    (cherry picked from commit e3c0025461bdf55e62a308a76c3aa0a35109f076)
    Reviewed-on: https://gerrit.libreoffice.org/14149
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 4e3aec4..ee29b09 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 	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 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird.disable-ib-util-not-found.patch.1 b/external/firebird/firebird.disable-ib-util-not-found.patch.1
new file mode 100644
index 0000000..c0c4bb6
--- /dev/null
+++ b/external/firebird/firebird.disable-ib-util-not-found.patch.1
@@ -0,0 +1,19 @@
+--- firebird.org/src/jrd/fun.epp	2015-01-23 22:11:26.751475044 +0100
++++ firebird/src/jrd/fun.epp	2015-01-23 22:16:42.507322568 +0100
+@@ -160,10 +160,14 @@
+ 	if (tryLibrary(LIBNAME, message[3]))
+ 		return;
+ 
++        /* fdo#72543: quote from https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8
++           "we don't need UDF support for embedded firebird,
++             hence the lack of ib_util isn't an issue and can safely be ignored"
+ 	// all failed - log error
+ 	gds__log("ib_util init failed, UDFs can't be used - looks like firebird misconfigured\n"
+ 			 "\t%s\n\t%s\n\t%s\n\t%s", message[0].c_str(), message[1].c_str(),
+ 									   message[2].c_str(), message[3].c_str());
++        */
+ #endif	// !BOOT_BUILD
+ }
+ 
+Seulement dans firebird/src/misc: codes.cpp
+Seulement dans firebird: temp