[libreoffice/f18] Related: fdo#60491 missing libemboleobj.so

[Caolán McNamara]

commit 38c8bcd1b2a2e715329b1672d49b1ebef37971ea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 27 12:44:34 2013 +0000

    Related: fdo#60491 missing libemboleobj.so

 ...cp2-always-package-emboleobj-library-on-n.patch |   59 ++++++++++++++++++++
 libreoffice.spec                                   |    2 +
 2 files changed, 61 insertions(+), 0 deletions(-)
---
diff --git a/0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch b/0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
new file mode 100644
index 0000000..eb52e60
--- /dev/null
+++ b/0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
@@ -0,0 +1,59 @@
+From 59e5098128cd445ed70de418cb787cfa94a65249 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl at redhat.com>
+Date: Sat, 9 Feb 2013 22:39:42 +0100
+Subject: [PATCH] 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>
+---
+ postprocess/packcomponents/makefile.mk | 4 ++--
+ scp2/source/ooo/file_library_ooo.scp   | 3 ++-
+ 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 @@ 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
+ 
+-- 
+1.8.1.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 40717c1..59495fc 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -260,6 +260,7 @@ Patch38: 0001-Resolves-rhbz-910176-cannot-select-directory-with-gn.patch
 Patch39: 0001-Resolves-rhbz-895196-sc-filter-float-a11y-parent-of-.patch
 Patch40: 0001-do-not-access-vector-elements-beyond-size-rhbz-84751.patch
 Patch41: 0001-Resolves-rhbz-907933-crash-on-removing-second-last-p.patch
+Patch42: 0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1013,6 +1014,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch39 -p1 -b .rhbz-895196-sc-filter-float-a11y-parent-of-.patch
 %patch40 -p1 -b .do-not-access-vector-elements-beyond-size-rhbz-84751.patch
 %patch41 -p1 -b .rhbz-907933-crash-on-removing-second-last-p.patch
+%patch42 -p1 -b .fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english