external/firebird/firebird-macosx.patch.1

   1 --- firebird.org/extern/cloop/src/tests/test1/CTest.c   2016-08-01 22:55:35.000000000 +0200
   2 +++ firebird/extern/cloop/src/tests/test1/CTest.c       2016-08-02 21:11:31.000000000 +0200
   3 @@ -20,7 +20,7 @@
   4   */
   5
   6  #include "CalcCApi.h"
   7 -#include <malloc.h>
   8 +#include <stdlib.h>
   9  #include <stdio.h>
  10
  11  #ifdef WIN32
  12 --- firebird.org/builds/posix/prefix.darwin_x86_64      2016-08-01 20:02:48.000000000 +0200
  13 +++ firebird/builds/posix/prefix.darwin_x86_64  2016-08-01 21:42:45.000000000 +0200
  14 @@ -19,8 +19,6 @@
  15  #
  16  # Default build from 10.7 using Clang
  17
  18 -DYLD_LIBRARY_PATH=$(HOME)/icu54/icu/source/lib
  19 -export DYLD_LIBRARY_PATH
  20
  21  #DYLD_PRINT_ENV=1
  22  #export DYLD_PRINT_ENV
  23 @@ -31,15 +31,15 @@
  24  MACOSX_DEPLOYMENT_TARGET=10.7
  25  export MACOSX_DEPLOYMENT_TARGET
  26
  27 -PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -mmacosx-version-min=10.7
  28 -DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=10.7 -Wno-non-virtual-dtor
  29 +PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common
  30 +DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -Wno-non-virtual-dtor
  31  CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
  32
  33  EXE_LINK_OPTIONS:=
  34  UNDEF_PLATFORM=
  35
  36  LINK_LIBS+=-liconv
  37 -MATHLIB=/opt/local/lib/libtommath.a
  38 +MATHLIB=-ltommath
  39  SO_LINK_LIBS+=-liconv
  40
  41  include $(ROOT)/gen/darwin.defaults
  42 --- firebird.org/builds/posix/postfix.darwin    2016-08-01 20:02:48.000000000 +0200
  43 +++ firebird/builds/posix/postfix.darwin        2016-08-01 22:17:49.000000000 +0200
  44 @@ -54,9 +54,9 @@
  45         cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers
  46         cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird
  47         cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib
  48 -       cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
  49 -       cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
  50 -       cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
  51 +#      cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib
  52 +#      cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib
  53 +#      cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib
  54         cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib
  55         cp ../gen/firebird/firebird.msg \
  56                         $(FB_FW)/Resources/English.lproj/var/firebird.msg
  57 @@ -68,8 +68,8 @@
  58                 $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf
  59         chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl
  60         mkdir -p $(FB_FW)/Resources/English.lproj/var/plugins
  61 -       cp ../gen/firebird/plugins/libfbtrace.dylib \
  62 -               $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib
  63 +#      cp ../gen/firebird/plugins/libfbtrace.dylib \
  64 +#              $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib
  65         cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
  66         cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
  67         mkdir -p $(FB_FW)/Resources/doc
  68 --- firebird.org/builds/posix/Makefile.in       2016-08-08 17:58:20.000000000 +0200
  69 +++ firebird/builds/posix/Makefile.in   2016-08-08 17:57:17.000000000 +0200
  70 @@ -191,6 +191,9 @@
  71         $(MAKE) plugins
  72         $(MAKE) examples
  73         $(MAKE) rest
  74 +       install_name_tool -id @__________________________________________________OOO/libfbclient.dylib.3.0.0 $(LIB)/libfbclient.dylib
  75 +       install_name_tool -id @__________________________________________________OOO/libEngine12.dylib $(PLUGINS)/libEngine12.dylib
  76 +       install_name_tool -change $(LIB)/libfbclient.dylib.3.0.0 @loader_path/libfbclient.dylib.3.0.0 $(PLUGINS)/libEngine12.dylib
  77
  78
  79  cross_process:
  80 --- firebird.org/src/common/unicode_util.cpp    2016-07-07 13:55:55.992234709 +0200
  81 +++ firebird/src/common/unicode_util.cpp        2016-08-10 11:25:46.422331020 +0200
  82 @@ -63,8 +63,8 @@
  83  #elif defined(DARWIN)
  84  //const char* const inTemplate = "/Library/Frameworks/Firebird.framework/Versions/A/Libraries/libicui18n.dylib";
  85  //const char* const ucTemplate = "/Library/Frameworks/Firebird.framework/versions/A/Libraries/libicuuc.dylib";
  86 -const char* const inTemplate = "libicui18n.dylib";
  87 -const char* const ucTemplate = "libicuuc.dylib";
  88 +const char* const inTemplate = "libicui18n.dylib.%s";
  89 +const char* const ucTemplate = "libicuuc.dylib.%s";
  90  #elif defined(HPUX)
  91  const char* const inTemplate = "libicui18n.sl.%s";
  92  const char* const ucTemplate = "libicuuc.sl.%s";
  93 @@ -353,6 +353,16 @@
  94                 s.printf("%d%d", majorVersion, minorVersion);
  95
  96         filename.printf(templateName, s.c_str());
  97 +       const char * envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
  98 +       if(envpath == nullptr)
  99 +       {
 100 +               envpath = getenv("LIBREOFFICE_ICU_LIB");
 101 +       }
 102 +       if(envpath != nullptr)
 103 +       {
 104 +               s = filename.c_str();
 105 +               PathUtils::concatPath(filename, envpath, s.c_str());
 106 +       }
 107  }
 108
 109
 110 --- firebird.org/src/common/utils.cpp   2016-08-16 10:11:10.000000000 +0200
 111 +++ firebird/src/common/utils.cpp       2016-08-16 11:27:09.000000000 +0200
 112 @@ -1027,10 +1027,18 @@
 113                         return s;
 114                 }
 115
 116 -                // Set relative path to Engine12 dynamic library
 117 +                // Set path to Engine12 dynamic library.
 118                  if(prefType == Firebird::IConfigManager::DIR_PLUGINS)
 119                  {
 120 -                    s = name;
 121 +                    const char * const envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
 122 +                    if(envpath != nullptr)
 123 +                    {
 124 +                        PathUtils::concatPath(s, envpath, name);
 125 +                    }
 126 +                    else
 127 +                    {
 128 +                        s = name;
 129 +                    }
 130                      return s;
 131                  }
 132         }