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

[Andreas Radke]

    Date: Sunday, March 16, 2014 @ 11:28:53
  Author: andyrtr
Revision: 207979

upgpkg: libreoffice 4.2.2-2

disable telepathy collaboration support for now, should fix FS#39464 and FS#39451

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-16 10:09:25 UTC (rev 207978)
+++ PKGBUILD	2014-03-16 10:28:53 UTC (rev 207979)
@@ -20,12 +20,12 @@
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.2.2.1
 pkgver=4.2.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc'
              'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
              'beanshell2' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
@@ -34,7 +34,7 @@
              "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>=52.1"
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0'
-             'libvisio' 'libetonyek' 'libodfgen'
+             'libvisio' 'libetonyek' 'libodfgen' #'telepathy-glib'
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-liberation' # to satisfy regression tests
 	         'git')
@@ -245,6 +245,7 @@
 		--enable-python=system \
 		--enable-scripting-beanshell \
 		--enable-scripting-javascript \
+		--disable-telepathy \
 		--enable-ext-wiki-publisher \
 		--enable-ext-nlpsolver \
 		--without-fonts\
@@ -315,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" 'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
+          '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'
@@ -385,7 +386,7 @@
  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
+# 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
@@ -470,7 +471,7 @@
  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
+# rm -vf ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
 }
 
 package_libreoffice-draw() {
@@ -684,6 +685,7 @@
 }
 
 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')
@@ -694,6 +696,7 @@
 }
 
 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')