diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-21 15:57:18 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-03-22 08:02:18 +0000 |
| commit | 939daba04c25a9a3b7be2f3df39692453cf9a304 (patch) | |
| tree | 6e85c571e70aae67a6316239d05bb698069104cf /setup_native | |
| parent | f16e95c5c86256d3c3eb017654ce229839df6584 (diff) | |
Missing dependency of librelogo on writer
...at least due to dependency of librelogo.xcd on writer.xcd, see
82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "Missing dependency."
Otherwise, having librelogo installed but not writer will cause an uncaught
RuntimeException from configmgr::Components::parseXcdFiles
(configmgr/source/components.cxx) early on in soffice.bin.
(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3)
Conflicts:
setup_native/source/packinfo/packinfo_office.txt
Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
Reviewed-on: https://gerrit.libreoffice.org/2898
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Andras Timar <atimar@suse.com>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/packinfo/packinfo_office.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 3e8c89eb489a..cbf8c49063b9 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -314,10 +314,10 @@ End Start module = "gid_Module_Optional_Pyuno_LibreLogo" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" -freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" -requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" +freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" +requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" copyright = "2012 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" |