Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Hi Michael,

Il 24/01/2012 12:49, Michael Meeks ha scritto:
Hi Riccardo,

On Tue, 2012-01-24 at 12:26 +0100, Riccardo Magliocchetti wrote:
with this configuration (note --disable-cairo-canvas is set)

/autogen.sh --without-junit --without-java --disable-epm --disable-gtk
...
--disable-cairo-canvas --disable-neon --disable-dbus --disable-systray

        I guess the --disable-cairo-canvas thing is not working so well for you
for some reason. I guess for your case, you want to use the VCL canvas,
with the svp backend and hope :-) [ this is a somewhat under-tested
code-path I suspect, but ... lets see ;-].

... analyzing files ...
ERROR: The following files could not be found:
ERROR: File not found: cairocanvas.uno.so
... cleaning the output tree ...

        So - you'll need to poke in the scp2/ directory and git grep for
cairocanvas there, and add a define in the makefile.mk to SCPDEFS (which
we pre-process with), and a conditonal in the relevant scp2. then re-run
'build&&  deliver' in scp2 and try again I guess.


The attached patch is enough to give me a succesfull make dev-install. And the build even run :)

thanks!

--
Riccardo Magliocchetti
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 7ce0257..41d990b 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -44,9 +44,11 @@ PARFILES= canvascommons.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
+.ENDIF
 
 .IF "$(ENABLE_DIRECTX)" != ""
 .IF "$(USE_DIRECTX5)" != ""
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 9af2c3a..f40a0df 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -211,9 +211,11 @@ SCP1FILES += \
 .IF "$(GUI)"=="UNX"
 #X11 MacOSX has no cairo-canvas
 .IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 SCP1FILES += cairocanvas.par
 .ENDIF
 .ENDIF
+.ENDIF
 
 .IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP1FILES += \

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.