[PATCH libreoffice-4-0] fdo#60491: scp2: always package emboleobj library on non-WNT...

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2095

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/2095/1

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
---
M postprocess/packcomponents/makefile.mk
M scp2/source/ooo/file_library_ooo.scp
2 files changed, 4 insertions(+), 3 deletions(-)



diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fa3231c..a37ba73 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -224,12 +224,12 @@
 
 .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 642cd81..6dd5e29 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -394,7 +394,8 @@
 
 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
 

-- 
To view, visit https://gerrit.libreoffice.org/2095
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>