[Libreoffice-commits] .: 9 commits - configure.in ooo.lst scp2/source solenv/bin
Martin Hosken
mhosken at kemper.freedesktop.org
Thu Mar 10 07:36:51 PST 2011
configure.in | 6 +++++-
ooo.lst | 6 ++----
scp2/source/ooo/shortcut_ooo.scp | 21 ---------------------
solenv/bin/build.pl | 2 ++
4 files changed, 9 insertions(+), 26 deletions(-)
New commits:
commit daabb024abd1b658853d875d4c026291c9096206
Author: Martin Hosken <martin_hosken at sil.org>
Date: Thu Mar 10 14:39:50 2011 +0700
graphite statically linked if non system, move ICU to go-oo
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 47bce4a..54836a8 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)
commit 336cd75d797c7e3d869b24b748cba301ca7905bd
Author: Martin Hosken <martin_hosken at sil.org>
Date: Fri Feb 25 23:00:28 2011 +0700
graphite2 consolidated patch
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 54836a8..47bce4a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -808,6 +808,21 @@ 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)
commit ec8623e4761bca5d7a8ae441b86cb9f05a663ddc
Author: Martin Hosken <martin_hosken at sil.org>
Date: Thu Mar 10 14:39:50 2011 +0700
graphite statically linked if non system, move ICU to go-oo
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 47bce4a..54836a8 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)
commit eae22d2d06f8c8db9c5649d541b56d49590802de
Author: Martin Hosken <martin_hosken at sil.org>
Date: Fri Feb 25 23:00:28 2011 +0700
graphite2 consolidated patch
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 54836a8..47bce4a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -808,6 +808,21 @@ 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)
commit f9bfd5e53bf4b962b8a8d15255edb1cd35660e88
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Mar 2 15:40:19 2011 +0100
A lame fix for the rebuilding of external libraries
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 0270503..d358a4e 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -786,6 +786,8 @@ sub dmake_dir {
#and try again. dmakes normal failure is 255, while death on signal is 254
my $real_exit_code = $error_code >> 8;
if (($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
+ print "Forcing regeneration of dependency info\n";
+ run_job($dmake, 'depend=t', $job_name);
print "Retrying $job_name\n";
$error_code = run_job($dmake, $job_name);
}
commit a66eabe4cabe8eb82a92f2589e4c9c130aed6117
Author: Martin Hosken <martin_hosken at sil.org>
Date: Thu Mar 10 14:39:50 2011 +0700
graphite statically linked if non system, move ICU to go-oo
diff --git a/ooo.lst b/ooo.lst
index 83934eb..f66c3a4 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -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 47bce4a..54836a8 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 edaabed..cec7ed1 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
commit 92fe2ba95dbd72478917a5d60899eef29fade955
Author: Martin Hosken <martin_hosken at sil.org>
Date: Thu Mar 10 07:17:19 2011 +0700
only one icu
diff --git a/ooo.lst b/ooo.lst
index 48809ee..83934eb 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -69,7 +69,6 @@ http://download.go-oo.org/src
47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
-e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
commit e92a5be0c482032c9df8fa725e9aa341e3ea6494
Author: Martin Hosken <martin_hosken at sil.org>
Date: Fri Mar 4 19:51:35 2011 +0700
Tidy up for graphite2, removing silgraphite
diff --git a/ooo.lst b/ooo.lst
index 6d313c7..48809ee 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -13,11 +13,10 @@ 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
-2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
+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
-377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
@@ -48,7 +47,6 @@ c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz
d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
-d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip
commit c5e4035066e46d8215ba2a0c0b85e8282d75dc6c
Author: Martin Hosken <martin_hosken at sil.org>
Date: Fri Feb 25 23:00:28 2011 +0700
graphite2 consolidated patch
diff --git a/configure.in b/configure.in
index d665598..148ca31 100755
--- a/configure.in
+++ b/configure.in
@@ -5218,11 +5218,15 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -
test "$with_system_graphite" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_GRAPHITE=YES
- PKG_CHECK_MODULES( GRAPHITE, silgraphite )
+ PKG_CHECK_MODULES( GRAPHITE, graphite2 )
else
AC_MSG_RESULT([internal])
SYSTEM_GRAPHITE=NO
BUILD_TYPE="$BUILD_TYPE GRAPHITE"
+ AC_PATH_PROGS(CMAKE_CMD, [cmake])
+ if test -z "$CMAKE_CMD" ; then
+ AC_MSG_ERROR([Cmake not found, but needed for configuring Graphite2])
+ fi
fi
else
AC_MSG_RESULT([no])
diff --git a/ooo.lst b/ooo.lst
index 46577ee..6d313c7 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -80,6 +80,7 @@ e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
5d991377b0ee1ae396c82963bc0084c1-mdds_0.5.1.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
+0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
http://www.numbertext.org/linux
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 54836a8..47bce4a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -808,6 +808,21 @@ 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 482a29a..edaabed 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -76,27 +76,28 @@ End
#endif
+#ifndef SYSTEM_GRAPHITE
Shortcut gid_Shortcut_Lib_Graphite_0
FileID = gid_File_Lib_Graphite;
Dir = gid_Dir_Program;
- Name = STRING(CONCAT2(libgraphite,UNXSUFFIX));
+ 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(libgraphite,UNXSUFFIX,.,3));
+ 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(libgraphite,UNXSUFFIX,.,3.0));
+ Name = STRING(CONCAT4(libgraphite2,UNXSUFFIX,.,2.0));
Styles = (NETWORK,RELATIVE);
End
-
+#endif
#endif
#ifdef MACOSX
More information about the Libreoffice-commits
mailing list