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

[Andreas Radke]

    Date: Saturday, March 9, 2013 @ 21:32:09
  Author: andyrtr
Revision: 179820

upgpkg: libreoffice 4.0.1-2

fix dep on nss - FS#34223; disable --without-ppds to solve FS#32698; add hint on MS visual - FS#33557

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 18:32:21 UTC (rev 179819)
+++ PKGBUILD	2013-03-09 20:32:09 UTC (rev 179820)
@@ -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=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -218,7 +218,6 @@
 		--with-system-mysql \
 		--without-fonts\
 		--without-afms\
-		--without-ppds\
 		--without-system-libwps\
 		--without-system-libcdr \
 		--without-system-mdds\
@@ -254,6 +253,8 @@
 		--with-system-clucene\
 		--without-system-servlet-api
 
+#		--without-ppds\
+
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
 
 	touch src.downloaded
@@ -274,19 +275,18 @@
  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"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' 'poppler>=0.20.5' 
+          'nss' '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'
              'libcups:          adds printing support'
              'dbus-glib:        adds dbus support'
-             'nss:              adds support for signed files/macros'
              'pstoedit:         translates PostScript and PDF graphics into other vector formats'
              'libmythes:        for use in thesaurus'
              'beanshell:        interactive java -- good for prototyping /macros'
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
+             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
              'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
@@ -434,8 +434,7 @@
 
 package_libreoffice-gnome() {
  pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3' 'gconf')
- optdepends=()
+ depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3
  backup=()
  groups=('libreoffice')