diff options
author | Emil Lundberg | 2016-08-19 09:56:38 +0200 |
---|---|---|
committer | Emil Lundberg | 2016-08-19 09:56:38 +0200 |
commit | 8fed2a902a50374511c6770649b7aae6dcaf9c0c (patch) | |
tree | 116009fcc371bb08a1726552bb2359afc64d1171 | |
parent | 13a8545a9327e13d41d088ac5b31cbaa4ebc6fd7 (diff) | |
download | aur-8fed2a902a50374511c6770649b7aae6dcaf9c0c.tar.gz |
Update to latest version of icedtea-web from ABS
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | PKGBUILD | 51 | ||||
-rw-r--r-- | fix-package-info.patch | 12 | ||||
-rw-r--r-- | install_icedtea-web-jre32.sh | 11 |
4 files changed, 41 insertions, 57 deletions
@@ -1,9 +1,7 @@ pkgbase = icedtea-web-jre32 - pkgdesc = Free web browser plugin to run applets written in Java and an implementation of Java Web Start (uses 32-bit JRE) pkgver = 1.6.2 - pkgrel = 1 + pkgrel = 2 url = http://icedtea.classpath.org/wiki/IcedTea-Web - install = install_icedtea-web-jre32.sh arch = i686 arch = x86_64 license = GPL2 @@ -16,19 +14,21 @@ pkgbase = icedtea-web-jre32 makedepends = bin32-jdk makedepends = firefox makedepends = epiphany - depends = bin32-jre - depends = java-runtime-openjdk - depends = desktop-file-utils optdepends = rhino: for using proxy auto config files - optdepends = icedtea-web-doc: Documentation - provides = java-web-start - conflicts = icedtea-web - replaces = icedtea-web-java7 noextract = icedtea-web-1.6.2.tar.gz source = http://icedtea.classpath.org/download/source/icedtea-web-1.6.2.tar.gz - source = fix-package-info.patch sha256sums = ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300 - sha256sums = 3da531a0b2ba99152fe9410591ade01b6ea63a926cc36f3fa0ab39955708940c pkgname = icedtea-web-jre32 + pkgdesc = Free web browser plugin to run applets written in Java and an implementation of Java Web Start + depends = java-runtime-openjdk + depends = desktop-file-utils + provides = java-web-start + conflicts = icedtea-web + replaces = icedtea-web-java7 + +pkgname = icedtea-web-doc-jre32 + pkgdesc = icedtea-web browser plugin + Java WebStart - documentation files + conflicts = icedtea-web-doc + replaces = icedtea-web-java7-doc @@ -2,38 +2,24 @@ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> _pkgbase=icedtea-web -pkgname=icedtea-web-jre32 -conflicts=('icedtea-web') +pkgbase=icedtea-web-jre32 +pkgname=('icedtea-web-jre32' 'icedtea-web-doc-jre32') pkgver=1.6.2 -pkgrel=1 -pkgdesc='Free web browser plugin to run applets written in Java and an implementation of Java Web Start (uses 32-bit JRE)' +pkgrel=2 arch=('i686' 'x86_64') url='http://icedtea.classpath.org/wiki/IcedTea-Web' license=('GPL2') -depends=('bin32-jre' 'java-runtime-openjdk' 'desktop-file-utils') makedepends=('java-environment-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'bin32-jdk' 'firefox' 'epiphany') -optdepends=('rhino: for using proxy auto config files' - 'icedtea-web-doc: Documentation' - ) -provides=('java-web-start') -replaces=('icedtea-web-java7') -install=install_${pkgname}.sh - +optdepends=('rhino: for using proxy auto config files') # Due to broken path names in the tarball that fails with LANG=C in our chroot -noextract=(${_pkgbase}-${pkgver}.tar.gz) -source=( - http://icedtea.classpath.org/download/source/${_pkgbase}-${pkgver}.tar.gz - fix-package-info.patch -) -sha256sums=('ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300' - '3da531a0b2ba99152fe9410591ade01b6ea63a926cc36f3fa0ab39955708940c') +noextract=("${_pkgbase}-${pkgver}.tar.gz") +source=(http://icedtea.classpath.org/download/source/${_pkgbase}-${pkgver}.tar.gz) +sha256sums=('ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300') prepare() { cd "${srcdir}" LANG=en_US.UTF-8 bsdtar -x -f "${srcdir}"/${_pkgbase}-${pkgver}.tar.gz - - patch "${srcdir}/${_pkgbase}-${pkgver}/netx/net/sourceforge/jnlp/security/package-info.java" fix-package-info.patch } build() { @@ -58,7 +44,14 @@ build() { #} -package() { +package_icedtea-web-jre32() { + + pkgdesc='Free web browser plugin to run applets written in Java and an implementation of Java Web Start' + depends=('java-runtime-openjdk' 'desktop-file-utils') + provides=('java-web-start') + replaces=('icedtea-web-java7') + conflicts=('icedtea-web') + cd "${srcdir}"/${_pkgbase}-${pkgver} # possible make target (see bottom of Makefile.am: install-exec-local install-data-local make DESTDIR="${pkgdir}" install-exec-local install-data-local @@ -82,3 +75,17 @@ package() { install -m 755 -d "${pkgdir}"/usr/lib/mozilla/plugins/ ln -sf /usr/share/${_pkgbase}/lib/IcedTeaPlugin.so "${pkgdir}"/usr/lib/mozilla/plugins/ } + +package_icedtea-web-doc-jre32() { + + pkgdesc='icedtea-web browser plugin + Java WebStart - documentation files' + replaces=('icedtea-web-java7-doc') + conflicts=('icedtea-web-doc') + + cd "${srcdir}"/${_pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install-data-local + # remove javaws about and man page + rm -rf "${pkgdir}"/usr/lib + rm -rf "${pkgdir}"/usr/share/man + rm -rf "${pkgdir}"/usr/share/icedtea-web # conflicting and unneeded file it seems +} diff --git a/fix-package-info.patch b/fix-package-info.patch deleted file mode 100644 index 7ba1272d8748..000000000000 --- a/fix-package-info.patch +++ /dev/null @@ -1,12 +0,0 @@ -50c50 -< | >------------------------------------> | <----------------------------------------------------------------------------------------------------------------------------| X ---- -> | -------------------------------------- | -----------------------------------------------------------------------------------------------------------------------------| X -70c70 -< | --> set selected value (via listener?) to message, dispose dialog --| | X ---- -> | --- set selected value (via listener?) to message, dispose dialog --| | X -73c73 -< | <------------------------------------------------------------------------------------------< unlock lock of this messge >--------------------------------------------| X ---- -> | ------------------------------------------------------------------------------------------ unlock lock of this messge --------------------------------------------| X diff --git a/install_icedtea-web-jre32.sh b/install_icedtea-web-jre32.sh deleted file mode 100644 index 80312d4a6041..000000000000 --- a/install_icedtea-web-jre32.sh +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} |