---------- Forwarded message ---------- From: KAMI911 KAMI911 <kami...@gmail.com> Date: 2011/4/22 Subject: Re: [Libreoffice] [PATCH] Initial steps to support extras - download To: Katarina Machalkova <kmachalk...@suse.cz>
Hi Katarina, Yes I did, now I attached. Thanks, KAMI 2011/4/22 Katarina Machalkova <kmachalk...@suse.cz> > > Hey, > > > Please review the attached stuffs. I would like to add it to master and > > libreoffice-3-4. Not affecting LibreOffice. It adds support to download > > extra stuffs. > > Didn't you forget to actually attach something? :) ;) > > B. > _______________________________________________ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice
From 825389e02c0062560f406a47013fa8a9a8267ba7 Mon Sep 17 00:00:00 2001 From: Kalman Szalai - KAMI <kami...@gmail.com> Date: Fri, 22 Apr 2011 16:32:24 +0200 Subject: [PATCH] Add initial configure and download stuffs for extra things OxygenOffice related --- configure.in | 16 +++++++++- ooo.lst | 87 ------------------------------------------------------ ooo.lst.in | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 88 deletions(-) delete mode 100644 ooo.lst create mode 100644 ooo.lst.in diff --git a/configure.in b/configure.in index 64f88ec..c33c018 100755 --- a/configure.in +++ b/configure.in @@ -7381,13 +7381,16 @@ AC_MSG_CHECKING([whether to include extra galleries]) if test "z$enable_extra_gallery" = "z" -o "z$enable_extra_gallery" = "zno" ; then AC_MSG_RESULT([no]) WITH_EXTRA_GALLERY=NO + OOOP_GALLERY_PACK="" else AC_MSG_RESULT([yes]) WITH_EXTRA_GALLERY=YES BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY" - SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY" + SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY" + OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip" fi AC_SUBST(WITH_EXTRA_GALLERY) +AC_SUBST(OOOP_GALLERY_PACK) dnl =================================================================== dnl Test whether to include extra templates @@ -7396,13 +7399,16 @@ AC_MSG_CHECKING([whether to include extra templates]) if test "z$enable_extra_template" = "z" -o "z$enable_extra_template" = "zno" ; then AC_MSG_RESULT([no]) WITH_EXTRA_TEMPLATE=NO + OOOP_TEMPLATES_PACK="" else AC_MSG_RESULT([yes]) WITH_EXTRA_TEMPLATE=YES BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE" SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE" + OOOP_TEMPLATES_PACK="1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip" fi AC_SUBST(WITH_EXTRA_TEMPLATE) +AC_SUBST(OOOP_TEMPLATES_PACK) dnl =================================================================== dnl Test whether to include extra samples @@ -7411,13 +7417,16 @@ AC_MSG_CHECKING([whether to include extra samples]) if test "z$enable_extra_sample" = "z" -o "z$enable_extra_sample" = "zno" ; then AC_MSG_RESULT([no]) WITH_EXTRA_SAMPLE=NO + OOOP_SAMPLES_PACK="" else AC_MSG_RESULT([yes]) WITH_EXTRA_SAMPLE=YES BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE" SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE" + OOOP_SAMPLES_PACK="a6bccacf44914969e6e7b2f8faf4132c-OOOP-samples-pack-2.7.0.0.zip" fi AC_SUBST(WITH_EXTRA_SAMPLE) +AC_SUBST(OOOP_SAMPLES_PACK) dnl =================================================================== dnl Test whether to include extra fonts @@ -7426,13 +7435,16 @@ AC_MSG_CHECKING([whether to include extra fonts]) if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then AC_MSG_RESULT([no]) WITH_EXTRA_FONT=NO + OOOP_FONTS_PACK="" else AC_MSG_RESULT([yes]) WITH_EXTRA_FONT=YES BUILD_TYPE="$BUILD_TYPE EXTRA_FONT" SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT" + OOOP_FONTS_PACK="a10aa597411643326e27d7fc128af12d-OOOP-fonts-pack-2.9.0.0.zip" fi AC_SUBST(WITH_EXTRA_FONT) +AC_SUBST(OOOP_FONTS_PACK) dnl =================================================================== dnl Test whether to enable ActiveX embedding @@ -7986,6 +7998,8 @@ else echo > set_soenv.last fi +AC_OUTPUT([ooo.lst]) + AC_OUTPUT([set_soenv Makefile bin/repo-list]) # touch the config timestamp file set_soenv.stamp diff --git a/ooo.lst b/ooo.lst deleted file mode 100644 index 979f049..0000000 --- a/ooo.lst +++ /dev/null @@ -1,87 +0,0 @@ -http://hg.services.openoffice.org/binaries -48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz -63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz -09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz -0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt -128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz -17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz -18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz -1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html -26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz -284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz -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 -ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz -35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip -39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip -3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz -3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz -48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt -48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz -4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz -4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz -599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz -7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz -7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz -798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz -8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar -bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz -a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz -a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html -a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip -af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz -bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 -c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz -ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz -d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip -d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz -dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz -e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt -e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2 -e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz -ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz -ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz -ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz -fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt -fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz -fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz -37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip -831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip -067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz -3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip -3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip -8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip -97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip -ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip -d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip -db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip -eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip -f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip -ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip -ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz -http://download.go-oo.org/src -314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz -451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt -47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 -90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 -debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz -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 -5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 -9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 -7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.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 -b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 -http://www.numbertext.org/linux -881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip diff --git a/ooo.lst.in b/ooo.lst.in new file mode 100644 index 0000000..0c43f1f --- /dev/null +++ b/ooo.lst.in @@ -0,0 +1,93 @@ +http://hg.services.openoffice.org/binaries +48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz +63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz +09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz +0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt +128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz +17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz +18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz +1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz +24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html +26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz +284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz +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 +ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz +35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip +39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip +3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz +3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz +48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt +48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz +4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz +4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz +599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz +7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz +7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz +798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz +8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar +bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz +a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz +a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html +a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip +af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz +bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 +c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz +ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz +d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip +d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz +dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz +e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt +e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2 +e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz +ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz +ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz +ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz +fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt +fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz +fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz +37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip +831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip +067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz +3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip +3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip +8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip +97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip +ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip +d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip +db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip +eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip +ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz +http://download.go-oo.org/src +314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz +451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt +47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 +90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 +debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz +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 +5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 +9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 +7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.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 +b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 +http://www.numbertext.org/linux +881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip +http://ooo.itc.hu/oxygenoffice/download/libreoffice/ +@OOOP_GALLERY_PACK@ +@OOOP_TEMPLATES_PACK@ +@OOOP_FONTS_PACK@ +@OOOP_SAMPLES_PACK@ + -- 1.7.4.1
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice