incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1172085 - in /incubator/ooo/trunk/main: canvas/source/cairo/makefile.mk configure.in postprocess/packcomponents/makefile.mk scp2/source/canvas/makefile.mk scp2/util/makefile.mk set_soenv.in vcl/unx/generic/gdi/salgdi3.cxx
Date Sat, 17 Sep 2011 22:33:09 GMT
Author: mst
Date: Sat Sep 17 22:33:08 2011
New Revision: 1172085

URL: http://svn.apache.org/viewvc?rev=1172085&view=rev
Log:
vcl340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS

# HG changeset patch
# User Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
# Date 1302633427 -7200
# Node ID 56bc1b624a3a49dcbf38a6b83266e89817752230
# Parent  217dd772a45a24b10e6e2f8b81b598c5034c7882

Modified:
    incubator/ooo/trunk/main/canvas/source/cairo/makefile.mk
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk
    incubator/ooo/trunk/main/scp2/util/makefile.mk
    incubator/ooo/trunk/main/set_soenv.in
    incubator/ooo/trunk/main/vcl/unx/generic/gdi/salgdi3.cxx

Modified: incubator/ooo/trunk/main/canvas/source/cairo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/canvas/source/cairo/makefile.mk?rev=1172085&r1=1172084&r2=1172085&view=diff
==============================================================================
--- incubator/ooo/trunk/main/canvas/source/cairo/makefile.mk (original)
+++ incubator/ooo/trunk/main/canvas/source/cairo/makefile.mk Sat Sep 17 22:33:08 2011
@@ -37,8 +37,8 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :	settings.mk
 DLLPRE =
 
-# --- Nothing to do if we're compiling with --disable-cairo -----------
-.IF "$(ENABLE_CAIRO)" != "TRUE"
+# --- Nothing to do if we're compiling with --disable-cairo-canvas -----------
+.IF "$(ENABLE_CAIRO_CANVAS)" != "TRUE"
 @all:
 	@echo "Building without cairo support..."
 .ELSE

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1172085&r1=1172084&r2=1172085&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Sat Sep 17 22:33:08 2011
@@ -209,6 +209,10 @@ AC_ARG_ENABLE(cairo,
 AC_ARG_WITH(system-cairo,
 [  --with-system-cairo      Use Cairo libraries already on system
 ],,)
+AC_ARG_ENABLE(cairo-canvas,
+[  --disable-cairo-canvas  Determines whether to build the Cairo canvas on
+                          platforms where Cairo is available.
+],,enable_cairo_canvas=yes)
 AC_ARG_ENABLE(librsvg,
 [  --enable-librsvg        Determines whether to use librsvg library on
                           platforms where librsvg is available.
@@ -5937,6 +5941,12 @@ AC_SUBST(SYSTEM_CAIRO)
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
+ENABLE_CAIRO_CANVAS="FALSE"
+if test "$enable_cairo_canvas" = "yes" -a "$ENABLE_CAIRO" = "TRUE" ; then
+   ENABLE_CAIRO_CANVAS="TRUE"
+fi
+AC_SUBST(ENABLE_CAIRO_CANVAS)
+
 dnl ===================================================================
 dnl Check whether the librsvg libraries are available.
 dnl ===================================================================

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1172085&r1=1172084&r2=1172085&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Sat Sep 17 22:33:08 2011
@@ -219,7 +219,7 @@ my_components += emboleobj
 my_components += ucpdav1
 .END
 
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 my_components += cairocanvas
 .END
 

Modified: incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk?rev=1172085&r1=1172084&r2=1172085&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/canvas/makefile.mk Sat Sep 17 22:33:08 2011
@@ -49,7 +49,7 @@ SCPDEFS+=-DSYSTEM_AGG
 PARFILES= canvascommons.par		\
           vclcanvas.par
 
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 PARFILES+= cairocanvas.par
 .ENDIF
 .IF "$(ENABLE_DIRECTX)" != ""

Modified: incubator/ooo/trunk/main/scp2/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/util/makefile.mk?rev=1172085&r1=1172084&r2=1172085&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/util/makefile.mk Sat Sep 17 22:33:08 2011
@@ -178,7 +178,7 @@ SCP1FILES += \
 SCP1FILES += \
              vclcanvas.par
 
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 SCP1FILES += cairocanvas.par
 .ENDIF
 

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1172085&r1=1172084&r2=1172085&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Sat Sep 17 22:33:08 2011
@@ -1635,6 +1635,7 @@ ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_S
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
 ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
+ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
 ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );

Modified: incubator/ooo/trunk/main/vcl/unx/generic/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/unx/generic/gdi/salgdi3.cxx?rev=1172085&r1=1172084&r2=1172085&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/unx/generic/gdi/salgdi3.cxx (original)
+++ incubator/ooo/trunk/main/vcl/unx/generic/gdi/salgdi3.cxx Sat Sep 17 22:33:08 2011
@@ -350,11 +350,7 @@ CairoWrapper::CairoWrapper()
     if( !XQueryExtension( GetX11SalData()->GetDisplay()->GetDisplay(), "RENDER", &nDummy,
&nDummy, &nDummy ) )
         return;
 
-#ifdef MACOSX
-    OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.2.dylib" ));
-#else
     OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.so.2" ));
-#endif    
     mpCairoLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
     if( !mpCairoLib )
         return;



Mime
View raw message