diff options
| author | Martin Hosken <martin_hosken@sil.org> | 2011-03-10 14:39:50 +0700 |
|---|---|---|
| committer | Martin Hosken <martin_hosken@sil.org> | 2011-03-10 14:51:23 +0700 |
| commit | 2f9d4b26a44d2da04858ef087b82b03ed483a0a8 (patch) | |
| tree | dc9f27aa432e96a32f083e4b4b09c3ea446d92b5 | |
| parent | 1be9eab189b3c62f6a1d935a2d5579ee42a573f1 (diff) | |
graphite statically linked if non system, move ICU to go-oogr2
| -rw-r--r-- | ooo.lst | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 15 | ||||
| -rw-r--r-- | scp2/source/ooo/shortcut_ooo.scp | 22 |
3 files changed, 1 insertions, 38 deletions
@@ -13,7 +13,6 @@ http://hg.services.openoffice.org/binaries 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -43e56b71c407be5154de681eaa646a4a-icu4c-4_6-src.tgz ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip @@ -66,6 +65,7 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz http://download.go-oo.org/src +43e56b71c407be5154de681eaa646a4a-icu4c-4_6-src.tgz 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 47bce4adb..54836a8b8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -808,21 +808,6 @@ End #endif -#ifndef SYSTEM_GRAPHITE - -File gid_File_Lib_Graphite - TXT_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT8(libgraphite2,UNXSUFFIX,.,2,.,0,.,0)); - #else - Name = graphite2.dll; - #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); -End - -#endif - #ifdef SOLAR_JAVA STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index edaabeddc..cec7ed172 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -76,28 +76,6 @@ End #endif -#ifndef SYSTEM_GRAPHITE -Shortcut gid_Shortcut_Lib_Graphite_0 - FileID = gid_File_Lib_Graphite; - Dir = gid_Dir_Program; - Name = STRING(CONCAT2(libgraphite2,UNXSUFFIX)); - Styles = (NETWORK,RELATIVE); -End - -Shortcut gid_Shortcut_Lib_Graphite_1 - FileID = gid_File_Lib_Graphite; - Dir = gid_Dir_Program; - Name = STRING(CONCAT4(libgraphite2,UNXSUFFIX,.,2)); - Styles = (NETWORK,RELATIVE); -End - -Shortcut gid_Shortcut_Lib_Graphite_2 - FileID = gid_File_Lib_Graphite; - Dir = gid_Dir_Program; - Name = STRING(CONCAT4(libgraphite2,UNXSUFFIX,.,2.0)); - Styles = (NETWORK,RELATIVE); -End -#endif #endif #ifdef MACOSX |