Date: Sunday, December 9, 2012 @ 13:00:41 Author: andyrtr Revision: 173047
prepare 4.0 release; some extensions are now core code part; move on to use system python3 Modified: libreoffice/trunk/PKGBUILD.40 -------------+ PKGBUILD.40 | 136 ++++++++++++++-------------------------------------------- 1 file changed, 34 insertions(+), 102 deletions(-) Modified: PKGBUILD.40 =================================================================== --- PKGBUILD.40 2012-12-09 15:54:57 UTC (rev 173046) +++ PKGBUILD.40 2012-12-09 18:00:41 UTC (rev 173047) @@ -15,30 +15,25 @@ 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' - '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' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.0.0.alpha1 +_LOver=4.0.0.0.beta1 pkgver=4.0.0 -pkgrel=0.alpha1.2 +pkgrel=0.beta1.1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit' + 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez' # the runtime dependencies - "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" + "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.20.5' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -52,7 +47,6 @@ source=(${_mirror}/${pkgbase}{,-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}/2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.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 @@ -78,17 +72,16 @@ ${_additional_source_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 ${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 ${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz - ${_additional_source_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 - ${_additional_source_url}/b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2 - ${_additional_source_url}/46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2 + ${_additional_source_url}/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 ${_additional_source_url}/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + ${_additional_source_url}/libcdr-0.0.9.tar.bz2 + ${_additional_source_url}/libmspub-0.0.3.tar.bz2 + ${_additional_source_url}/libvisio-0.0.23.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - buildfix.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.tar.bz2 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz +noextract=(18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 @@ -115,18 +108,18 @@ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - 3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2 - 46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2 + 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 - 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) -md5sums=('8200d0c9da3615a09d94068eada02c28' - 'b3912d2b9f8312a3b85472890997704d' - '9dfdbac725c0a31b411026108cf7cf22' + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + libcdr-0.0.9.tar.bz2 + libmspub-0.0.3.tar.bz2 + libvisio-0.0.23.tar.bz2) +md5sums=('16cddb4c3dd8706b5912f93beaf1241d' + '9834fd7294c003417d33894d30057b6a' + '103a68b634d421a6ff7311d506e43714' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' - '2d8c3b50f77c544f317ab0a8838fadcb' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -152,14 +145,14 @@ '9f9e15966b5624834157fe3d748312bc' 'dc3d21a3921931096d6e80f6701f6763' 'b2371dc7cf4811c9d32146eec913d296' - '3c0037fb07dea2f0bbae8386fa7c6a9a' - 'b2db54b6e96287ac995d7ed654ace4fc' - '46d9f4cf8b145c21ce1056e116d2ce71' + '8755aac23317494a9028569374dc87b2' '54e578c91b1b68e69c72be22adcb2195' '0168229624cfac409e766913506961a8' '185d60944ea767075d27247c3162b3bc' + '3c0037fb07dea2f0bbae8386fa7c6a9a' + 'b2db54b6e96287ac995d7ed654ace4fc' + '2552fffcc8428c8b5506218f0cf802db' '97bf43dda273d79ff90c848ab53b0e3c' - '234e91ac65945ce1ab1e3839780e90f7' 'abcb1b0a7deaffe13ab3d7ca70becb49' '72790a4103da259a55cadd66db931d00') @@ -177,13 +170,7 @@ ln -s ${srcdir}/$source . done popd - -# ln -s ../libreoffice-help-$_LOver/helpcontent2 . -# ln -s ../libreoffice-translations-$_LOver/translations . - - # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix.diff # leaves out a broken pdfimport test - + # fix not upstreamable pyuno paths - patch taken from Debian # patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff @@ -194,9 +181,6 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done - - # python2 fix - export PYTHON=python2 #autoconf -f @@ -227,6 +211,9 @@ --enable-mergelibs \ --enable-opengl \ --enable-odk\ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ --disable-ext-mysql-connector \ @@ -256,7 +243,6 @@ --with-system-libwpg \ --with-system-libwps \ --with-system-redland\ - --disable-mozilla \ --without-system-mozilla \ --without-system-npapi-headers \ --with-ant-home="/usr/share/apache-ant"\ @@ -268,12 +254,8 @@ --with-system-hsqldb \ --with-alloc=system\ --with-system-clucene\ - --without-system-servlet-api \ - --with-java-target-version=1.6 + --without-system-servlet-api - -#configure: WARNING: unrecognized options: --enable-ext-scripting-beanshell, --enable-ext-scripting-javascript, --enable-librsvg, --without-system-saxon - #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool touch src.downloaded @@ -293,8 +275,8 @@ pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' 'poppler>=0.20.5' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' @@ -315,9 +297,11 @@ etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) groups=('libreoffice') - provides=('go-openoffice') + provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python') conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice') + replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do @@ -342,7 +326,7 @@ cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . - # set python-uno PYTHON path + # set VLC and if needed python-uno PYTHON path install -dm755 ${pkgdir}/etc/profile.d install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ @@ -629,26 +613,6 @@ done } -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice-common' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport -} - -package_libreoffice-extension-presenter-screen() { - - pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen -} - package_libreoffice-extension-presentation-minimizer() { pkgdesc="This extension reduce the file size of the current presentation" @@ -670,38 +634,6 @@ unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder } -package_libreoffice-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/libreoffice-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python2') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_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"