[PATCH libreoffice-4-0] Package the right pixman and cairo

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2051

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/2051/1

Package the right pixman and cairo

Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608
---
M scp2/source/ooo/file_library_ooo.scp
1 file changed, 5 insertions(+), 1 deletion(-)



diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 86dde44..642cd81 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -560,7 +560,7 @@
     #ifdef MACOSX
        Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT2(libcairo,UNXSUFFIX));
+       Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2));
     #endif
   #elif defined(WNT)
     #ifdef _gcc3
@@ -578,7 +578,11 @@
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
+    #ifdef MACOSX
        Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX));
+    #else
+       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+    #endif
   #endif
 End
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba <fridrich@documentfoundation.org>