Date: Friday, July 6, 2012 @ 15:12:28
Author: andyrtr
Revision: 163087
prepare next release; readd extension-wiki-publisher FS##30521 and
extension-nlpsolver; use system-boost again
Modified:
libreoffice/trunk/PKGBUILD
libreoffice/trunk/PKGBUILD.36
-------------+
PKGBUILD | 58 ++++++++++++++++++++++++++++++++++++++--------------------
PKGBUILD.36 | 57 ++++++++++++++++++++++++++++++++++++---------------------
2 files changed, 74 insertions(+), 41 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-07-06 18:07:49 UTC (rev 163086)
+++ PKGBUILD 2012-07-06 19:12:28 UTC (rev 163087)
@@ -15,14 +15,17 @@
'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'
'libreoffice-extension-report-builder'
'libreoffice-scripting-beanshell'
'libreoffice-scripting-javascript'
- 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one
with all extensions built
-_LOver=3.5.5.2
+ '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
pkgver=3.5.5
pkgrel=1
arch=('i686' 'x86_64')
@@ -44,11 +47,12 @@
# 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
@@ -82,6 +86,7 @@
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
@@ -108,10 +113,11 @@
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('6d60a0541237d8507b4c55247ff33fc1'
- 'f9262186489750608a48356e92414600'
- '02d7026c3b28fc82c4a4cddc037a7fa0'
+md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a'
+ '09153713133bddc49af99bd76129e929'
+ 'c2e66522b8adf0b3fb5789e295129ba9'
'18f577b374d60b3c760a3a3350407632'
+ 'f02578f5218f217a9f20e9c30e119c6a'
'a9a1db27688bad49418667b434d29c1f'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
@@ -216,6 +222,8 @@
--enable-odk\
--enable-ext-scripting-beanshell \
--enable-ext-scripting-javascript \
+ --enable-ext-wiki-publisher \
+ --enable-ext-nlpsolver \
--disable-ext-mysql-connector \
--with-system-mysql \
--enable-librsvg=system \
@@ -244,7 +252,7 @@
--without-system-mozilla \
--without-system-mozilla-headers \
--with-ant-home="/usr/share/java/apache-ant"\
- --with-system-boost\
+ --without-system-boost\
--with-system-cairo\
--with-system-libs\
--with-system-mythes\
@@ -257,20 +265,8 @@
--with-java-target-version=1.5 \
$EXTRAOPTS
-# --disable-ext-lightproof \
-
-
-#--with-install-dirname="${pkgbase}"
-# --enable-cairo\
-# --with-system-libtextcat \
-# --with-external-libtextcat-data \
#--enable-split-opt-features Split file lists for some optional features,
.e.g. pyuno, testtool
-#--with-servlet-api-jar=JARFILE
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-# --with-system-saxon\
-# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
touch src.downloaded
#./download
make
@@ -699,3 +695,25 @@
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
unzip -q
${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt
-d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
}
+
+package_libreoffice-extension-wiki-publisher() {
+
+ pkgdesc="This extension enables you to create Wiki articles on MediaWiki
servers without having to know the syntax of the MediaWiki markup language"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+ unzip -q
${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+}
+
+package_libreoffice-extension-nlpsolver() {
+
+ pkgdesc="This extension integrates into Calc and offers new Solver engines to
use for optimizing nonlinear programming models"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ 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
+}
Modified: PKGBUILD.36
===================================================================
--- PKGBUILD.36 2012-07-06 18:07:49 UTC (rev 163086)
+++ PKGBUILD.36 2012-07-06 19:12:28 UTC (rev 163087)
@@ -21,9 +21,11 @@
'libreoffice-extension-report-builder'
'libreoffice-scripting-beanshell'
'libreoffice-scripting-javascript'
- 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one
with all extensions built
-_LOver=3.6.0.0.beta2
-pkgver=3.6.0beta2
+ 'libreoffice-extension-scripting-python'
+ 'libreoffice-extension-wiki-publisher'
+ 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with
all extensions built
+_LOver=3.6.0.0.beta3
+pkgver=3.6.0beta3
pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL3')
@@ -50,7 +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}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.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
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -80,7 +82,7 @@
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
buildfix.diff
libreoffice-common.sh libreoffice-common.csh)
-noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
+noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
185d60944ea767075d27247c3162b3bc-unowinreg.dll
0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
@@ -109,11 +111,11 @@
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('97183afb02576d5542a1eda3f29f9517'
- '3368bc1adfa9e7d6d6f3ce2cee9e164e'
- '7191e46a3f48ad7a7d5a21e985790e6a'
+md5sums=('2f471473f405a373e8d9ca5870d3861d'
+ '0db44b0cc908fe4288d40d3869137d76'
+ '4b2f46f015c1112f9b65f9ed8ba409b6'
'18f577b374d60b3c760a3a3350407632'
- '90010e213dd25648e70f0cc12f8fed55'
+ 'a9a1db27688bad49418667b434d29c1f'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
'798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -182,6 +184,7 @@
# non-SMP test build
#export MAKEFLAGS="-j1"
# ./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" \
--enable-split-app-modules \
@@ -206,6 +209,8 @@
--enable-odk\
--enable-ext-scripting-beanshell \
--enable-ext-scripting-javascript \
+ --enable-ext-wiki-publisher \
+ --enable-ext-nlpsolver \
--disable-ext-mysql-connector \
--with-system-mysql \
--enable-librsvg=system \
@@ -247,20 +252,8 @@
--with-java-target-version=1.5 \
$EXTRAOPTS
-# --disable-ext-lightproof \
-
-
-#--with-install-dirname="${pkgbase}"
-# --enable-cairo\
-# --with-system-libtextcat \
-# --with-external-libtextcat-data \
#--enable-split-opt-features Split file lists for some optional features,
.e.g. pyuno, testtool
-#--with-servlet-api-jar=JARFILE
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-# --with-system-saxon\
-# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
touch src.downloaded
#./download
make
@@ -694,3 +687,25 @@
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
unzip -q
${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt
-d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
}
+
+package_libreoffice-extension-wiki-publisher() {
+
+ pkgdesc="This extension enables you to create Wiki articles on MediaWiki
servers without having to know the syntax of the MediaWiki markup language"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+ unzip -q
${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+}
+
+package_libreoffice-extension-nlpsolver() {
+
+ pkgdesc="This extension integrates into Calc and offers new Solver engines to
use for optimizing nonlinear programming models"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ 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
+}
