[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - postprocess/packcomponents scp2/source

[Michael Stahl]

 postprocess/packcomponents/makefile.mk |    4 ++--
 scp2/source/ooo/file_library_ooo.scp   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 59e5098128cd445ed70de418cb787cfa94a65249
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Feb 9 22:39:42 2013 +0100

    fdo#60491: scp2: always package emboleobj library on non-WNT platforms
    
    (regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined
     DISABLE_ATL on all platforms in configure)
    
    (cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40)
    
    Conflicts:
    	postprocess/Rdb_services.mk
    
    Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
    Reviewed-on: https://gerrit.libreoffice.org/2098
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 09e296b..eb073b5 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -223,12 +223,12 @@ my_components += \
 
 .ENDIF
 
-.IF "$(DISABLE_ATL)" == ""
 .IF "$(OS)" == "WNT"
+.IF "$(DISABLE_ATL)" == ""
 my_components += component/embeddedobj/source/msole/emboleobj.windows
+.ENDIF
 .ELSE
 my_components += component/embeddedobj/source/msole/emboleobj
-.ENDIF
 .END
 
 .IF "$(DISABLE_NEON)" != "TRUE"
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 66c50e2..d56c071 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -413,7 +413,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
 
 SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
 
-#ifndef DISABLE_ATL
+/* fdo#60491 always need emboleobj library on non-WNT platforms */
+#if !defined(WNT) || !defined(DISABLE_ATL)
 SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 #endif