From 32793d9a5b60ef0591c71c12ad75121d9b155adf Mon Sep 17 00:00:00 2001 From: root Date: Mon, 25 Mar 2013 00:05:30 -0700 Subject: Mon Mar 25 00:05:30 PDT 2013 --- extra/libreoffice/PKGBUILD | 33 ++++++++++++++++++++---------- extra/libreoffice/librelogo.diff | 43 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 extra/libreoffice/librelogo.diff (limited to 'extra/libreoffice') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 8bd7cf113..ac49b5778 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180554 2013-03-23 07:24:00Z bpiotrowski $ +# $Id: PKGBUILD 180591 2013-03-24 07:51:29Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.1.2 pkgver=4.0.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -78,7 +78,8 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/libmspub-0.0.5.tar.bz2 ${_additional_source_url}/libvisio-0.0.25.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - libreoffice-common.sh libreoffice-common.csh) + libreoffice-common.sh libreoffice-common.csh + librelogo.diff) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 @@ -148,7 +149,8 @@ md5sums=('52c3bacdf46b4648c5697cc55b648784' '92bde158f249b9b27f76f48cc65a0242' '97bf43dda273d79ff90c848ab53b0e3c' 'abcb1b0a7deaffe13ab3d7ca70becb49' - '72790a4103da259a55cadd66db931d00') + '72790a4103da259a55cadd66db931d00' + 'cc07fdb40e005ad2a79ba8a6756b0ad6') build() { @@ -158,6 +160,10 @@ build() { cd ${srcdir}/libreoffice-$_LOver + # make librelogo depend on libreoffice-writer + # http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e69b35674882d8d675a677940805b187cad0bc3 + patch -Np1 -i ${srcdir}/librelogo.diff + # move external sources into place mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources for source in "${noextract[@]}"; do @@ -206,7 +212,6 @@ build() { --enable-gtk3 \ --enable-gstreamer \ --enable-lockdown\ - --enable-mergelibs \ --enable-opengl \ --enable-odk\ --enable-python=system \ @@ -253,7 +258,9 @@ build() { --with-system-clucene\ --without-system-servlet-api -# --without-ppds\ +# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 + +# --without-ppds\ # breaks spadmin permission #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool @@ -274,13 +281,12 @@ package_libreoffice-common() { 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" "python>=3.3" "neon>=0.28.6" + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.22.2" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' - 'dbus-glib: adds dbus support' 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'libmythes: for use in thesaurus' 'beanshell: interactive java -- good for prototyping /macros' @@ -337,6 +343,9 @@ package_libreoffice-common() { rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + + # workaround all packages now depend on that file + cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd } package_libreoffice-base() { @@ -388,9 +397,8 @@ package_libreoffice-postgresql-connector() { package_libreoffice-calc() { pkgdesc="Spreadsheet application for LibreOffice." install=libreoffice-calc.install - #depends=('libreoffice-common' 'lpsolve' ) - depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 - depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 + depends=('libreoffice-common' 'lpsolve' ) + #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 groups=('libreoffice') replaces=('libreoffice') @@ -575,6 +583,9 @@ package_libreoffice-writer() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done + + # for workaround this file belongs now to common + rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd } package_libreoffice-en-US() { diff --git a/extra/libreoffice/librelogo.diff b/extra/libreoffice/librelogo.diff new file mode 100644 index 000000000..c17143225 --- /dev/null +++ b/extra/libreoffice/librelogo.diff @@ -0,0 +1,43 @@ +From 939daba04c25a9a3b7be2f3df39692453cf9a304 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Thu, 21 Mar 2013 14:57:18 +0000 +Subject: Missing dependency of librelogo on writer + +...at least due to dependency of librelogo.xcd on writer.xcd, see +82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "Missing dependency." + +Otherwise, having librelogo installed but not writer will cause an uncaught +RuntimeException from configmgr::Components::parseXcdFiles +(configmgr/source/components.cxx) early on in soffice.bin. + +(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3) +Conflicts: + setup_native/source/packinfo/packinfo_office.txt + +Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08 +Reviewed-on: https://gerrit.libreoffice.org/2898 +Reviewed-by: Fridrich Strba +Reviewed-by: Andras Timar +Reviewed-by: Petr Mladek +Tested-by: Petr Mladek +--- +diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt +index 3e8c89e..cbf8c490 100644 +--- a/setup_native/source/packinfo/packinfo_office.txt ++++ b/setup_native/source/packinfo/packinfo_office.txt +@@ -314,10 +314,10 @@ End + Start + module = "gid_Module_Optional_Pyuno_LibreLogo" + solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo" +-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython" ++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython" + packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" +-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" +-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" ++freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" ++requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" + copyright = "2012 The Document Foundation" + solariscopyright = "solariscopyrightfile" + vendor = "The Document Foundation" +-- +cgit v0.9.0.2-2-gbebe -- cgit v1.2.3-54-g00ecf