libmariadb/UnpackedTarball_mariadb.mk | 4 ++ libmariadb/mariadb-trunk-40.patch | 52 +++++++++++++++++----------------- solenv/gbuild/Dictionary.mk | 2 - 3 files changed, 31 insertions(+), 27 deletions(-)
New commits: commit e0e43597c4bf6f92f3d8406341f472be911169db Author: Michael Stahl <[email protected]> Date: Wed Apr 17 15:15:03 2013 +0200 gbuild: fix gb_Dictionary_add_localized_xcu_file for --with-lang ... which has the same stupid mistake. Change-Id: I128af77f0b75d2b60f5bb4b33e55c2bc0c94ae98 diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index 0bb75b4..a7d458f 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -293,7 +293,7 @@ define gb_Dictionary_add_localized_xcu_file ifeq ($(gb_WITH_LANG),) $(call gb_Dictionary__add_file,$(1),$(1),$(2)/$(notdir $(3)),$(strip $(3))) else -$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2),$(subst $(WORKDIR)/,,$(call gb_XcuFile_for_extension,$(strip $(3))))) +$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2)/$(notdir $(3)),$(subst $(WORKDIR)/,,$(call gb_XcuFile_for_extension,$(strip $(3))))) $(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1)_generated)) endif commit 15990d8ccbd4e89770b449444ac430650ca6a381 Author: Michael Stahl <[email protected]> Date: Wed Apr 17 14:55:26 2013 +0200 libmariadb: fix wrong line ends in patch Change-Id: I8fce7d3b3da2a6dad373409f9c9ba3b9cd06aa4f diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk index f80bed6..f8694ab 100644 --- a/libmariadb/UnpackedTarball_mariadb.mk +++ b/libmariadb/UnpackedTarball_mariadb.mk @@ -33,4 +33,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\ libmariadb/mariadb-static-inline.patch \ )) +$(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\ + libmysql/libmysql_exports.def \ +)) + # vim: set noet sw=4 ts=4: diff --git a/libmariadb/mariadb-trunk-40.patch b/libmariadb/mariadb-trunk-40.patch index a0082bc..de8f44c 100644 --- a/libmariadb/mariadb-trunk-40.patch +++ b/libmariadb/mariadb-trunk-40.patch @@ -3373,34 +3373,34 @@ --- mariadb/libmysql/libmysql_exports.def 2012-11-28 13:09:17 +0000 +++ mariadb/libmariadb/libmariadb_exports.def 2013-03-14 21:01:43 +0000 @@ -1,4 +1,5 @@ - EXPORTS -+ mysql_ps_fetch_functions DATA - get_tty_password - load_defaults - mysql_thread_end + EXPORTS ++ mysql_ps_fetch_functions DATA + get_tty_password + load_defaults + mysql_thread_end @@ -53,11 +54,10 @@ - mysql_num_rows - mysql_options - mysql_stmt_param_count -- ;mysql_stmt_param_metadata -+ mysql_stmt_param_metadata - mysql_ping - mysql_stmt_result_metadata - mysql_query -- mysql_read_query_result - mysql_real_connect - mysql_real_escape_string - mysql_real_query + mysql_num_rows + mysql_options + mysql_stmt_param_count +- ;mysql_stmt_param_metadata ++ mysql_stmt_param_metadata + mysql_ping + mysql_stmt_result_metadata + mysql_query +- mysql_read_query_result + mysql_real_connect + mysql_real_escape_string + mysql_real_query @@ -102,6 +102,6 @@ - mysql_server_end - mysql_set_character_set - mysql_get_character_set_info -- ;mysql_stmt_next_result -- -- -+ mysql_stmt_next_result -+ mariadb_connection -+ mysql_get_server_name + mysql_server_end + mysql_set_character_set + mysql_get_character_set_info +- ;mysql_stmt_next_result +- +- ++ mysql_stmt_next_result ++ mariadb_connection ++ mysql_get_server_name === renamed file 'libmysql/my_secure.c' => 'libmariadb/ma_secure.c' --- mariadb/libmysql/my_secure.c 2012-11-26 07:32:41 +0000 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
