[arch-commits] Commit in libreoffice/trunk (PKGBUILD)

[Andreas Radke]

    Date: Sunday, March 9, 2014 @ 12:20:17
  Author: andyrtr
Revision: 207438

prepare next build; fix FS#39038

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-09 07:56:48 UTC (rev 207437)
+++ PKGBUILD	2014-03-09 11:20:17 UTC (rev 207438)
@@ -18,8 +18,8 @@
 	'libreoffice-postgresql-connector'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.2.1.1
-pkgver=4.2.1
+_LOver=4.2.2.1
+pkgver=4.2.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -125,11 +125,11 @@
 	libatomic_ops-7_2d.zip
 	libe-book-0.0.3.tar.bz2
 	libabw-0.0.2.tar.bz2)
-md5sums=('76d9612950ae1de8818943b681ba71c3'
+md5sums=('b8b00aac99c056e8908c1a89ad999f4b'
          'SKIP'
-         'fda77ccb5be32ab54304082fe8d15841'
+         '3c11900dce8a5e520abc8350045b2407'
          'SKIP'
-         'cf7873e5e1ffc8b63d42bad5b2f37a2b'
+         '5ac66bd46617d00f759602c00e755ea0'
          'SKIP'
          '15cb8c0803064faef0c4ddf5bc5ca279'
          '1f24ab1d39f4a51faf22244c94a6203f'
@@ -316,7 +316,7 @@
  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" 'dbus-glib' 'librsvg' 'libcups'
-          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0"
+          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" 'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
           'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
@@ -384,6 +384,9 @@
   
  # 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
+ # workaround lowriter depending on a lib that's part of calc
+ # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
+ cp ${srcdir}/fakeinstall/usr/lib/libreoffice/program/libtubeslo.so ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
  
  # add missing files from Beanshell provider
  # create directories from *list.txt file
@@ -449,7 +452,7 @@
 package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' 'telepathy-glib')
+ 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')
@@ -466,6 +469,9 @@
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
+ # workaround lowriter depending on a lib that's part of calc
+ # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
 }
 
 package_libreoffice-draw() {
@@ -654,7 +660,7 @@
  done
  
  # for workaround this file belongs now to common
- rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+ rm -vf ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
 
 package_libreoffice-en-US() {