[PATCH libreoffice-4-0] Missing dependency of librelogo on writer

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2897

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/2897/1

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
---
M setup_native/source/packinfo/packinfo_office.txt
1 file changed, 3 insertions(+), 3 deletions(-)



diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 3e8c89e..cbf8c490 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -314,10 +314,10 @@
 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"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sbergman at redhat.com>