[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - desktop/qa postprocess/Module_postprocess.mk Repository.mk

[Libreoffice Gerrit user]

 Repository.mk                               |    4 +++-
 desktop/qa/desktop_lib/test_desktop_lib.cxx |    3 +++
 postprocess/Module_postprocess.mk           |    4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 2ed43bb5873f595c920603c1c01e89e969771a46
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jan 24 10:45:26 2019 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jan 24 10:45:26 2019 +0000

    don't try to package libmysqlclo.so in case of MPLv2 subset
    
    Change-Id: Id89913a8d14d1c7c16684700b5f89e786ef61369

diff --git a/Repository.mk b/Repository.mk
index 6c617dd2843b..2632b700b202 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -389,7 +389,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	msfilter \
 	$(call gb_Helper_optional,SCRIPTING,msforms) \
 	mtfrenderer \
-	$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
+	$(if $(ENABLE_MARIADBC), \
+		$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
+	) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
 	odbc \
 	odfflatxml \
commit 58a5f8da9eef14ce0a17be93a6e8dfaa83eaeef5
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jan 24 10:28:07 2019 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jan 24 10:28:07 2019 +0000

    disable a few failing unit tests in MPLv2 subset
    
    Change-Id: If7595983f7bf2d990687a64659a63a8a66b120bd

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 3dbb271e8b42..bd5119358aa2 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -43,6 +43,7 @@
 #include <cairo.h>
 #include <ostream>
 #include <config_features.h>
+#include <config_mpl.h>
 
 #include <lib/init.hxx>
 
@@ -172,10 +173,12 @@ public:
     CPPUNIT_TEST(testExtractParameter);
     CPPUNIT_TEST(testGetSignatureState_Signed);
     CPPUNIT_TEST(testGetSignatureState_NonSigned);
+#if !MPL_HAVE_SUBSET
     CPPUNIT_TEST(testInsertCertificate_DER_ODT);
     CPPUNIT_TEST(testInsertCertificate_PEM_ODT);
     CPPUNIT_TEST(testInsertCertificate_PEM_DOCX);
     CPPUNIT_TEST(testSignDocument_PEM_PDF);
+#endif
     CPPUNIT_TEST(testTextSelectionHandles);
     CPPUNIT_TEST(testABI);
     CPPUNIT_TEST_SUITE_END();
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 6ab59fcc59c1..45c2d49e8d6f 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -41,8 +41,12 @@ $(eval $(call gb_Module_add_targets,postprocess, \
 ))
 endif
 
+# Implementation com.sun.star.xml.security.SEInitializer_Gpg
+# does not provide a constructor or factory in case of MPLv2 subset
+ifneq ($(MPL_SUBSET),TRUE)
 $(eval $(call gb_Module_add_check_targets,postprocess,\
 	CppunitTest_services \
 ))
+endif
 
 # vim: set noet sw=4 ts=4: