[Libreoffice-commits] .: connectivity/Module_connectivity.mk postprocess/packcomponents scp2/source

[Libreoffice Gerrit user]

 connectivity/Module_connectivity.mk    |    1 +
 postprocess/packcomponents/makefile.mk |    4 +++-
 scp2/source/ooo/file_library_ooo.scp   |    1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2ece91f79be01c1540328111ede717492222388b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 7 13:37:57 2012 +0100

    Always package at least mozbootstrap
    
    ...if not even mozab.  Otherwise, there is no implementation of
    com.sun.star.mozilla.MozillaBootstrap and "File - Digital Signatures... - Sign
    Document..." cannot show any certificates from Mozilla profiles.
    
    Change-Id: Ie9b73fad798b2c2a3b52ba374ea967401694f685

diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index fcf9c13..c01f007 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -136,6 +136,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_mork \
 	Executable_mork_helper \
 	Library_mork \
+	Library_mozbootstrap \
 ))
 
 $(eval $(call gb_Module_add_check_targets,connectivity,\
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a6f386a..d8e43bf 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -389,7 +389,9 @@ my_components += component/connectivity/source/drivers/mozab/mozab
 my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
 .END
 .ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
-my_components += component/connectivity/source/drivers/mork/mork
+my_components += \
+    component/connectivity/source/drivers/mork/mork \
+    component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
 .END
 
 .IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != "headless"
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ff1d509..d3c08f3 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -905,6 +905,7 @@ End
 #else
 
 STD_LIB_FILE(gid_File_Lib_Mork,mork)
+SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif