[arch-commits] Commit in libreoffice/trunk (PKGBUILD librelogo.diff)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sun Mar 24 07:50:34 UTC 2013
Date: Sunday, March 24, 2013 @ 08:50:34
Author: andyrtr
Revision: 180590
upgpkg: libreoffice 4.0.1-4
add a recent upstream librelogo commit, part of FS#34378; move critical writer.xcd file to libo-common to solve all apps no more depending unwanted on writer; add dbus-glib to common pkg - FS#34419; disable mergelibs option - FS#34414
Added:
libreoffice/trunk/librelogo.diff
Modified:
libreoffice/trunk/PKGBUILD
----------------+
PKGBUILD | 31 +++++++++++++++++++++----------
librelogo.diff | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-23 23:21:49 UTC (rev 180589)
+++ PKGBUILD 2013-03-24 07:50:34 UTC (rev 180590)
@@ -21,7 +21,7 @@
'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 @@
${_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 @@
'92bde158f249b9b27f76f48cc65a0242'
'97bf43dda273d79ff90c848ab53b0e3c'
'abcb1b0a7deaffe13ab3d7ca70becb49'
- '72790a4103da259a55cadd66db931d00')
+ '72790a4103da259a55cadd66db931d00'
+ 'cc07fdb40e005ad2a79ba8a6756b0ad6')
build() {
@@ -158,6 +160,10 @@
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 @@
--enable-gtk3 \
--enable-gstreamer \
--enable-lockdown\
- --enable-mergelibs \
--enable-opengl \
--enable-odk\
--enable-python=system \
@@ -253,8 +258,10 @@
--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
touch src.downloaded
@@ -274,13 +281,12 @@
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 @@
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-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 @@
# 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() {
Added: librelogo.diff
===================================================================
--- librelogo.diff (rev 0)
+++ librelogo.diff 2013-03-24 07:50:34 UTC (rev 180590)
@@ -0,0 +1,43 @@
+From 939daba04c25a9a3b7be2f3df39692453cf9a304 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+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 <fridrich at documentfoundation.org>
+Reviewed-by: Andras Timar <atimar at suse.com>
+Reviewed-by: Petr Mladek <pmladek at suse.cz>
+Tested-by: Petr Mladek <pmladek at suse.cz>
+---
+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
More information about the arch-commits
mailing list