summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-03-29 11:09:24 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-03-29 12:15:54 +0200
commit92330ae0ae1c584903f8024b24d89e9723cbf6a6 (patch)
tree1134c17545a8ff12a30082d70ade0c8d220d6fac
parent01790af488fad56f0600fc755ee9e976e3aa3a5f (diff)
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 ) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rw-r--r--distro-configs/LibreOfficeMinGW.conf1
-rw-r--r--distro-configs/LibreOfficeWin32.conf1
-rw-r--r--distro-configs/LibreOfficeWin64.conf1
3 files changed, 3 insertions, 0 deletions
diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
index fcca57a9b73c..e0529e47b517 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
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index f608e9ba3391..9bf76099df88 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -8,6 +8,7 @@
--with-java-target-version=1.5
--disable-activex-component
--enable-binfilter
+--disable-cairo-canvas
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-wiki-publisher
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index b4e21c68a74d..66404d450645 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -2,6 +2,7 @@
--without-agfa-monotype-fonts
--with-java-target-version=1.5
--enable-cl-x64
+--disable-cairo-canvas
--disable-activex-component
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript