configure.in | 3 ++- offapi/type_reference/types.rdb |binary solenv/gbuild/UnoApi.mk | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit e7dec2887e511a18a5f9927884c1a1df45fc35f0 Author: David Ostrovsky <da...@ostrovsky.org> Date: Thu Jul 26 19:36:35 2012 +0200 set WINEGCC only when cross compiling Change-Id: I598490aa71b658844d912008c0cf14e225bda0db diff --git a/configure.in b/configure.in index 1a0a72a..5b0aa38 100644 --- a/configure.in +++ b/configure.in @@ -6106,8 +6106,8 @@ AC_SUBST(BUILD_EPM) dnl =================================================================== dnl We need winegcc when building MinGW build to be able to cross-build msi tools dnl =================================================================== -AC_PATH_PROG(WINEGCC, winegcc) if test "$WITH_MINGW" = "yes" -a "$PKGFORMAT" = "msi" ; then + AC_PATH_PROG(WINEGCC, winegcc) if test "$WINEGCC" = ""; then AC_MSG_ERROR([winegcc was not found, please install wine-devel, or wine-devel-32bit]) fi @@ -6122,6 +6122,7 @@ printf ("hello world\n"); ) CC="$CC_save" fi +AC_SUBST(WINEGCC) dnl =================================================================== dnl Check for gperf commit b391778d81ea0f67264e09c70c85a0bff9647f99 Author: Michael Stahl <mst...@redhat.com> Date: Thu Jul 26 20:56:11 2012 +0200 offapi: update types.rdb to what is shipping in LO 3.6.0.3 Also fixes annying warnings about removed types: WARNING: could not open key "/UCR/com/sun/star/oooimprovement/XCore" WARNING: could not open key "/UCR/com/sun/star/oooimprovement/XCoreController" WARNING: could not open key "/UCR/com/sun/star/oooimprovement/Core" WARNING: could not open key "/UCR/com/sun/star/oooimprovement/CoreController" Change-Id: I1c09f1de42ed558bc22cc8a90d2c0fee2ca3a1da diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index 936c5c6..be001df 100644 Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ commit 3348b3825706c47c1d6b0a06c382ad070357c1e7 Author: Michael Stahl <mst...@redhat.com> Date: Thu Jul 26 20:30:23 2012 +0200 gbuild: UnoApi: fix spurious re-delivery of RDBs similar to 3378c2d3b88a8413deeb8365ce40d4ee0716eff6 but for gb_UnoApi__use_api. Change-Id: I20c1e3bc63caa5ead695d142d8ef39effe54fdab diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 18f1128..da9a4af 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -131,7 +131,7 @@ endef define gb_UnoApi__use_api $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2)) -$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2)) +$(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2)) endef _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits