scp2/source/ooo/file_library_ooo.scp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 5319808d29666827df2b6010b433c293cf738b4e
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Fri Feb 8 16:31:44 2013 +0100
Package the right pixman and cairo
Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index ef16c94..f6699e6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -560,7 +560,7 @@ File gid_File_Lib_Cairo
#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 @@ File gid_File_Lib_Pixman
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
