Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2098

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/2098/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 09e296b..eb073b5 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -223,12 +223,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 66c50e2..d56c071 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -413,7 +413,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/2098
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl <mstahl@redhat.com>

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.