Mon Sep 26 23:14:33 UTC 2011

2 files changed, 47 insertions, 17 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 9898d443e..92f5cb6d6 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136687 2011-08-31 14:13:29Z andyrtr $
+# $Id: PKGBUILD 138502 2011-09-25 14:55:46Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -37,7 +37,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.3.2
 pkgver=3.4.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -47,14 +47,14 @@ makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes.
              'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
              'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-runtime'
+             'mesa' 'gstreamer0.10-base' 'java-environment'
               #'saxon' - currently broken 
              # the depends from libreoffice main pkg
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' #'libgraphite' 
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script
-	          'ttf-dejavu') # to satisfy regression tests
+	     'ttf-dejavu') # to satisfy regression tests
 	     # translate-toolkit - todo move them to extra to allow --with-system-foo builds
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
@@ -211,7 +211,7 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9'
 build() {
 
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
+	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh
 	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
@@ -343,6 +343,7 @@ build() {
 		--with-system-lucene\
 		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
 		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+		--with-java-target-version=1.5 \
 		$EXTRAOPTS || return 1
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index b981b5987..ded6f2b6e 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 131034 2011-07-09 20:09:27Z andyrtr $
+# $Id: PKGBUILD 138500 2011-09-25 14:55:34Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
-pkgname=vigra
-pkgver=1.7.1
-pkgrel=3
-pkgdesc="Computer vision library"
+pkgbase=vigra
+pkgname=('vigra' 'vigra-doc')
+pkgver=1.8.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
-depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
-makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
-optdepends=('python2: for python bindings'
-            'boost-libs: for python bindings')
+makedepends=(# runtime deps
+             'libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
+	     # additional makedeps
+             'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
 options=('!libtool')
 source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
 	vigra-1.7.1.gcc460.patch)
-md5sums=('2bde208e0fd7626770169dd4fa097282'
+md5sums=('15c5544448e529ee60020758ab6be264'
          '25ef8bc26bc38ee67e5b512d2acd0166')
+sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
+          '1de6381a74dd136ea25df5a27f249187b0dbd17e')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd "${srcdir}"/${pkgbase}-${pkgver}
   patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DWITH_VIGRANUMPY=1 \
@@ -28,9 +30,36 @@ build() {
   make
 }
 
-package() {
+check() {
   cd "${srcdir}"/${pkgname}-${pkgver}
+  make -k check || /bin/true # i686 fails
+}
+
+package_vigra() {
+  pkgdesc="Computer vision library"
+  depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
+  optdepends=('python2: for python bindings'
+              'boost-libs: for python bindings')
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
   # license
   install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  
+  # remove doc
+  rm -rf "${pkgdir}"/usr/share/doc
+}
+
+package_vigra-doc() {
+  pkgdesc="Computer vision library - documentation and examples"
+  #depends=('vigra')
+  #arch=('any')
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  # cleanup
+  rm -rf "${pkgdir}"/usr/{bin,include,lib}
+
+  # license
+  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }