[Libreoffice-commits] .: distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf

[Stephan Bergmann]

On 03/29/2012 12:09 PM, Michael Meeks wrote:
> New commits:
> commit 6219ff898a8c3ae6b7abe4272b4b68cc986093e4
> Author: Michael Meeks<michael.meeks at suse.com>
> Date:   Thu Mar 29 11:09:24 2012 +0100
>
>      Disable cairo canvas on Windows fdo#46901 fdo#46532
>
>       We never used cairocanvas on Win, this got accidentally enabled
>      due to configure.in cleanups. Not that we shouldn't, but it needs
>      some more fixing ( Analog of Thorsten's Mac commit for fdo#45584 )
>
> diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
> index 7d4bc8a..32df782 100644
> --- a/distro-configs/LibreOfficeMinGW.conf
> +++ b/distro-configs/LibreOfficeMinGW.conf
> @@ -22,6 +22,7 @@
>   --without-myspell-dicts
>   --disable-activex
>   --disable-binfilter
> +--disable-cairo-canvas
>   --disable-build-mozilla
>   --disable-directx
>   --disable-extension-integration

Looks like this kills MinGW builds (witness the Win-x86 at 7-MinGW 
tinderbox), as -- quite counter-intuitively -- --disable-cairo-canvas 
leads to BUILD_TYPE now including CAIRO, which it does not for the 
default --enable-cairo-canvas, and module cairo is completely 
unbuildable under MinGW (cairo/pixman configure phase is complaining 
that the compiler can't compile programs, as the passed in LDFLAGS are 
completely bogus).

I locally helped myself with

> diff --git a/configure.in b/configure.in
> index face6c2..f77302c 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -10101,7 +10101,7 @@ else
>          dnl We only need cairo for Windows if we
>          dnl build librsvg or directx disabled
>          if test "$ENABLE_LIBRSVG" != NO -o -z "$ENABLE_DIRECTX"; then
> -            BUILD_TYPE="$BUILD_TYPE CAIRO"
> +: #            BUILD_TYPE="$BUILD_TYPE CAIRO"
>          fi
>      else
>          if test "$enable_cairo_canvas" = "yes"; then

for now, but I would appreciate it if somebody who knows about what 
needs to be built when for Windows would have a look and fix this mess.

Thanks,
Stephan