[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeDragonFly.conf sd/Module_sd.mk

[François Tigeot]

 distro-configs/LibreOfficeDragonFly.conf |    2 ++
 sd/Module_sd.mk                          |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit f999fbb5d90f7ffa18f942dedd41114fc6fffee4
Author: François Tigeot <ftigeot at wolfpond.org>
Date:   Mon Oct 17 15:10:33 2011 +0200

    Use the internal versions of libcmis and libvisio
    
    They are not packaged separately

diff --git a/distro-configs/LibreOfficeDragonFly.conf b/distro-configs/LibreOfficeDragonFly.conf
index 605c4f4..e4bfacb 100644
--- a/distro-configs/LibreOfficeDragonFly.conf
+++ b/distro-configs/LibreOfficeDragonFly.conf
@@ -18,6 +18,8 @@
 --without-system-boost
 --without-system-db
 --without-system-jars
+--without-system-libcmis
+--without-system-libvisio
 --without-system-mdds
 --without-system-mythes
 --x-includes=/usr/pkg/include
commit 708892fe70c46a0ac7c8220ce97a30a771a93b70
Author: François Tigeot <ftigeot at wolfpond.org>
Date:   Mon Oct 17 15:08:36 2011 +0200

    Disable a cppunit test crashing on DragonFly.

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 193cba5..933dc70 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -40,10 +40,12 @@ $(eval $(call gb_Module_add_targets,sd,\
     Package_xml \
 ))
 
+ifneq ($(OS),DRAGONFLY)
 $(eval $(call gb_Module_add_check_targets,sd,\
     CppunitTest_sd_uimpress \
     RdbTarget_sd_uimpress \
 ))
+endif
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
     JunitTest_sd_unoapi \