scp2/source/canvas/makefile.mk | 5 +---- scp2/util/makefile.mk | 5 +---- sd/CppunitTest_sd_filters_test.mk | 2 +- sd/CppunitTest_sd_regression_test.mk | 1 + 4 files changed, 4 insertions(+), 9 deletions(-)
New commits: commit 554bcf4205ede6ec3adb9f39e676b77054b1e8a1 Author: Riccardo Magliocchetti <riccardo.magliocche...@gmail.com> Date: Wed Jan 25 12:00:45 2012 +0100 Fix file not found: cairocanvas.uno.so in smoketestoo_native diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk index 7ce0257..d0d8362 100644 --- a/scp2/source/canvas/makefile.mk +++ b/scp2/source/canvas/makefile.mk @@ -41,12 +41,9 @@ PARFILES= canvascommons.par \ vclcanvas.par \ mtfrenderer.par -.IF "$(GUI)"=="UNX" -#X11 MacOSX has no cairo-canvas -.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" +.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE" PARFILES+= cairocanvas.par .ENDIF -.ENDIF .IF "$(ENABLE_DIRECTX)" != "" .IF "$(USE_DIRECTX5)" != "" diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 74b45a8..7de0c6c 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -209,12 +209,9 @@ SCP1FILES += \ vclcanvas.par \ mtfrenderer.par -.IF "$(GUI)"=="UNX" -#X11 MacOSX has no cairo-canvas -.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua" +.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE" SCP1FILES += cairocanvas.par .ENDIF -.ENDIF .IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP1FILES += \ commit 400ad00534afbbc93de9fd0835e487980f85a336 Author: Thorsten Behrens <tbehr...@suse.com> Date: Wed Jan 25 11:52:00 2012 +0100 Put font embedding disable to correct unit test diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 5b89b8f..b4de440 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -123,7 +123,7 @@ $(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\ $(eval $(call gb_CppunitTest_set_args,sd_filters_test,\ --headless \ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ - "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) -env:SVG_DISABLE_FONT_EMBEDDING=YEAH module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \ + "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 1c3b089..8e56336 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -130,6 +130,7 @@ $(eval $(call gb_CppunitTest_set_args,sd_regression_test,\ --headless \ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ + "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \ )) # .../spool is required for the (somewhat strange) filter configuration _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits