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

[Andreas Radke]

    Date: Tuesday, March 19, 2013 @ 21:02:36
  Author: andyrtr
Revision: 180297

upgpkg: libreoffice 4.0.1-3

poppler rebuild, fix FS#34332

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-19 20:01:32 UTC (rev 180296)
+++ PKGBUILD	2013-03-19 20:02:36 UTC (rev 180297)
@@ -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=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -33,7 +33,7 @@
              # the runtime dependencies
              "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>=50.1-2" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.20.5' 
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.2' 
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
 
@@ -275,7 +275,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"
-          'nss' '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.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'
@@ -344,7 +344,6 @@
  install=libreoffice-base.install
  depends=('libreoffice-common')
  optdepends=('libreoffice-postgresql-connector')
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
 
@@ -389,9 +388,9 @@
 package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
+ #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
  groups=('libreoffice')
  replaces=('libreoffice')
  
@@ -413,8 +412,6 @@
  pkgdesc="Drawing Application for LibreOffice."
  install=libreoffice-draw.install
  depends=('libreoffice-common')
- optdepends=()
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
  
@@ -435,7 +432,6 @@
 package_libreoffice-gnome() {
  pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
  depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3
- backup=()
  groups=('libreoffice')
  
  # create directories from *list.txt file
@@ -457,7 +453,6 @@
  install=libreoffice-impress.install
  depends=('libreoffice-common')
  optdepends=('glu:             for the OGLTrans extension')
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
  
@@ -499,8 +494,6 @@
 package_libreoffice-math() {
  pkgdesc="Equation Editor Application for LibreOffice."
  depends=('libreoffice-common')
- optdepends=()
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
  
@@ -521,8 +514,6 @@
 package_libreoffice-sdk() {
  pkgdesc="Software Development Kit for LibreOffice."
  depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
  groups=('libreoffice')
  
  # create directories from *list.txt file
@@ -545,8 +536,6 @@
 package_libreoffice-sdk-doc() {
  pkgdesc="Software Development Kit documentation for LibreOffice"
  depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
  groups=('libreoffice')
  
  # create directories from *list.txt file
@@ -571,7 +560,6 @@
  install=libreoffice-writer.install
  depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
  optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')