diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-27 12:30:14 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-27 12:30:14 -0300 |
| commit | ac84c0a6f7b12fcf77af9b7ed5c71a3949a35ec3 (patch) | |
| tree | 1d06aac4a3c6b42643952e6aad303b9179669f5b /extra/icedtea-web | |
| parent | 259debb981a976da83ba1c9b93fb6e9ec1a68fe8 (diff) | |
| parent | 342100843ef3e4379443c526403fac1b1cb6416a (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/ntp/PKGBUILD
extra/ortp/PKGBUILD
Diffstat (limited to 'extra/icedtea-web')
| -rw-r--r-- | extra/icedtea-web/PKGBUILD | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 35d3d66a9..febd4be1a 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,28 +1,22 @@ -# $Id: PKGBUILD 142413 2011-11-09 05:54:47Z andyrtr $ +# $Id: PKGBUILD 145641 2011-12-25 14:34:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') pkgver=1.1.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('openjdk6' 'zip' 'xulrunner') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - icedtea-web-1.1.4-npapi-fix.patch) -md5sums=('1ed24b7e58da26471187dfae80b020b6' - '81ac36e05ea1b55f1580bdb28c24f4db') +makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +md5sums=('1ed24b7e58da26471187dfae80b020b6') -build() { _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk +build() { cd "$srcdir/$pkgname-$pkgver" - - # fix build with Xulrunner 8 - patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch - ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ --datarootdir=/usr/share make @@ -40,9 +34,6 @@ package_icedtea-web() { depends=('openjdk6' 'gtk2' 'desktop-file-utils') install=$pkgname.install - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - cd "$srcdir/$pkgname-$pkgver" # possible make target (see bottom of Makefile.am: install-exec-local install-data-local make DESTDIR="$pkgdir" install-exec-local install-data-local @@ -73,11 +64,7 @@ package_icedtea-web-doc() { pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - cd "$srcdir/$pkgbase-$pkgver" -# install -m755 -d $pkgdir/${_jvmdir}/jre/lib make DESTDIR="$pkgdir" install-data-local # remove javaws about and man page rm -rf ${pkgdir}/usr/lib |