Resolves: tdf#125284 config entries not substituted under Turkish locale
cause i is not the lowercase of I
Change-Id: I616d642df54ce19e68d484c43250a79ecae344ee
Reviewed-on: https://gerrit.libreoffice.org/78025
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 96f29a7..a2fe0af 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/c++17.patch \
external/firebird/ubsan.patch \
external/firebird/asan.patch \
external/firebird/firebird-tdf125284.patch.1 \
))
ifeq ($(OS),WNT)
diff --git a/external/firebird/firebird-tdf125284.patch.1 b/external/firebird/firebird-tdf125284.patch.1
new file mode 100644
index 0000000..a1cb204
--- /dev/null
+++ b/external/firebird/firebird-tdf125284.patch.1
@@ -0,0 +1,27 @@
--- firebird/src/common/config/config_file.cpp 2019-08-23 16:42:26.721439468 +0100
+++ firebird/src/common/config/config_file.cpp 2019-08-23 16:43:07.506579222 +0100
@@ -521,16 +521,14 @@
unsigned code;
const char* name;
} dirs[] = {
-#define NMDIR(a) {Firebird::IConfigManager::a, "FB_"#a},
- NMDIR(DIR_CONF)
- NMDIR(DIR_SECDB)
- NMDIR(DIR_PLUGINS)
- NMDIR(DIR_UDF)
- NMDIR(DIR_SAMPLE)
- NMDIR(DIR_SAMPLEDB)
- NMDIR(DIR_INTL)
- NMDIR(DIR_MSG)
-#undef NMDIR
+ {Firebird::IConfigManager::DIR_CONF, "FB_dir_conf"},
+ {Firebird::IConfigManager::DIR_SECDB, "FB_dir_secdb"},
+ {Firebird::IConfigManager::DIR_PLUGINS, "FB_dir_plugins"},
+ {Firebird::IConfigManager::DIR_UDF, "FB_dir_udf"},
+ {Firebird::IConfigManager::DIR_SAMPLE, "FB_dir_sample"},
+ {Firebird::IConfigManager::DIR_SAMPLEDB, "FB_dir_sampledb"},
+ {Firebird::IConfigManager::DIR_INTL, "FB_dir_intl"},
+ {Firebird::IConfigManager::DIR_MSG, "FB_dir_msg"},
{Firebird::IConfigManager::DIR_COUNT, NULL}
};
