Date: Saturday, July 7, 2012 @ 02:18:53
Author: andyrtr
Revision: 163105
prepare next release; use system-boost again
Modified:
libreoffice/trunk/PKGBUILD
libreoffice/trunk/PKGBUILD.36
-------------+
PKGBUILD | 22 +++++++++-------------
PKGBUILD.36 | 14 +++++++++-----
2 files changed, 18 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-07-07 05:24:14 UTC (rev 163104)
+++ PKGBUILD 2012-07-07 06:18:53 UTC (rev 163105)
@@ -15,7 +15,6 @@
'libreoffice-writer'
'libreoffice-en-US'
'libreoffice-postgresql-connector'
- # http://www.libreoffice.org/features/extensions/ - what upstream
suggest to build
'libreoffice-extension-pdfimport'
'libreoffice-extension-presenter-screen'
'libreoffice-extension-presentation-minimizer'
@@ -25,7 +24,7 @@
'libreoffice-extension-scripting-python'
'libreoffice-extension-wiki-publisher'
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with
all extensions built
-_LOver=3.5.5.3
+_LOver=3.5.5.2
pkgver=3.5.5
pkgrel=1
arch=('i686' 'x86_64')
@@ -47,12 +46,11 @@
# http://download.documentfoundation.org/mirrors/all.html
# http://wiki.documentfoundation.org/Mirrors
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}";
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src";
+#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}";
+_mirror="http://dev-builds.libreoffice.org/pre-releases/src";
_additional_source_url="http://dev-www.libreoffice.org/src";
source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-
${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -86,7 +84,6 @@
libreoffice-common.sh libreoffice-common.csh)
noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
- f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
185d60944ea767075d27247c3162b3bc-unowinreg.dll
0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -113,11 +110,10 @@
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a'
- '09153713133bddc49af99bd76129e929'
- 'c2e66522b8adf0b3fb5789e295129ba9'
+md5sums=('6d60a0541237d8507b4c55247ff33fc1'
+ 'f9262186489750608a48356e92414600'
+ '02d7026c3b28fc82c4a4cddc037a7fa0'
'18f577b374d60b3c760a3a3350407632'
- 'f02578f5218f217a9f20e9c30e119c6a'
'a9a1db27688bad49418667b434d29c1f'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
@@ -252,7 +248,7 @@
--without-system-mozilla \
--without-system-mozilla-headers \
--with-ant-home="/usr/share/java/apache-ant"\
- --without-system-boost\
+ --with-system-boost\
--with-system-cairo\
--with-system-libs\
--with-system-mythes\
@@ -715,5 +711,5 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q
${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
+ unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt
-d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+}
\ No newline at end of file
Modified: PKGBUILD.36
===================================================================
--- PKGBUILD.36 2012-07-07 05:24:14 UTC (rev 163104)
+++ PKGBUILD.36 2012-07-07 06:18:53 UTC (rev 163105)
@@ -52,6 +52,7 @@
_additional_source_url2="http://dev-www.libreoffice.org/extern";
source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+
${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -77,13 +78,14 @@
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-
${_additional_source_url}/ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz
+
${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
buildfix.diff
libreoffice-common.sh libreoffice-common.csh)
noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
185d60944ea767075d27247c3162b3bc-unowinreg.dll
0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -91,7 +93,7 @@
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
- ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz
+ 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -115,6 +117,7 @@
'0db44b0cc908fe4288d40d3869137d76'
'4b2f46f015c1112f9b65f9ed8ba409b6'
'18f577b374d60b3c760a3a3350407632'
+ 'f02578f5218f217a9f20e9c30e119c6a'
'a9a1db27688bad49418667b434d29c1f'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
@@ -140,7 +143,7 @@
'ba2930200c9f019c2d93a8c88c651a0f'
'0ff7d225d087793c8c2c680d77aac3e7'
'6097739c841f671cb21332b9cc593ae7'
- 'ce31ac7b92cb5e66459f67213bbb6168'
+ '0d2dcdfbf28d6208751b33057f5361f0'
'ce5a1def34578b75959ac31210f031f6'
'185d60944ea767075d27247c3162b3bc'
'234e91ac65945ce1ab1e3839780e90f7'
@@ -183,7 +186,7 @@
# non-SMP test build
#export MAKEFLAGS="-j1"
-# ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}"
--with-vendor="ArchLinux" \
+ #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}"
--with-vendor="ArchLinux" \
./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}"
--with-vendor="ArchLinux" \
--with-unix-wrapper="libreoffice" \
@@ -241,7 +244,7 @@
--without-system-mozilla \
--without-system-mozilla-headers \
--with-ant-home="/usr/share/apache-ant"\
- --with-system-boost\
+ --without-system-boost\
--with-system-cairo\
--with-system-libs\
--with-system-mythes\
@@ -249,6 +252,7 @@
--with-system-hsqldb \
--with-alloc=system\
--with-system-clucene\
+ --without-system-servlet-api \
--with-java-target-version=1.5 \
$EXTRAOPTS
